diff --git a/src/views/AutomaticMode/index.vue b/src/views/AutomaticMode/index.vue
index 55ab447..cd3c3a9 100644
--- a/src/views/AutomaticMode/index.vue
+++ b/src/views/AutomaticMode/index.vue
@@ -24,7 +24,7 @@
-
+
{{ item.substring(0, 1) }}{{ item.substring(1, 2) }}{{ item.substring(2, 3) }}{{ item.substring(3) }}
+
+
中间任务
+
+
+
+
{{ ele }}
+
{{ item.turnOn ? '通' : '断' }}
+
{{ item.pwm }}
+
+
+
+
定时时间
+
{{ item.execTime ? dayjs(item.execTime).format('HH:mm:ss') : '' }}
+
+
+
+
+
+
+
+
+
+
@@ -68,8 +95,8 @@
远程重启
刷新
-
+ 新增
+
@@ -222,10 +249,16 @@ const modeName = ref('')
const currentTaskName = ref('开始任务')
const currentTask = ref({})
+const currentMiddleIndex = ref(null)
const openSettingDialog = (item, index) => {
currentTaskName.value = item
- currentTask.value = tasks.value[index]
+ if (item === '中间任务') {
+ currentTask.value = middleTask.value[index]
+ currentMiddleIndex.value = index
+ } else {
+ currentTask.value = tasks.value[index]
+ }
if (currentTask.value.turnOn) {
selectBoxValue.value = ['通道回路']
} else {
@@ -242,17 +275,6 @@ const confirmSetting = () => {
"turnOn": selectBoxValue.value.length > 0,
"pwm": currentTask.value.pwm
}
- const middleParams = {
- "comm_uid": commit_uid,
- "mode": deviceMode.value,
- "controlTaskList": [
- {
- "execTime": dayjs(currentTask.value.execTime).format('YYYY-MM-DD HH:mm:ss'),
- "turnOn": selectBoxValue.value.length > 0,
- "pwm": currentTask.value.pwm
- }
- ]
- }
if (currentTaskName.value === '开始任务') {
RPC.post('/m9z/setStartTask2', params).then(res => {
settingDialogVisible.value = false
@@ -268,6 +290,13 @@ 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
+ const middleParams = {
+ "comm_uid": commit_uid,
+ "mode": deviceMode.value,
+ "controlTaskList": middleTask.value
+ }
RPC.post('/m9z/setMiddleTask2', middleParams).then(res => {
settingDialogVisible.value = false
ElMessage.success('修改成功')
@@ -279,7 +308,7 @@ const confirmSetting = () => {
const startTask = ref({})
const stopTask = ref({})
-const middleTask = ref({})
+const middleTask = ref([])
const startTaskLoading = ref(false)
const stopTaskLoading = ref(false)
const middleTaskLoading = ref(false)
@@ -325,13 +354,66 @@ const getTask = () => {
stopTaskLoading.value = false
})
RPC.post('/m9z/getMiddleTask2', { comm_uid: commit_uid, mode: deviceMode.value }).then(res => {
- middleTask.value = res.controlTaskList[0]
+ middleTask.value = res.controlTaskList || []
}).finally(() => {
middleTaskLoading.value = false
})
}
getTask()
+const addTask = () => {
+ middleTask.value.push({
+ "execTime": '2025-06-07 19:00:00',
+ "turnOn": true,
+ "pwm": 50
+ })
+ const middleParams = {
+ "comm_uid": commit_uid,
+ "mode": deviceMode.value,
+ "controlTaskList": middleTask.value
+ }
+ console.log(middleParams)
+ middleTaskLoading.value = true
+ RPC.post('/m9z/setMiddleTask2', middleParams).then(res => {
+ settingDialogVisible.value = false
+ ElMessage.success('添加成功')
+ middleTaskLoading.value = false
+ getTask()
+ }).catch(() => {
+ middleTaskLoading.value = false
+ })
+}
+const delTask = (index) => {
+ ElMessageBox.confirm(
+ '确认删除?',
+ '',
+ {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ customClass: 'del_Message_box'
+ }
+ )
+ .then(() => {
+ middleTask.value.splice(index, 1)
+ const middleParams = {
+ "comm_uid": commit_uid,
+ "mode": deviceMode.value,
+ "controlTaskList": middleTask.value
+ }
+ console.log(middleParams)
+ middleTaskLoading.value = true
+ RPC.post('/m9z/setMiddleTask2', middleParams).then(res => {
+ settingDialogVisible.value = false
+ ElMessage.success('删除成功')
+ middleTaskLoading.value = false
+ getTask()
+ }).catch(() => {
+ middleTaskLoading.value = false
+ })
+ })
+}
+
const selectAll = () => {
if (selectBoxValue.value.length !== 10) {
selectBoxValue.value = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10].map(item => '通道回路' + item)
@@ -564,7 +646,9 @@ const delMode = () => {
.power-params {
display: flex;
flex-direction: column;
- justify-content: space-between;
+ // justify-content: space-between;
+ overflow-y: auto;
+ overflow-x: hidden;
gap: 10px;
height: 100%;
@@ -605,8 +689,9 @@ const delMode = () => {
border: 1px solid rgba(255, 255, 255, 0.2);
border-radius: 12px;
align-items: center;
- width: 100%;
- height: 32%;
+ width: 99%;
+ height: 30%;
+ flex-shrink: 0;
overflow: hidden;
/* padding: 15px; */
backdrop-filter: blur(10px);