From b2f563e557d7b19334b6591a00001e3fb522da21 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 13 六月 2025 17:05:44 +0800
Subject: [PATCH] 2025.6.13
---
src/views/management/TaskSummary.vue | 163 +++++++++++++++++++++-------------------
src/api/index.js | 4
src/views/management/TaskStats.vue | 8 +
src/views/main/MonitorView.vue | 15 +--
4 files changed, 101 insertions(+), 89 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 2831695..7a84f90 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -6,8 +6,8 @@
var IP = '47.100.191.150'
var PORT = '9005'
if (debug) {
- // IP = '192.168.0.103'
- IP = 'localhost'
+ IP = '192.168.0.103'
+ // IP = 'localhost'
PORT = '9001'
}
diff --git a/src/views/main/MonitorView.vue b/src/views/main/MonitorView.vue
index 14a207c..fc0eea2 100644
--- a/src/views/main/MonitorView.vue
+++ b/src/views/main/MonitorView.vue
@@ -1,17 +1,17 @@
<template>
<BaseMap></BaseMap>
<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">
- <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)" class="p-events-auto">
+ <ManagementView></ManagementView>
</el-scrollbar>
</el-col>
<!-- <el-col :span="7" class="page-right">
@@ -114,13 +114,13 @@
.work-stream {
position: absolute;
bottom: 0;
- right: 0;
+ left: 0;
}
.task-stats {
position: absolute;
top: 0;
- right: 0;
+ left: 0;
}
.supervision-view {
@@ -130,6 +130,5 @@
right: 0;
}
.problem-track {
-
}
</style>
diff --git a/src/views/management/TaskStats.vue b/src/views/management/TaskStats.vue
index a8af6fc..4b1860d 100644
--- a/src/views/management/TaskStats.vue
+++ b/src/views/management/TaskStats.vue
@@ -1,8 +1,8 @@
<template>
<BaseCard title="浠诲姟鐩戞帶">
- <!-- <template #expand> -->
- <!-- <SupervisionVisual></SupervisionVisual> -->
- <!-- </template> -->
+ <!-- <template #expand>
+ <SupervisionVisual></SupervisionVisual>
+ </template> -->
<el-scrollbar ref="scrollbarRef">
<!-- <el-row justify="space-evenly">
<el-statistic title="浠婃棩瀹屾垚" :value="10"> </el-statistic>
@@ -10,6 +10,7 @@
</el-row> -->
<!-- <el-row> -->
<TaskItem v-for="item in tasks" :key="item.guid" v-bind="item"></TaskItem>
+ <TaskSummary></TaskSummary>
<!-- </el-row> -->
<!-- <el-row>
@@ -31,6 +32,7 @@
import SelfInspection from '@/views/inspection/SelfInspection.vue'
import JointEnforcement from '@/views/inspection/JointEnforcement.vue'
import SupervisionVisual from '@/views/visualization/SupervisionVisual.vue'
+import TaskSummary from '@/views/management/TaskSummary.vue'
import { useSubtaskStore } from '@/stores/subtask.js'
diff --git a/src/views/management/TaskSummary.vue b/src/views/management/TaskSummary.vue
index 7334b97..3e86186 100644
--- a/src/views/management/TaskSummary.vue
+++ b/src/views/management/TaskSummary.vue
@@ -1,95 +1,106 @@
<template>
- <BaseCard>
- <el-row> 宸℃煡姹囨�� </el-row>
- <el-segmented v-model="value" :options="options" />
- <div><el-text tag="i"> 璇勪及 </el-text></div>
- <el-row justify="space-evenly">
- <div>
- <el-statistic title="鎬昏" :value="10"> </el-statistic>
- <div class="statistic-footer">
- <div class="footer-item">
- <span>瀵规瘮鏄ㄦ棩</span>
- <span class="green">
- 24%
- <el-icon>
- <CaretTop />
- </el-icon>
- </span>
- </div>
+ <!-- <BaseCard> -->
+ <el-row> 宸℃煡姹囨�� </el-row>
+ <el-segmented v-model="value" :options="options" block />
+ <div><el-text tag="i"> 璇勪及 </el-text></div>
+ <el-row justify="space-evenly">
+ <div>
+ <el-statistic title="鎬昏" :value="10"> </el-statistic>
+ <div class="statistic-footer">
+ <div class="footer-item">
+ <span>瀵规瘮鏄ㄦ棩</span>
+ <span class="green">
+ 24%
+ <el-icon>
+ <CaretTop />
+ </el-icon>
+ </span>
</div>
</div>
- <el-statistic title="楂橀闄�" :value="2" :value-style="styleRed"> </el-statistic>
- <el-statistic title="涓闄�" :value="6" :value-style="styleYellow"> </el-statistic>
- <el-statistic title="浣庨闄�" :value="2" :value-style="styleGreen"> </el-statistic>
- </el-row>
- <div><el-text tag="i"> 澶嶆牳 </el-text></div>
- <el-row justify="space-evenly">
- <div>
- <el-statistic title="闇�澶嶆牳" :value="2"> </el-statistic>
- <div class="statistic-footer">
- <div class="footer-item">
- <span>瀵规瘮鏄ㄦ棩</span>
- <span class="green">
- 24%
- <el-icon>
- <CaretTop />
- </el-icon>
- </span>
- </div>
+ </div>
+ <el-statistic title="楂橀闄�" :value="2" :value-style="styleRed"> </el-statistic>
+ <el-statistic title="涓闄�" :value="6" :value-style="styleYellow"> </el-statistic>
+ <el-statistic title="浣庨闄�" :value="2" :value-style="styleGreen"> </el-statistic>
+ </el-row>
+ <div><el-text tag="i"> 澶嶆牳 </el-text></div>
+ <el-row justify="space-evenly">
+ <div>
+ <el-statistic title="闇�澶嶆牳" :value="2"> </el-statistic>
+ <div class="statistic-footer">
+ <div class="footer-item">
+ <span>瀵规瘮鏄ㄦ棩</span>
+ <span class="green">
+ 24%
+ <el-icon>
+ <CaretTop />
+ </el-icon>
+ </span>
</div>
</div>
- <el-statistic title="宸插畬鎴�" :value="2" :value-style="styleGreen"> </el-statistic>
- </el-row>
- <div><el-text tag="i"> 闂 </el-text></div>
- <el-row justify="space-evenly">
- <div>
- <el-statistic title="鎬昏" :value="10"> </el-statistic>
- <div class="statistic-footer">
- <div class="footer-item">
- <span>瀵规瘮鏄ㄦ棩</span>
- <span class="green">
- 24%
- <el-icon>
- <CaretTop />
- </el-icon>
- </span>
- </div>
+ </div>
+ <el-statistic title="宸插畬鎴�" :value="2" :value-style="styleGreen"> </el-statistic>
+ </el-row>
+ <div><el-text tag="i"> 闂 </el-text></div>
+ <el-row justify="space-evenly">
+ <div>
+ <el-statistic title="鎬昏" :value="10"> </el-statistic>
+ <div class="statistic-footer">
+ <div class="footer-item">
+ <span>瀵规瘮鏄ㄦ棩</span>
+ <span class="green">
+ 24%
+ <el-icon>
+ <CaretTop />
+ </el-icon>
+ </span>
</div>
</div>
- <el-statistic title="寰呭鏍�" :value="2" :value-style="styleRed"> </el-statistic>
- <el-statistic title="宸插鏍�" :value="6" :value-style="styleYellow"> </el-statistic>
- <el-statistic title="寰呮暣鏀�" :value="2" :value-style="styleGreen"> </el-statistic>
- <el-statistic title="宸叉暣鏀�" :value="2" :value-style="styleGreen"> </el-statistic>
- <el-statistic title="寰呯‘璁�" :value="2" :value-style="styleGreen"> </el-statistic>
- </el-row>
- </BaseCard>
+ </div>
+ <el-statistic title="寰呭鏍�" :value="2" :value-style="styleRed"> </el-statistic>
+ <el-statistic title="宸插鏍�" :value="6" :value-style="styleYellow"> </el-statistic>
+ <el-statistic title="寰呮暣鏀�" :value="2" :value-style="styleGreen"> </el-statistic>
+ <el-statistic title="宸叉暣鏀�" :value="2" :value-style="styleGreen"> </el-statistic>
+ <el-statistic title="寰呯‘璁�" :value="2" :value-style="styleGreen"> </el-statistic>
+ </el-row>
+ <!-- </BaseCard> -->
</template>
-<script>
-export default {
- props: {
- height: String
- },
- emits: ['update:height'],
- data() {
- return {
- value: '浠婃棩姹囨��',
- options: ['浠婃棩姹囨��', '鍛ㄥ害姹囨��', '鏈堝害姹囨��', '瀛ｅ害姹囨��', '骞村害姹囨��'],
- styleRed: 'color:var(--el-color-danger);',
- styleYellow: 'color:var(--el-color-warning);',
- styleGreen: 'color:var(--el-color-success);'
- }
- },
- mounted() {}
+<script setup>
+import { ref } from 'vue'
+import dayjs from 'dayjs'
+import taskApi from '@/api/fysp/taskApi.js'
+
+const props = defineProps({
+ height: String
+})
+
+const emits = defineEmits(['update:height'])
+
+const alue = '浠婃棩姹囨��'
+const ptions = ['浠婃棩姹囨��', '鍛ㄥ害姹囨��', '鏈堝害姹囨��', '瀛ｅ害姹囨��', '骞村害姹囨��']
+const tyleRed = 'color:var(--el-color-danger);'
+const tyleYellow = 'color:var(--el-color-warning);'
+const tyleGreen = 'color:var(--el-color-success);'
+
+function name(params) {
+ const d = dayjs()
+ const area = {
+ starttime: d.startOf('day').format('YYYY-MM-DD HH:mm:ss'),
+ endtime: d.endOf(type).format('YYYY-MM-DD HH:mm:ss')
+ }
+
+ taskApi.fetchSubtaskSummaryByArea(this.area).then((res) => {
+ this.subtaskList = res.data
+ })
}
</script>
<style scoped>
-.el-segmented {
+/* .el-segmented {
--el-segmented-item-selected-color: var(--el-text-color-primary);
--el-segmented-item-selected-bg-color: #ffd100;
--el-border-radius-base: 16px;
-}
+} */
.el-statistic {
--el-statistic-content-font-size: var(--el-font-size-base);
--
Gitblit v1.9.3