自动模式1

src/components.d.ts

@@ -17,6 +17,8 @@ declare module 'vue' {
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElPagination: typeof import('element-plus/es')['ElPagination']
+    ElRadio: typeof import('element-plus/es')['ElRadio']
+    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSlider: typeof import('element-plus/es')['ElSlider']
     ElTimePicker: typeof import('element-plus/es')['ElTimePicker']

src/views/AutomaticMode/index.vue

@@ -32,14 +32,14 @@
                                     <div>回路</div>
                                     <div>亮度</div>
                                 </div>
-                                <div class="item" v-for="ele in 10">
+                                <div class="item" v-for="(ele, idx) in tasks[index].loops">
-                                    <div>{{ ele }}</div>
+                                    <div>{{ idx + 1 }}</div>
-                                    <div>{{ tasks[index].turnOn ? '通' : '断' }}</div>
+                                    <div :class="{ red: !ele.turnOn, green: ele.turnOn }">{{ ele.turnOn ? '通' : '断' }}</div>
-                                    <div>{{ tasks[index].pwm }}</div>
+                                    <div>{{ ele.pwm }}</div>
                                 </div>
                             </div>
                             <div class="time">
-                                <div>定时时间</div>
+                                <div>{{ tasks[index].timeType === 0 ? '定时时间' : '经纬度时间' }}</div>
                                 <div>{{ tasks[index].execTime ? dayjs(tasks[index].execTime).format('HH:mm:ss') : '' }}</div>
                             </div>
                             <div class="iconBox">
@@ -56,14 +56,14 @@
                                     <div>回路</div>
                                     <div>亮度</div>
                                 </div>
-                                <div class="item" v-for="ele in 10">
+                                <div class="item" v-for="(ele, idx) in item.loops">
-                                    <div>{{ ele }}</div>
+                                    <div>{{ idx + 1 }}</div>
-                                    <div>{{ item.turnOn ? '通' : '断' }}</div>
+                                    <div :class="{ red: !ele.turnOn }">{{ ele.turnOn ? '通' : '断' }}</div>
-                                    <div>{{ item.pwm }}</div>
+                                    <div>{{ ele.pwm }}</div>
                                 </div>
                             </div>
                             <div class="time">
-                                <div>定时时间</div>
+                                <div>{{ item.timeType === 0 ? '定时时间' : '经纬度时间' }}</div>
                                 <div>{{ item.execTime ? dayjs(item.execTime).format('HH:mm:ss') : '' }}</div>
                             </div>
                             <div class="iconBox">
@@ -203,16 +203,16 @@
                     </div>
                     <div class="selectBox">
                         <el-checkbox-group v-model="selectBoxValue">
-                            <el-checkbox v-for="item in 10" :label="'通道回路' + item" :value="'通道回路'" border />
+                            <el-checkbox v-for="item in 10" :label="'通道回路' + item" :value="item" border />
                         </el-checkbox-group>
                     </div>
                 </div>
                 <!-- <div style="margin:10px 0 "><el-button type="primary" @click="brightnessDialogVisible = true">一键调光</el-button></div> -->
                 <div style="margin-bottom: 10px;">调光通道</div>
                 <div class="lightBox">
-                    <div class="item" v-for="item in 10">
+                    <div class="item" v-for="(item, index) in currentTask.loops">
-                        <div class="title">调光通道{{ item }}</div>
+                        <div class="title">调光通道{{ index + 1 }}</div>
-                        <el-input-number style="width: 95%;" v-model="currentTask.pwm" :min="0" :max="100">
+                        <el-input-number style="width: 95%;" v-model="item.pwm" :min="0" :max="100">
                             <template #suffix>
                                 <span>%</span>
                             </template>
@@ -222,6 +222,10 @@
                 <div class="timeBox">
                     <span>时间</span>
                     <el-time-picker v-model="currentTask.execTime" placeholder="请选择" />
+                    <el-radio-group style="margin-left: 20px;" v-model="currentTask.timeType">
+                        <el-radio :value="0">定时时间</el-radio>
+                        <el-radio :value="1">经纬度时间</el-radio>
+                    </el-radio-group>
                 </div>
             </div>
             <template #footer>
@@ -259,22 +263,40 @@ const openSettingDialog = (item, index) => {
     } else {
         currentTask.value = tasks.value[index]
     }
-    if (currentTask.value.turnOn) {
+    // console.log(' currentTask.value', JSON.stringify(currentTask.value))
-        selectBoxValue.value = ['通道回路']
+    // if (currentTask.value.turnOn) {
-    } else {
+    //     selectBoxValue.value = ['通道回路']
-        selectBoxValue.value = []
+    // } else {
-    }
+    //     selectBoxValue.value = []
+    // }
+    selectBoxValue.value = []
+    currentTask.value.loops.forEach((item, index) => {
+        if (item.turnOn) selectBoxValue.value.push(index + 1)
+    })
     settingDialogVisible.value = true
 }
 
 const confirmSetting = () => {
+    // console.log(selectBoxValue.value)
+    currentTask.value.loops.forEach(item => {
+        item.turnOn = false
+    })
+    selectBoxValue.value?.forEach(item => {
+        currentTask.value.loops[item - 1].turnOn = true
+    })
     const params = {
         "comm_uid": commit_uid,
         "mode": deviceMode.value,
         "execTime": dayjs(currentTask.value.execTime).format('YYYY-MM-DD HH:mm:ss'),
-        "turnOn": selectBoxValue.value.length > 0,
+        // "turnOn": selectBoxValue.value.length > 0,
-        "pwm": currentTask.value.pwm
+        // "pwm": currentTask.value.pwm,
+        timeType: currentTask.value.timeType,
+        loops: currentTask.value.loops
     }
+    // if (1 == 1) {
+    //     console.log(params)
+    //     return
+    // }
     if (currentTaskName.value === '开始任务') {
         RPC.post('/m9z/setStartTask2', params).then(res => {
             settingDialogVisible.value = false
@@ -291,7 +313,8 @@ const confirmSetting = () => {
     }
     if (currentTaskName.value === '中间任务') {
         middleTask.value[currentMiddleIndex.value].execTime = dayjs(currentTask.value.execTime).format('YYYY-MM-DD HH:mm:ss')
-        middleTask.value[currentMiddleIndex.value].turnOn = selectBoxValue.value.length > 0
+        middleTask.value[currentMiddleIndex.value].timeType = currentTask.value.timeType
+        middleTask.value[currentMiddleIndex.value].loops = currentTask.value.loops
         const middleParams = {
             "comm_uid": commit_uid,
             "mode": deviceMode.value,
@@ -717,6 +740,14 @@ const delMode = () => {
     flex: 1;
     height: 100%;
 
+    .red {
+        color: #f12323;
+    }
+
+    .green {
+        color: rgb(39, 167, 39);
+    }
+
     .item {
         display: flex;
         flex-direction: column;