From d8eda80eaf2f328ed43dc4f5c783b7dee5a4092c Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期六, 12 十月 2024 17:39:39 +0800
Subject: [PATCH] 1. 新增巡查计划功能（待完成）； 2. 完成任务的各场景下的分别移除和添加；
---
src/views/fysp/task/TaskManage.vue | 53 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 13 deletions(-)
diff --git a/src/views/fysp/task/TaskManage.vue b/src/views/fysp/task/TaskManage.vue
index 0e2de57..4239a94 100644
--- a/src/views/fysp/task/TaskManage.vue
+++ b/src/views/fysp/task/TaskManage.vue
@@ -31,11 +31,17 @@
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>
- <CompMonitorObj :data="curMonitorObjList" v-model:showData="showMonitorObjList"></CompMonitorObj>
+ <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>
<el-space wrap>
@@ -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: {
@@ -79,14 +96,14 @@
curTask: {},
//鎿嶄綔鎸夐挳
buttons: [
- {
- name: '璁″垝璋冩暣',
- color: 'success'
- },
- {
- name: '鍦烘櫙璋冩暣',
- color: 'warning'
- }
+ // {
+ // name: '璁″垝璋冩暣',
+ // color: 'success'
+ // },
+ // {
+ // name: '鍦烘櫙璋冩暣',
+ // color: 'warning'
+ // }
]
};
},
@@ -143,6 +160,7 @@
return type;
},
chooseTask(task) {
+ this.task = task;
this.sideLoading = false;
this.mainLoading = true;
taskApi
@@ -163,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