From 3acec796e54dc2f5e7d93e8ca72db7da9ec46f60 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 28 四月 2025 17:33:56 +0800
Subject: [PATCH] 2025.04.28

---
 src/views/visualization/SupervisionVisual.vue |   80 +++++++++++++++++++++++++--------------
 1 files changed, 51 insertions(+), 29 deletions(-)

diff --git a/src/views/visualization/SupervisionVisual.vue b/src/views/visualization/SupervisionVisual.vue
index d362111..9d33e29 100644
--- a/src/views/visualization/SupervisionVisual.vue
+++ b/src/views/visualization/SupervisionVisual.vue
@@ -1,15 +1,30 @@
 <template>
   <el-row>
     <div class="p-events-auto">
-      <OptionLocation :level="3" :width="170" v-model="locations"></OptionLocation>
-      <OptionSceneType :type="2" :width="120" v-model="sceneType"></OptionSceneType>
+      <OptionLocation
+        :level="3"
+        :width="170"
+        :initValue="false"
+        v-model="locations"
+      ></OptionLocation>
+      <OptionSceneType
+        :type="2"
+        :width="120"
+        :initValue="false"
+        v-model="sceneType"
+      ></OptionSceneType>
       <OptionTime v-model="time"></OptionTime>
+      <el-button size="small" @click="fetchTaskProgress">鏌ヨ</el-button>
     </div>
   </el-row>
 </template>
 
 <script>
-import { inject } from 'vue'
+import { inject, unref } from 'vue'
+import { useAreaStore } from '@/stores/area.js'
+import { useSubtaskStore } from '@/stores/subtask.js'
+import { mapStores } from 'pinia'
+
 import taskApi from '@/api/fysp/taskApi.js'
 import marks from '@/utils/map/marks.js'
 import scene_1 from '@/assets/icon/scene_1.png'
@@ -27,42 +42,49 @@
   props: {},
   data() {
     return {
-      locations: {},
-      sceneType: {},
+      locations: {
+        pCode: '31',
+        pName: '涓婃捣甯�',
+        cCode: '3100',
+        cName: '涓婃捣甯�',
+        dCode: '310106',
+        dName: '闈欏畨鍖�'
+      },
+      sceneType: {
+        label: '宸ュ湴',
+        value: '1'
+      },
       time: ''
     }
   },
   computed: {
-    area() {
-      return {
-        provincecode: this.locations.pCode,
-        provincename: this.locations.pName,
-        citycode: this.locations.cCode,
-        cityname: this.locations.cName,
-        districtcode: this.locations.dCode,
-        districtname: this.locations.dName,
-        starttime: this.$fm.formatYMDH(this.time),
-        scensetypeid: this.sceneType.value
-      }
-    }
+    ...mapStores(useAreaStore),
+    ...mapStores(useSubtaskStore)
+    // area() {
+    //   return {
+    //     provincecode: this.locations.pCode,
+    //     provincename: this.locations.pName,
+    //     citycode: this.locations.cCode,
+    //     cityname: this.locations.cName,
+    //     districtcode: this.locations.dCode,
+    //     districtname: this.locations.dName,
+    //     starttime: this.$fm.formatYMDH(this.time),
+    //     scensetypeid: this.sceneType.value
+    //   }
+    // }
   },
   methods: {
     // 鏌ヨ
-    fetchSubtaskSummaryArea() {
-      return taskApi.fetchSubtaskSummaryArea(this.area).then((res) => {
-        let list = []
-        res.data.forEach((e) => {
-          list = list.concat(e.subTaskSummary)
-        })
-        this.newLabelMasks(list)
-      })
-    },
-    newLabelMasks(data) {
-      marks.createLabelMarks(scene_1, data)
+    fetchTaskProgress() {
+      this.areaStore.setLocation(this.locations)
+      this.areaStore.setTimeOneMonth(this.time)
+      this.areaStore.setSceneType(this.sceneType)
+
+      this.subtaskStore.fetchTopTaskProgress(this.areaStore.area)
     }
   },
   mounted() {
-    this.fetchSubtaskSummaryArea()
+    // this.fetchTaskProgress()
   }
 }
 </script>

--
Gitblit v1.9.3