From 89292199af8b4db3a6333b9941ef277f26490f6d Mon Sep 17 00:00:00 2001 From: riku <risaku@163.com> Date: 星期一, 14 十月 2024 17:06:55 +0800 Subject: [PATCH] 1. 添加dayjs插件声明 --- src/views/fysp/task/TaskManage.vue | 53 +++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 41 insertions(+), 12 deletions(-) diff --git a/src/views/fysp/task/TaskManage.vue b/src/views/fysp/task/TaskManage.vue index 839a8b9..4239a94 100644 --- a/src/views/fysp/task/TaskManage.vue +++ b/src/views/fysp/task/TaskManage.vue @@ -31,10 +31,16 @@ class="el-scrollbar" v-loading="mainLoading" > - <div><el-text>鐩戠璁″垝</el-text></div> + <el-row justify="space-between"> + <div><el-text>鐩戠璁″垝</el-text></div> + <el-button type="warning" size="small" @click="editPlan">璁″垝璋冩暣</el-button> + <CompMonitorPlan :task="curTask.data"></CompMonitorPlan> + </el-row> <el-divider></el-divider> - <el-button type="primary" size="small" @click="editTask">鍦烘櫙璋冩暣</el-button> - <div><el-text>鐩戠鍦烘櫙</el-text></div> + <el-row justify="space-between"> + <div><el-text>鐩戠鍦烘櫙</el-text></div> + <el-button type="warning" size="small" @click="editTask">鍦烘櫙璋冩暣</el-button> + </el-row> <CompMonitorObj :data="curMonitorObjList"></CompMonitorObj> <!-- <div><el-text>鐩戠鍦烘櫙</el-text></div> <div> @@ -55,8 +61,19 @@ <script> import taskApi from '@/api/fysp/taskApi'; import CompMonitorObj from './components/CompMonitorObj.vue'; +import CompMonitorPlan from './components/CompMonitorPlan.vue'; export default { - components: { CompMonitorObj }, + beforeRouteEnter(to, from, next) { + // 鍦ㄦ覆鏌撹缁勪欢鐨勫搴旇矾鐢辫楠岃瘉鍓嶈皟鐢� + // 涓嶈兘鑾峰彇缁勪欢瀹炰緥 `this` 锛� + // 鍥犱负褰撳畧鍗墽琛屾椂锛岀粍浠跺疄渚嬭繕娌¤鍒涘缓锛� + next((vm) => { + if (from.name == 'monitorObjEdit' && vm.task) { + vm.chooseTask(vm.task); + } + }); + }, + components: { CompMonitorObj, CompMonitorPlan }, data() { return { formSearch: { @@ -73,18 +90,20 @@ tasks: [], // 褰撳墠浠诲姟鐨勭洃绠″璞� curMonitorObjList: [], + // 褰撳墠浠诲姟鐨勫睍绀轰腑鐨勭洃绠″璞� + showMonitorObjList: [], //褰撳墠閫変腑鐨勪换鍔� curTask: {}, //鎿嶄綔鎸夐挳 buttons: [ - { - name: '璁″垝璋冩暣', - color: 'success' - }, - { - name: '鍦烘櫙璋冩暣', - color: 'warning' - } + // { + // name: '璁″垝璋冩暣', + // color: 'success' + // }, + // { + // name: '鍦烘櫙璋冩暣', + // color: 'warning' + // } ] }; }, @@ -141,6 +160,7 @@ return type; }, chooseTask(task) { + this.task = task; this.sideLoading = false; this.mainLoading = true; taskApi @@ -161,6 +181,15 @@ task: encodeURIComponent(JSON.stringify(this.curTask.data)) } }); + }, + editPlan(){ + this.$router.push({ + name: 'monitorPlanEdit', + query: { + data: encodeURIComponent(JSON.stringify(this.curMonitorObjList)), + task: encodeURIComponent(JSON.stringify(this.curTask.data)), + } + }); } }, mounted() { -- Gitblit v1.9.3