From 91513e171078ed6b0887f87b9fced33895d6d3fb Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 08 七月 2025 08:35:50 +0800
Subject: [PATCH] 2025.7.8
---
src/views/main/MonitorView.vue | 134 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 111 insertions(+), 23 deletions(-)
diff --git a/src/views/main/MonitorView.vue b/src/views/main/MonitorView.vue
index 9ee3c3f..096d0f6 100644
--- a/src/views/main/MonitorView.vue
+++ b/src/views/main/MonitorView.vue
@@ -1,59 +1,147 @@
<template>
- <el-row>
+ <BaseMap></BaseMap>
+ <el-row class="overlay-container" v-if="true">
<el-col :span="7" class="page-right">
- <!-- <el-scrollbar height="var(--fy-body-height)"> -->
- <ManagementView></ManagementView>
- <!-- </el-scrollbar> -->
+ <el-scrollbar height="var(--fy-body-height)" class="p-events-auto" style="width: 450px">
+ <TaskStats></TaskStats>
+ <TaskSummary></TaskSummary>
+ </el-scrollbar>
</el-col>
<el-col :span="10">
- <el-scrollbar class="page-left-top">
- <VisualizationView></VisualizationView>
- </el-scrollbar>
- <el-scrollbar class="page-left-bottom">
+ <el-row justify="end">
+ <SubtaskVisual class="subtask-visual"></SubtaskVisual>
+ </el-row>
+ <!-- <el-scrollbar class="page-left-top"> -->
+ <!-- <VisualizationView></VisualizationView> -->
+ <!-- </el-scrollbar> -->
+ <!-- <el-scrollbar class="page-left-bottom p-events-auto">
<InspectionView></InspectionView>
- </el-scrollbar>
+ </el-scrollbar> -->
</el-col>
<el-col :span="7" class="page-right">
- <el-scrollbar height="var(--fy-body-height)">
- <StatisticView></StatisticView>
+ <el-scrollbar height="var(--fy-body-height)" class="p-events-auto">
+ <SupervisionVisual></SupervisionVisual>
+ <ManagementView></ManagementView>
</el-scrollbar>
</el-col>
</el-row>
+ <!-- <SupervisionVisual class="supervision-view"></SupervisionVisual> -->
+
+ <WorkStream class="work-stream"></WorkStream>
+ <!-- <ProblemTrack class="problem-track"></ProblemTrack> -->
</template>
<script setup>
-import { provide, ref } from 'vue'
+import { provide, ref, unref } from 'vue'
+
+import { useAreaStore } from '@/stores/area.js'
+import { useSubtaskStore } from '@/stores/subtask.js'
+import { useMapStore } from '@/stores/map.js'
+
+import taskApi from '@/api/fysp/taskApi.js'
+import marks from '@/utils/map/marks.js'
+import mapUtil from '@/utils/map/util.js'
+import scene_1 from '@/assets/icon/scene_1.png'
+
import InspectionView from '@/views/inspection/InspectionView.vue'
import ManagementView from '@/views/management/ManagementView.vue'
import StatisticView from '@/views/management/StatisticView.vue'
import VisualizationView from '@/views/visualization/VisualizationView.vue'
-import { useAreaStore } from '@/stores/area.js'
+import ProblemTrack from '@/views/inspection/problem/ProblemTrack.vue'
+import SupervisionVisual from '@/views/visualization/SupervisionVisual.vue'
+import WorkStream from '@/views/inspection/WorkStream.vue'
+import TaskStats from '@/views/management/TaskStats.vue'
+import TaskSummary from '@/views/management/TaskSummary.vue'
+import SubtaskVisual from '@/views/visualization/SubtaskVisual.vue'
+
+// provide('mapHeight', 'calc(var(--fy-body-height) / 4 * 3)')
+provide('mapHeight', 'calc(var(--fy-body-height))')
+provide('excludeMapHeight', 'calc(var(--fy-body-height) / 4 * 1)')
const windowHeight = ref(window.innerHeight)
+
const areaStore = useAreaStore()
-areaStore.setTimeOneDay()
+const subtaskStore = useSubtaskStore()
+const mapStore = useMapStore()
-// const headerHeight = computed(()=>{
-// return
-// })
-// fetch('../../assets/styles/layout.scss').then((res) => {
-// console.log(res.text())
-// })
+// 鍒濆鍖栨煡璇㈣寖鍥�
+areaStore.setTimeOneMonth()
+areaStore.setLocation({
+ pCode: '31',
+ pName: '涓婃捣甯�',
+ cCode: '3100',
+ cName: '涓婃捣甯�',
+ dCode: '310104',
+ dName: '寰愭眹鍖�'
+})
+areaStore.setSceneType({ label: '鍏ㄩ儴鍦烘櫙', value: null })
-provide('mapHeight', 'calc(var(--fy-body-height) / 3 * 2)')
+// 鑾峰彇鏈湀鐨勬墍鏈夊贰鏌ョ粺璁′俊鎭�
+subtaskStore.fetchTopTaskProgress(areaStore.area)
+// subtaskStore.subtaskLoading = true
+// taskApi.fetchTopTaskProgress(areaStore.area).then((res) => {
+// if (res.data.length == 0) return
+// const data = res.data[0]
+// // 瀛樺偍涓哄叏灞�鏁版嵁
+// subtaskStore.setSummary(data)
+// subtaskStore.subtaskLoading = false
+// // 缁樺埗鍦板浘鏍囪
+// marks.createLabelMarks(scene_1, unref(data.subTaskSummary), (v) => {
+// mapStore.focusMarker = v
+// })
+// mapUtil.setFitView()
+// })
</script>
<style scoped>
.page-left-top {
- height: calc(var(--fy-body-height) / 3 * 2);
+ height: calc(var(--fy-body-height) / 4 * 3);
/* background-color: aquamarine; */
}
.page-left-bottom {
- height: calc(var(--fy-body-height) / 3 * 1);
+ height: calc(var(--fy-body-height) / 4 * 1);
/* background-color: bisque; */
}
.page-right {
/* background-color: aliceblue; */
}
+
+.overlay-container {
+ /* background: aliceblue; */
+ position: absolute;
+ width: 100%;
+ /* height: 100vh; */
+ top: 0;
+ left: 0;
+ /* padding: 4px; */
+ pointer-events: none;
+}
+
+.work-stream {
+ position: absolute;
+ bottom: 0;
+ left: 0;
+}
+
+.task-stats {
+ position: absolute;
+ top: 0;
+ left: 0;
+}
+
+.supervision-view {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+}
+.problem-track {
+}
+
+.subtask-visual {
+ margin-top: 50px;
+ /* min-width: 450px;
+ max-width: 600px; */
+}
</style>
--
Gitblit v1.9.3