.

src/views/OperatorView.vue

@@ -77,6 +77,9 @@
         <ElFormItem prop="remark" label="备注">
             <ElInput v-model="model.remark" placeholder="请输入备注" />
         </ElFormItem>
+        <ElFormItem prop="e2ee" label="端到端加密">
+            <ElSwitch v-model="model.e2ee" />
+        </ElFormItem>
         <ElFormItem prop="matchers" label="匹配规则" class="!w-full">
             <div
                 v-for="(matcher, i) in model.matchers"

src/views/TaskView.vue

@@ -57,7 +57,7 @@
 
                             <ExpandItem class="expand-item" v-if="isAdmin">
                                 <template #title>端到端加密</template>
-                                <template #content>{{ row.endToEndEncryption ? '是' : '否' }}</template>
+                                <template #content>{{ row.e2ee ? '是' : '否' }}</template>
                             </ExpandItem>
                         </div>
 
@@ -226,7 +226,10 @@
                 />
             </el-tooltip>
         </ElFormItem>
-        <div></div>
+        <ElFormItem v-if="isAdmin" prop="matchDevice" label="筛选设备">
+            <ElInput v-model="model.matchDevice" placeholder="设备名称" />
+        </ElFormItem>
+        <ElDivider>配置覆盖</ElDivider>
         <ElFormItem v-if="isAdmin" prop="rcsWait" label="RCS等待时间">
             <ElInputNumber :controls="false" v-model="model.rcsWait" placeholder="请输入RCS等待时间" />
         </ElFormItem>
@@ -239,17 +242,17 @@
         <ElFormItem v-if="isAdmin" prop="requestNumberInterval" label="单个号码发送量">
             <ElInputNumber :controls="false" v-model="model.requestNumberInterval" placeholder="请输入单个号码发送量" />
         </ElFormItem>
-        <ElFormItem v-if="isAdmin" prop="matchDevice" label="筛选设备">
-            <ElInput v-model="model.matchDevice" placeholder="设备名称" />
-        </ElFormItem>
         <ElFormItem v-if="isAdmin" prop="checkConnection" label="检查连接">
             <ElSwitch v-model="model.checkConnection" />
         </ElFormItem>
         <ElFormItem v-if="isAdmin" prop="useBackup" label="使用备份">
             <ElSwitch v-model="model.useBackup" />
         </ElFormItem>
-        <ElFormItem v-if="isAdmin" prop="endToEndEncryption" label="端到端加密">
-            <ElSwitch v-model="model.endToEndEncryption" />
+        <ElFormItem v-if="isAdmin" prop="e2ee" label="E2EE">
+            <ElSwitch v-model="model.e2ee" />
+        </ElFormItem>
+        <ElFormItem v-if="isAdmin" prop="e2eeTimeout" label="E2EE超时">
+            <ElInputNumber :controls="false" v-model="model.e2eeTimeout" />
         </ElFormItem>
     </EditDialog>
 
@@ -370,7 +373,7 @@ onMounted(async () => {
     const currentMinute = now.minute()
     let nextHalfOrFullHour = currentMinute >= 30 ? currentHour + 1 : currentHour
     if (currentMinute < 30) {
-        nextHalfOrFullHour += (currentMinute === 0 ? 0 : 0.5)
+        nextHalfOrFullHour += currentMinute === 0 ? 0 : 0.5
     }
     if (nextHalfOrFullHour >= 24) {
         nextHalfOrFullHour -= 24