diff --git a/src/components.d.ts b/src/components.d.ts
index 97d773e..09a22b1 100644
--- a/src/components.d.ts
+++ b/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']
diff --git a/src/views/AutomaticMode/index.vue b/src/views/AutomaticMode/index.vue
index cd3c3a9..4c843d4 100644
--- a/src/views/AutomaticMode/index.vue
+++ b/src/views/AutomaticMode/index.vue
@@ -32,14 +32,14 @@
回路
亮度
-
-
{{ ele }}
-
{{ tasks[index].turnOn ? '通' : '断' }}
-
{{ tasks[index].pwm }}
+
+
{{ idx + 1 }}
+
{{ ele.turnOn ? '通' : '断' }}
+
{{ ele.pwm }}
-
定时时间
+
{{ tasks[index].timeType === 0 ? '定时时间' : '经纬度时间' }}
{{ tasks[index].execTime ? dayjs(tasks[index].execTime).format('HH:mm:ss') : '' }}
@@ -56,14 +56,14 @@
回路
亮度
-
-
{{ ele }}
-
{{ item.turnOn ? '通' : '断' }}
-
{{ item.pwm }}
+
+
{{ idx + 1 }}
+
{{ ele.turnOn ? '通' : '断' }}
+
{{ ele.pwm }}
-
定时时间
+
{{ item.timeType === 0 ? '定时时间' : '经纬度时间' }}
{{ item.execTime ? dayjs(item.execTime).format('HH:mm:ss') : '' }}
@@ -203,16 +203,16 @@
-
+
调光通道
-
-
调光通道{{ item }}
-
+
+
调光通道{{ index + 1 }}
+
%
@@ -222,6 +222,10 @@
时间
+
+ 定时时间
+ 经纬度时间
+
@@ -259,22 +263,40 @@ const openSettingDialog = (item, index) => {
} else {
currentTask.value = tasks.value[index]
}
- if (currentTask.value.turnOn) {
- selectBoxValue.value = ['通道回路']
- } else {
- selectBoxValue.value = []
- }
+ // console.log(' currentTask.value', JSON.stringify(currentTask.value))
+ // if (currentTask.value.turnOn) {
+ // 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,
- "pwm": currentTask.value.pwm
+ // "turnOn": selectBoxValue.value.length > 0,
+ // "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;