From d00a9f035aec50c37c8e0a1363a1968672fb875f Mon Sep 17 00:00:00 2001 From: riku <risaku@163.com> Date: 星期二, 16 七月 2024 16:58:39 +0800 Subject: [PATCH] 2024.7.16 --- src/views/visualization/SupervisionVisual.vue | 70 ++++++++++++++++++++++++---------- 1 files changed, 49 insertions(+), 21 deletions(-) diff --git a/src/views/visualization/SupervisionVisual.vue b/src/views/visualization/SupervisionVisual.vue index d362111..6d593c6 100644 --- a/src/views/visualization/SupervisionVisual.vue +++ b/src/views/visualization/SupervisionVisual.vue @@ -1,15 +1,28 @@ <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> </div> </el-row> </template> <script> -import { inject } from 'vue' +import { inject, unref } from 'vue' +import { useAreaStore } from '@/stores/area.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,29 +40,44 @@ 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) + // 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) => { + fetchTaskProgress() { + this.areaStore.setLocation(this.locations) + this.areaStore.setTimeOneDay(this.time) + this.areaStore.setSceneType(this.sceneType.value) + + return taskApi.fetchTaskProgress(this.areaStore.area).then((res) => { let list = [] res.data.forEach((e) => { list = list.concat(e.subTaskSummary) @@ -58,11 +86,11 @@ }) }, newLabelMasks(data) { - marks.createLabelMarks(scene_1, data) + marks.createLabelMarks(scene_1, unref(data)) } }, mounted() { - this.fetchSubtaskSummaryArea() + // this.fetchTaskProgress() } } </script> -- Gitblit v1.9.3