From 38ff09bd2a638bc43a365efe0390cc3510d62e68 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 09 六月 2025 17:36:37 +0800
Subject: [PATCH] 2025.6.9 功能编写中
---
src/views/inspection/problem/ProblemTrack.vue | 72 ++++++++++++++++++++++++++++++------
1 files changed, 60 insertions(+), 12 deletions(-)
diff --git a/src/views/inspection/problem/ProblemTrack.vue b/src/views/inspection/problem/ProblemTrack.vue
index 23ea39f..849b107 100644
--- a/src/views/inspection/problem/ProblemTrack.vue
+++ b/src/views/inspection/problem/ProblemTrack.vue
@@ -1,13 +1,33 @@
<template>
- <div class="border-r-small">
- <div class="font-large">闂鏁存敼璺熻釜</div>
+ <!-- <div class="border-r-small"> -->
+ <BaseCard>
+ <el-row justify="space-between" align="middle">
+ <div class="font-large">闂鏁存敼璺熻釜</div>
+ <OptionTime v-model="time" type="date"></OptionTime>
+ </el-row>
<div>
- <el-row justify="end">
- <OptionTime v-model="time" type="date"></OptionTime>
- </el-row>
- <ProblemSummary :data="subtaskList"></ProblemSummary>
+ <ProblemSummary :data="subtaskList" :proStatistic="proStatistic"></ProblemSummary>
<ProblemTable :data="subtaskList"></ProblemTable>
</div>
+ </BaseCard>
+ <BaseCard>
+ <el-row justify="space-between" align="middle">
+ <div class="font-large">鍒嗘湡瓒嬪娍</div>
+ <OptionTime v-model="time"></OptionTime>
+ </el-row>
+ <div>
+ <ProblemChangeChart ref="pChangeRef"></ProblemChangeChart>
+ </div>
+ </BaseCard>
+ <BaseCard>
+ <el-row justify="space-between" align="middle">
+ <div class="font-large">闂鍒嗗竷</div>
+ </el-row>
+ <div>
+ <ProblemType ref="pTypeRef"></ProblemType>
+ </div>
+ </BaseCard>
+ <!-- <BaseCard>
<el-collapse v-model="activeNames" @change="handleChange">
<el-collapse-item title="鍒嗘湡瓒嬪娍" name="1">
<ProblemChangeChart ref="pChangeRef"></ProblemChangeChart>
@@ -16,12 +36,15 @@
<ProblemType ref="pTypeRef"></ProblemType>
</el-collapse-item>
</el-collapse>
- </div>
+ </BaseCard> -->
+ <!-- </div> -->
</template>
<script>
import { useAreaStore } from '@/stores/area.js'
+import { useSubtaskStore } from '@/stores/subtask.js'
import { mapStores } from 'pinia'
+import dayjs from 'dayjs'
import ProblemTable from './component/ProblemTable.vue'
import ProblemSummary from './component/ProblemSummary.vue'
@@ -29,31 +52,55 @@
import ProblemType from './component/ProblemType.vue'
import taskApi from '@/api/fysp/taskApi.js'
+import problemApi from '@/api/fysp/problemApi.js'
export default {
components: { ProblemSummary, ProblemTable, ProblemChangeChart, ProblemType },
data() {
return {
+ // 鍗曟棩浠诲姟璇︽儏
subtaskList: [],
+ // 鍗曟棩闂缁熻
+ proStatistic: [],
+ // 鎶樺彔妗嗘縺娲诲悕绉伴泦鍚�
activeNames: ['1', '2'],
- time: ''
+ // 褰撳墠鏃堕棿
+ time: '',
+ // 绛涢�夊尯鍩熸潯浠�
+ area: {}
}
},
watch: {
time(nV, oV) {
if (nV != oV) {
- this.areaStore.setTimeOneDay(nV)
+ const d = nV ? dayjs(nV) : dayjs()
+ this.area.starttime = d.startOf('day').format('YYYY-MM-DD HH:mm:ss')
+ this.area.endtime = d.endOf('day').format('YYYY-MM-DD HH:mm:ss')
this.fetchSubtask()
+ this.fetchDayProblemsStatistic()
}
}
},
computed: {
- ...mapStores(useAreaStore)
+ ...mapStores(useAreaStore),
+ ...mapStores(useSubtaskStore)
},
methods: {
fetchSubtask() {
- taskApi.fetchSubtaskSummaryByArea(this.areaStore.area).then((res) => {
- this.subtaskList = res.data
+ // taskApi.fetchSubtaskSummaryByArea(this.area).then((res) => {
+ // this.subtaskList = res.data
+ // })
+ const tag = dayjs(this.time).format('YYYY-MM-DD')
+ this.subtaskStore.getSummaryList(tag, (v) => {
+ this.subtaskList = v ? v : []
+ })
+ },
+ fetchDayProblemsStatistic() {
+ // this.fetchData((page, pageSize) => {
+ // return
+ // })
+ problemApi.fetchProblemsStatistic(this.area).then((res) => {
+ this.proStatistic = res
})
},
handleChange(val) {
@@ -67,6 +114,7 @@
},
mounted() {
// this.fetchSubtask()
+ this.area = this.areaStore.area
}
}
</script>
--
Gitblit v1.9.3