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 | 58 ++++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 38 insertions(+), 20 deletions(-) diff --git a/src/views/main/MonitorView.vue b/src/views/main/MonitorView.vue index badd461..096d0f6 100644 --- a/src/views/main/MonitorView.vue +++ b/src/views/main/MonitorView.vue @@ -1,28 +1,34 @@ <template> <BaseMap></BaseMap> - <el-row class="overlay-container" v-if="false"> + <el-row class="overlay-container" v-if="true"> + <el-col :span="7" class="page-right"> + <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-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-col> <el-col :span="7" class="page-right"> <el-scrollbar height="var(--fy-body-height)" class="p-events-auto"> + <SupervisionVisual></SupervisionVisual> <ManagementView></ManagementView> </el-scrollbar> </el-col> - <el-col :span="17"> - <el-scrollbar class="page-left-top"> - <VisualizationView></VisualizationView> - </el-scrollbar> - <el-scrollbar class="page-left-bottom p-events-auto"> - <!-- <InspectionView></InspectionView> --> - </el-scrollbar> - </el-col> - <!-- <el-col :span="7" class="page-right"> - <el-scrollbar height="var(--fy-body-height)"> - <StatisticView></StatisticView> - </el-scrollbar> - </el-col> --> </el-row> - <SupervisionVisual class="supervision-view"></SupervisionVisual> - <TaskStats class="task-stats"></TaskStats> + <!-- <SupervisionVisual class="supervision-view"></SupervisionVisual> --> + <WorkStream class="work-stream"></WorkStream> + <!-- <ProblemTrack class="problem-track"></ProblemTrack> --> </template> <script setup> @@ -41,9 +47,13 @@ import ManagementView from '@/views/management/ManagementView.vue' import StatisticView from '@/views/management/StatisticView.vue' import VisualizationView from '@/views/visualization/VisualizationView.vue' + +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))') @@ -61,10 +71,10 @@ pName: '涓婃捣甯�', cCode: '3100', cName: '涓婃捣甯�', - dCode: '310106', - dName: '闈欏畨鍖�' + dCode: '310104', + dName: '寰愭眹鍖�' }) -areaStore.setSceneType({ label: '宸ュ湴', value: '1' }) +areaStore.setSceneType({ label: '鍏ㄩ儴鍦烘櫙', value: null }) // 鑾峰彇鏈湀鐨勬墍鏈夊贰鏌ョ粺璁′俊鎭� subtaskStore.fetchTopTaskProgress(areaStore.area) @@ -111,7 +121,7 @@ .work-stream { position: absolute; bottom: 0; - right: 0; + left: 0; } .task-stats { @@ -126,4 +136,12 @@ left: 0; right: 0; } +.problem-track { +} + +.subtask-visual { + margin-top: 50px; + /* min-width: 450px; + max-width: 600px; */ +} </style> -- Gitblit v1.9.3