From 3d3e7f45086799fdd7a412e2079710a6cdf8dc2b Mon Sep 17 00:00:00 2001 From: riku <risaku@163.com> Date: 星期四, 24 十月 2024 08:30:04 +0800 Subject: [PATCH] Merge branch 'lsf-dataproduct-1018' --- src/views/fysp/task/components/CompDayTask.vue | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/views/fysp/task/components/CompDayTask.vue b/src/views/fysp/task/components/CompDayTask.vue index f476c5b..15a2797 100644 --- a/src/views/fysp/task/components/CompDayTask.vue +++ b/src/views/fysp/task/components/CompDayTask.vue @@ -41,6 +41,7 @@ <CompSubTaskList v-model="curSubTaskList" :height="height" + @submit="deleteSubtasks" ></CompSubTaskList> </el-col> </el-row> @@ -49,6 +50,7 @@ import { ref, watch, onMounted } from 'vue'; import { useCloned } from '@vueuse/core'; import { useRoute, useRouter } from 'vue-router'; +import { ElMessage, ElNotification, ElMessageBox } from 'element-plus'; import taskApi from '@/api/fysp/taskApi'; import subtaskApi from '@/api/fysp/subtaskApi'; import TaskProxy from '../TaskProxy'; @@ -65,6 +67,8 @@ dayTask: Object, mObjList: Array }); + +const emit = defineEmits(['submit']) /*************************** 鏁版嵁鍒濆鍖� ************************************/ // 宸℃煡瀛愪换鍔¢泦鍚� @@ -127,7 +131,7 @@ function createSubtasks(executors) { const dt = props.dayTask; const subtasks = seletedSceneList.value.map((_) => { - const s = _.scene + const s = _.scene; return { // 涓婚敭鐢辨湇鍔$鍒涘缓 stguid: undefined, @@ -157,7 +161,28 @@ remark: undefined }; }); - subtaskApi.putSubtasks(subtasks) + + // 鏇存柊鍦烘櫙鐩戠娆℃暟 + seletedSceneList.value.forEach((s) => { + s.extension1 = s.extension1 ? parseInt(s.extension1) + 1 + '' : '1'; + }); + taskApi.updateMonitorObject(seletedSceneList.value).then((res) => { + if (res > 0) { + subtaskApi.putSubtasks(subtasks).then((res) => { + seletedSceneList.value = []; + fetchSubTask(props.dayTask.guid); + ElMessage({ + message: '宸℃煡浠诲姟娣诲姞鎴愬姛', + type: 'success' + }); + emit('submit') + }); + } + }); +} + +function deleteSubtasks() { + emit('submit') } </script> <style scoped></style> -- Gitblit v1.9.3