From 803b93038ca16e21ea60a260ca4ac882b84a87ef Mon Sep 17 00:00:00 2001 From: riku <risaku@163.com> Date: 星期五, 18 七月 2025 17:31:53 +0800 Subject: [PATCH] 2025.7.18 监管任务模块 1. 监管场景样式优化; 2. 新增监管场景GIS地图展示(待完成); --- src/views/fysp/task/components/CompMonitorPlan.vue | 71 +++++++++++++++++++++-------------- 1 files changed, 42 insertions(+), 29 deletions(-) diff --git a/src/views/fysp/task/components/CompMonitorPlan.vue b/src/views/fysp/task/components/CompMonitorPlan.vue index 3294472..c1e2856 100644 --- a/src/views/fysp/task/components/CompMonitorPlan.vue +++ b/src/views/fysp/task/components/CompMonitorPlan.vue @@ -1,6 +1,5 @@ <template> <el-calendar - v-loading="dayTaskLoading" v-model="dateValue" :range="dateRange" @update:model-value="onDateChange" @@ -53,6 +52,10 @@ task: { type: Object, default: () => {} + }, + dayTaskList: { + type: Array, + default: () => [] } }); const emit = defineEmits(['dateChange']); @@ -98,22 +101,32 @@ /********************** 浠诲姟鏁版嵁 *********************************/ -// 鑾峰彇鏃ヤ换鍔$粺璁′俊鎭� -const dayTaskLoading = ref(false); -const dayTaskList = ref([]); -function fetchDayTasks() { - dayTaskLoading.value = true; - return taskApi - .fetchDayTasks(props.task.tguid) - .then((res) => { - dayTaskList.value = res; - // 濡傛灉宸查�夋棩鏈熷瓨鍦紝鍦ㄩ噸鏂拌幏鍙栨棩浠诲姟缁熻淇℃伅鍚庯紝鍐嶆瑙﹀彂鐐瑰嚮浜嬩欢 - if (dateValue.value) { - onDateChange(dateValue.value) - } - }) - .finally(() => (dayTaskLoading.value = false)); -} +watch( + () => props.dayTaskList, + (nV, oV) => { + if (nV != oV && dateValue.value) { + onDateChange(dateValue.value); + } + }, + { immediate: false } +); + +// // 鑾峰彇鏃ヤ换鍔$粺璁′俊鎭� +// const dayTaskLoading = ref(false); +// const dayTaskList = ref([]); +// function fetchDayTasks() { +// dayTaskLoading.value = true; +// return taskApi +// .fetchDayTasks(props.task.tguid) +// .then((res) => { +// dayTaskList.value = res; +// // 濡傛灉宸查�夋棩鏈熷瓨鍦紝鍦ㄩ噸鏂拌幏鍙栨棩浠诲姟缁熻淇℃伅鍚庯紝鍐嶆瑙﹀彂鐐瑰嚮浜嬩欢 +// if (dateValue.value) { +// onDateChange(dateValue.value); +// } +// }) +// .finally(() => (dayTaskLoading.value = false)); +// } // 鏃ヤ换鍔℃暟鎹睍绀� const compMap = new Map(); @@ -123,7 +136,7 @@ return compMap.get(key).value; } const result = computed(() => { - return dayTaskList.value.find((v) => { + return props.dayTaskList.find((v) => { return dayjs(v.date).isSame(dayjs(day)); }); }); @@ -142,7 +155,7 @@ // 鎬讳换鍔$粺璁� const taskStatistic = computed(() => { const res = { total: 0, complete: 0, changed: 0 }; - dayTaskList.value.forEach((e) => { + props.dayTaskList.forEach((e) => { res.total += e.totalTaskNum; res.complete += e.completeTaskNum; res.changed += e.changedTaskNum; @@ -151,17 +164,17 @@ }); /********************** 鍒濆鍖� *********************************/ -watch( - () => props.task, - (nV) => { - if (nV && nV.tguid) { - fetchDayTasks(); - } - }, - { immediate: true } -); +// watch( +// () => props.task, +// (nV) => { +// if (nV && nV.tguid) { +// fetchDayTasks(); +// } +// }, +// { immediate: true } +// ); -defineExpose({ fetchDayTasks }); +// defineExpose({ fetchDayTasks }); </script> <style scoped> .li-01 { -- Gitblit v1.9.3