From 9a61e46d96536f3299e57f7259ae1c9972256ec6 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 30 九月 2025 09:42:09 +0800
Subject: [PATCH] 1. 隐藏未完成的账户匹配页面 2. 根据第三方新的接口文档修改接口url地址
---
src/views/fysp/task/TaskManage.vue | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/src/views/fysp/task/TaskManage.vue b/src/views/fysp/task/TaskManage.vue
index 24129b6..161af96 100644
--- a/src/views/fysp/task/TaskManage.vue
+++ b/src/views/fysp/task/TaskManage.vue
@@ -43,6 +43,7 @@
<CompMonitorPlan
ref="planRef"
:task="curTask.data"
+ :day-task-list="curDayTaskList"
@date-change="onDateChange"
></CompMonitorPlan>
</el-col>
@@ -51,7 +52,7 @@
create
v-model="curSubTaskList"
:loading="subTaskLoading"
- :create-loading="daytaskLoading"
+ :create-loading="daytaskCreateLoading"
height="56vh"
@add="handleAddSubtask"
@submit="handleSubtaskSubmit"
@@ -59,9 +60,9 @@
</el-col>
</el-row>
</el-tab-pane>
- <!-- <el-tab-pane label="鐩戠鍦板浘" name="second">
- <CompTaskMap></CompTaskMap>
- </el-tab-pane> -->
+ <el-tab-pane label="鐩戠鍦板浘" name="second">
+ <CompTaskMap :plans="curMonitorObjList"></CompTaskMap>
+ </el-tab-pane>
</el-tabs>
</el-row>
<el-divider></el-divider>
@@ -167,6 +168,9 @@
showMonitorObjList: [],
//褰撳墠閫変腑鐨勪换鍔�
curTask: {},
+ //褰撳墠閫変腑鐨勬棩浠诲姟
+ curDayTaskList: [],
+ daytaskLoading: false,
//鎿嶄綔鎸夐挳
buttons: [
{
@@ -186,7 +190,7 @@
// 褰撳墠閫夋嫨鐨勬棩浠诲姟
curDayTask: {},
curDay: undefined,
- daytaskLoading: false,
+ daytaskCreateLoading: false,
// 褰撳墠閫夋嫨鐨勬棩浠诲姟涓嬬殑瀛愪换鍔�
curSubTaskList: undefined,
subTaskLoading: false,
@@ -210,7 +214,10 @@
});
return [
{ name: '鍦烘櫙鏁�', value: total },
- { name: '鏈贰鏌�', value: total - inspected },
+ {
+ name: '鏈贰鏌�',
+ value: total - inspected > 0 ? total - inspected : 0
+ },
{ name: '宸插贰鏌�', value: inspected }
];
}
@@ -270,7 +277,18 @@
})
.finally(() => {
this.mainLoading = false;
+ this.fetchDayTasks();
});
+ },
+ fetchDayTasks() {
+ // 鑾峰彇鏃ヤ换鍔$粺璁′俊鎭�
+ this.dayTaskLoading = true;
+ return taskApi
+ .fetchDayTasks(this.curTask.data.tguid)
+ .then((res) => {
+ this.curDayTaskList = res;
+ })
+ .finally(() => (this.dayTaskLoading = false));
},
editTask() {
this.$router.push({
@@ -340,7 +358,7 @@
_dayTask.settime = dayjs().toDate();
_dayTask.t1stverifytime = dayjs().toDate();
_dayTask.runingstatus = '鏈墽琛�';
- this.daytaskLoading = true;
+ this.daytaskCreateLoading = true;
taskApi
.putTask(_dayTask)
.then((res) => {
@@ -356,7 +374,7 @@
this.subTaskDrawer = true;
this.handleSubtaskSubmit();
})
- .finally(() => (this.daytaskLoading = false));
+ .finally(() => (this.daytaskCreateLoading = false));
}
}
},
--
Gitblit v1.9.3