群发

src/views/DeviceView.vue

@@ -219,7 +219,8 @@ function configOverridesFormatter(row, column, value, index) {
         return Object.entries(value)
             .map(([k, v]) => `${k}: ${v}`)
             .join('\n')
-            .replaceAll('requestNumberInterval', '单个号码发送量')
+            .replaceAll('singleQty', '单发数量')
+            .replaceAll('groupQty', '群发数量')
     }
 }
 

src/views/OperatorView.vue

@@ -150,15 +150,24 @@
         <ElFormItem prop="configOverrides" label="配置覆盖" class="!w-full">
             <div class="matcher-item w-full mb-4 bg-neutral-100 dark:bg-neutral-900 p-3 rounded-lg">
                 <ElForm :model="model.configOverrides" label-position="top" inline>
-                    <ElFormItem prop="requestNumberInterval" label="单个号码发送量">
+                    <ElFormItem prop="singleQty" label="单发数量">
                         <ElInputNumber
                             controls-position="right"
-                            v-model="model.configOverrides.requestNumberInterval"
-                            placeholder="请输入单个号码发送量"
+                            v-model="model.configOverrides.singleQty"
+                            placeholder="请输入单发数量"
                             :min="1"
                             class="!w-[200px]"
                         />
                     </ElFormItem>
+                    <ElFormItem prop="groupQty" label="群发数量">
+                        <ElInputNumber
+                            controls-position="right"
+                            v-model="model.configOverrides.groupQty"
+                            placeholder="请输入群发数量"
+                            :min="1"
+                            class="!w-[200px] ml-3"
+                        />
+                    </ElFormItem>
                 </ElForm>
             </div>
         </ElFormItem>

src/views/TaskView.vue

@@ -78,23 +78,48 @@
                                 </ExpandItem>
 
                                 <ExpandItem>
-                                    <template #title>RCS等待时间</template>
-                                    <template #content>{{ row.rcsWait }}</template>
+                                    <template #title>单发数量</template>
+                                    <template #content>{{ row.singleQty }}</template>
                                 </ExpandItem>
 
                                 <ExpandItem>
-                                    <template #title>RCS发送间隔</template>
-                                    <template #content>{{ row.rcsInterval }}</template>
+                                    <template #title>单发超时</template>
+                                    <template #content>{{ row.singleTimeout }}</template>
                                 </ExpandItem>
 
                                 <ExpandItem>
-                                    <template #title>清理数量</template>
-                                    <template #content>{{ row.cleanCount }}</template>
+                                    <template #title>单发间隔</template>
+                                    <template #content>{{ row.singleDelay }}</template>
+                                </ExpandItem>
+
+                                <ExpandItem>
+                                    <template #title>群发模式</template>
+                                    <template #content>{{ row.groupMode }}</template>
+                                </ExpandItem>
+
+                                <ExpandItem>
+                                    <template #title>群发数量 </template>
+                                    <template #content>{{ row.groupQty }}</template>
+                                </ExpandItem>
+
+                                <ExpandItem>
+                                    <template #title>拉群人数</template>
+                                    <template #content>{{ row.groupSize }}</template>
+                                </ExpandItem>
+
+                                <ExpandItem>
+                                    <template #title>群发间隔</template>
+                                    <template #content>{{ row.groupDelay }}</template>
+                                </ExpandItem>
+
+                                <ExpandItem>
+                                    <template #title>群发超时</template>
+                                    <template #content>{{ row.groupTimeout }}</template>
                                 </ExpandItem>
 
                                 <ExpandItem>
-                                    <template #title>单个号码发送量</template>
-                                    <template #content>{{ row.requestNumberInterval }}</template>
+                                    <template #title>清理数量</template>
+                                    <template #content>{{ row.cleanCount }}</template>
                                 </ExpandItem>
                             </template>
                         </div>
@@ -224,6 +249,25 @@
                 <ElOption v-for="item in phoneList" :key="item.id" :label="item.name" :value="item.id" />
             </ElSelect>
         </ElFormItem>
+        <ElFormItem prop="startedAt" label="定时发送时间">
+            <el-tooltip
+                trigger="click"
+                effect="dark"
+                content="定时任务创建时需扣款，请保证余额充足"
+                placement="top"
+                :hide-after="3000"
+            >
+                <el-time-select
+                    v-model="model.startedAt"
+                    style="width: 240px"
+                    :start="startTime"
+                    step="00:30"
+                    :end="endTime"
+                    placeholder="选择时间"
+                    format="YYYY-MM-DD HH:mm"
+                />
+            </el-tooltip>
+        </ElFormItem>
         <ElFormItem label="文案选择" prop="textSelect" class="!w-full">
             <ElRadioGroup v-model="textSelect">
                 <ElRadio value="1">
@@ -301,41 +345,35 @@
             </ElFormItem>
         </div>
         <br />
-        <ElFormItem prop="startedAt" label="定时发送时间">
-            <el-tooltip
-                trigger="click"
-                effect="dark"
-                content="定时任务创建时需扣款，请保证余额充足"
-                placement="top"
-                :hide-after="3000"
-            >
-                <el-time-select
-                    v-model="model.startedAt"
-                    style="width: 240px"
-                    :start="startTime"
-                    step="00:30"
-                    :end="endTime"
-                    placeholder="选择时间"
-                    format="YYYY-MM-DD HH:mm"
-                />
-            </el-tooltip>
+        
+        <ElDivider v-if="isAdmin">配置覆盖</ElDivider>
+        <ElFormItem v-if="isAdmin" prop="singleQty" label="单发数量">
+            <ElInputNumber :controls="false" v-model="model.singleQty" placeholder="请输入单发数量" />
         </ElFormItem>
-        <ElFormItem v-if="isAdmin" prop="matchDevice" label="筛选设备">
-            <ElInput v-model="model.matchDevice" placeholder="设备名称" />
+        <ElFormItem v-if="isAdmin" prop="singleTimeout" label="单发超时">
+            <ElInputNumber :controls="false" v-model="model.singleTimeout" placeholder="请输入单发超时" />
         </ElFormItem>
-        <ElDivider v-if="isAdmin">配置覆盖</ElDivider>
-        <ElFormItem v-if="isAdmin" prop="rcsWait" label="RCS等待时间">
-            <ElInputNumber :controls="false" v-model="model.rcsWait" placeholder="请输入RCS等待时间" />
+        <ElFormItem v-if="isAdmin" prop="singleDelay" label="单发间隔">
+            <ElInputNumber :controls="false" v-model="model.singleDelay" placeholder="请输入单发间隔" />
+        </ElFormItem>
+        <ElFormItem v-if="isAdmin" prop="groupMode" label="群发模式">
+            <ElSwitch v-model="model.groupMode" />
+        </ElFormItem>
+        <ElFormItem v-if="isAdmin" prop="groupQty" label="群发数量">
+            <ElInputNumber :controls="false" v-model="model.groupQty" placeholder="请输入群发数量" />
         </ElFormItem>
-        <ElFormItem v-if="isAdmin" prop="rcsInterval" label="RCS发送间隔">
-            <ElInputNumber :controls="false" v-model="model.rcsInterval" placeholder="请输入RCS发送间隔" />
+        <ElFormItem v-if="isAdmin" prop="groupSize" label="拉群人数">
+            <ElInputNumber :controls="false" v-model="model.groupSize" placeholder="请输入拉群人数" />
+        </ElFormItem>
+        <ElFormItem v-if="isAdmin" prop="groupDelay" label="群发间隔">
+            <ElInputNumber :controls="false" v-model="model.groupDelay" placeholder="请输入群发间隔" />
+        </ElFormItem>
+        <ElFormItem v-if="isAdmin" prop="groupTimeout" label="群发超时">
+            <ElInputNumber :controls="false" v-model="model.groupTimeout" placeholder="请输入群发超时" />
         </ElFormItem>
         <ElFormItem v-if="isAdmin" prop="cleanCount" label="清理数量">
             <ElInputNumber :controls="false" v-model="model.cleanCount" placeholder="请输入清理数量" />
         </ElFormItem>
-        <ElFormItem v-if="isAdmin" prop="requestNumberInterval" label="单个号码发送量">
-            <ElInputNumber :controls="false" v-model="model.requestNumberInterval" placeholder="请输入单个号码发送量" />
-        </ElFormItem>
         <ElFormItem v-if="isAdmin" prop="e2ee" label="端到端加密">
             <ElRadioGroup v-model="model.e2ee">
                 <ElRadioButton label="无" :value="0" />
@@ -479,10 +517,15 @@ const rules = {
         }
     ],
     dynamicMessage: [{ required: false, message: '请输入动态内容', trigger: 'blur' }],
-    rcsWait: [{ required: false, message: '请输入RCS等待时间', trigger: 'blur' }],
-    rcsInterval: [{ required: false, message: '请输入RCS发送间隔', trigger: 'blur' }],
     cleanCount: [{ required: false, message: '请输入清理数量', trigger: 'blur' }],
-    requestNumberInterval: [{ required: false, message: '请输入单个号码发送量', trigger: 'blur' }],
+    singleQty: [{ required: false, message: '请输入单发数量', trigger: 'blur' }],
+    singleTimeout: [{ required: false, message: '请输入单发超时', trigger: 'blur' }],
+    singleDelay: [{ required: false, message: '请输入单发间隔', trigger: 'blur' }],
+    groupMode: [{ required: false, message: '请选择群发模式', trigger: 'blur' }],   
+    groupQty: [{ required: false, message: '请输入群发数量', trigger: 'blur' }],
+    groupSize: [{ required: false, message: '请输入拉群人数', trigger: 'blur' }],
+    groupDelay: [{ required: false, message: '请输入群发间隔', trigger: 'blur' }],
+    groupTimeout: [{ required: false, message: '请输入群发超时', trigger: 'blur' }],
     checkConnection: [{ required: false, message: '请选择是否检查连接', trigger: 'blur' }],
     useBackup: [{ required: false, message: '请选择是否使用备份', trigger: 'blur' }]
 }