From 9169a74e1d7b2d24d20d708b4498d7ca17eda9d8 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 28 四月 2025 13:42:52 +0800
Subject: [PATCH] 1. 新增自动评估监测数据统计导入功能 2. 修改问题审核界面巡查点次统计没有根据场景类型切换的问题
---
src/views/fysp/check/ProCheck.vue | 143 ++++++++++++++---------------------------------
1 files changed, 44 insertions(+), 99 deletions(-)
diff --git a/src/views/fysp/check/ProCheck.vue b/src/views/fysp/check/ProCheck.vue
index 411065c..8090280 100644
--- a/src/views/fysp/check/ProCheck.vue
+++ b/src/views/fysp/check/ProCheck.vue
@@ -3,7 +3,12 @@
<template #header>
<SearchBar @on-submit="search">
<template #summary>
- <CompSubTaskStatistic :subtasks="subtasks" />
+ <CompSubTaskStatistic
+ :loading="sideLoading"
+ :sceneType="sceneTypeId"
+ :subtasks="subtasks"
+ :monitorObjList="curMonitorObjList"
+ />
</template>
</SearchBar>
</template>
@@ -16,29 +21,31 @@
></SideList>
</template>
<template #main>
- <ToolBar
- :title="curSubtask.title"
- :descriptions="proStatus"
- :buttons="buttons"
- :loading="mainLoading"
- ></ToolBar>
- <el-scrollbar
- v-if="curProList.length > 0"
- class="el-scrollbar"
- v-loading="mainLoading"
- >
- <CompProblemCard
- :key="i"
- v-for="(p, i) in curProList"
- :index="i + 1"
- :problem="p"
- :subtask="curSubtask.data"
- :topTask="topTask"
- @submit="updateSubtask"
- @check="handleProblemCheck"
- ></CompProblemCard>
+ <el-scrollbar >
+ <ToolBar
+ :title="curSubtask.title"
+ :descriptions="proStatus"
+ :buttons="buttons"
+ :loading="mainLoading"
+ ></ToolBar>
+ <el-scrollbar
+ v-if="curProList.length > 0"
+ class="scrollbar-inner"
+ v-loading="mainLoading"
+ >
+ <CompProblemCard
+ :key="i"
+ v-for="(p, i) in curProList"
+ :index="i + 1"
+ :problem="p"
+ :subtask="curSubtask.data"
+ :topTask="topTask"
+ @submit="updateSubtask"
+ @check="handleProblemCheck"
+ ></CompProblemCard>
+ </el-scrollbar>
+ <el-empty v-else description="鏆傛棤闂" v-loading="mainLoading" />
</el-scrollbar>
- <el-empty v-else description="鏆傛棤闂" v-loading="mainLoading" />
</template>
</BaseContentLayout>
<CompProblemAddOrUpd
@@ -97,6 +104,10 @@
mainLoading: false,
// 鎬讳换鍔�
topTask: {},
+ // 鍦烘櫙绫诲瀷id
+ sceneTypeId: undefined,
+ // 鎬讳换鍔″贰鏌ヨ鍒掓竻鍗�
+ curMonitorObjList: [],
//瀛愪换鍔″垪琛�
subtasks: [],
//褰撳墠閫変腑鐨勪换鍔�
@@ -140,81 +151,6 @@
//闂鐘舵��
proStatus() {
return ProCheckProxy.proStatusArray(this.curProList);
- },
- //浠诲姟闂瀹℃牳鎯呭喌缁熻淇℃伅
- summary() {
- const _summary = [
- {
- name: '浠诲姟鎬昏',
- value: 0,
- type: 'info'
- },
- {
- name: '闂鏈鏍�',
- value: 0,
- type: 'success',
- icon: 'SuccessFilled'
- },
- {
- name: '闂閮ㄥ垎瀹℃牳',
- value: 0,
- type: 'success',
- icon: 'SuccessFilled'
- },
- {
- name: '闂鍏ㄩ儴瀹℃牳',
- value: 0,
- type: 'success',
- icon: 'SuccessFilled'
- },
- {
- name: '鏈暣鏀�',
- value: 0,
- type: 'info',
- icon: 'WarningFilled'
- },
- {
- name: '鏁存敼鏈鏍�',
- value: 0,
- type: 'info',
- icon: 'WarningFilled'
- },
- {
- name: '鏁存敼閮ㄥ垎瀹℃牳',
- value: 0,
- type: 'warning',
- icon: 'WarningFilled'
- },
- {
- name: '鏁存敼鍏ㄩ儴瀹℃牳',
- value: 0,
- type: 'warning',
- icon: 'WarningFilled'
- }
- ];
-
- this.subtasks.forEach((s) => {
- _summary[0].value++;
-
- if (s.data.proNum == 0) {
- _summary[1].value++;
- } else if (s.data.proCheckedNum == 0) {
- _summary[3].value++;
- } else if (s.data.proCheckedNum < s.data.proNum) {
- _summary[2].value++;
- } else {
- _summary[1].value++;
- }
- });
- _summary.forEach((s, i) => {
- if (i > 0) {
- let per = Math.round((s.value / _summary[0].value) * 1000) / 10;
- if (isNaN(per)) per = 0;
- s.value = `${s.value}(${per}%)`;
- }
- });
-
- return _summary;
}
},
methods: {
@@ -232,6 +168,7 @@
this.mainLoading = true;
this.curProList = [];
this.curSubtask = {};
+ this.sceneTypeId = formSearch.sceneTypeId
const param = {
topTaskId: formSearch.topTask.tguid,
sceneTypeId: formSearch.sceneTypeId
@@ -253,6 +190,9 @@
this.sideLoading = false;
this.mainLoading = false;
}
+ });
+ taskApi.fetchMonitorObjectVersion(param.topTaskId).then((res) => {
+ this.curMonitorObjList = res;
});
},
//鐐瑰嚮宸︿晶鑿滃崟浠诲姟浜嬩欢
@@ -325,7 +265,12 @@
</script>
<style scoped>
-.el-scrollbar {
+.scrollbar-outer {
+ height: calc(100vh - 60px * 2 - 24px);
+ background-color: aliceblue;
+}
+
+.scrollbar-inner {
height: calc(100vh - 60px * 2 - 20px * 2 - var(--height-toolbar));
}
</style>
--
Gitblit v1.9.3