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 | 279 +++++++++++++++++--------------------------------------
1 files changed, 89 insertions(+), 190 deletions(-)
diff --git a/src/views/fysp/check/ProCheck.vue b/src/views/fysp/check/ProCheck.vue
index 68d5b0c..8090280 100644
--- a/src/views/fysp/check/ProCheck.vue
+++ b/src/views/fysp/check/ProCheck.vue
@@ -3,30 +3,36 @@
<template #header>
<SearchBar @on-submit="search">
<template #summary>
- <CompSubTaskStatistic :subtasks="subtasks" />
+ <CompSubTaskStatistic
+ :loading="sideLoading"
+ :sceneType="sceneTypeId"
+ :subtasks="subtasks"
+ :monitorObjList="curMonitorObjList"
+ />
</template>
</SearchBar>
</template>
<template #aside>
<SideList
+ legend
:items="subtasks"
:loading="sideLoading"
@item-click="chooseSubtask"
></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"
- >
- <template v-if="compProblemCardVisible">
+ <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"
@@ -34,28 +40,24 @@
:problem="p"
:subtask="curSubtask.data"
:topTask="topTask"
- @updated="onProSubmited"
@submit="updateSubtask"
+ @check="handleProblemCheck"
></CompProblemCard>
- </template>
+ </el-scrollbar>
+ <el-empty v-else description="鏆傛棤闂" v-loading="mainLoading" />
</el-scrollbar>
- <el-empty v-else description="鏆傛棤璁板綍" v-loading="mainLoading" />
</template>
</BaseContentLayout>
- <el-dialog
- v-model="proAddOrUpdDialogVisible"
- :before-close="proAddOrUpdDialogClose"
- width="50%"
+ <CompProblemAddOrUpd
title="鏂板闂"
- >
- <CompProblemAddOrUpd
- v-if="proAddOrUpdDialogVisible"
- :subtask="curSubtask.data"
- :topTask="topTask"
- ref="compProblemAddOrUpdRef"
- @submited="newProSubmit"
- />
- </el-dialog>
+ v-if="proAddOrUpdDialogVisible"
+ v-model:visible="proAddOrUpdDialogVisible"
+ :subtask="curSubtask.data"
+ :topTask="topTask"
+ ref="compProblemAddOrUpdRef"
+ @cancel="onAddProCanceled"
+ @submit="updateSubtask"
+ />
<ArbitraryPhoto
v-if="anyPhotoDialog"
v-model:dialog-visible="anyPhotoDialog"
@@ -63,16 +65,13 @@
:subtask="curSubtask.data"
ref="arbitraryPhotoRef"
></ArbitraryPhoto>
- <el-drawer
- direction="ltr"
- v-model="deviceShowDialog"
- :before-close="beforeDeviceShowDialogclose"
+ <CompDeviceShowTest
title="璁炬柦璁惧"
- size="45%"
+ v-model:visible="deviceShowDialog"
+ v-if="deviceShowDialog"
+ ref="deviceShowRef"
>
- <CompDeviceShowTest v-if="deviceShowDialog" ref="deviceShowRef">
- </CompDeviceShowTest>
- </el-drawer>
+ </CompDeviceShowTest>
</template>
<script>
@@ -93,7 +92,6 @@
},
data() {
return {
- compProblemCardVisible: true,
// 璁惧鍥�
deviceShowDialog: false,
// 浠绘剰鍥�
@@ -106,6 +104,10 @@
mainLoading: false,
// 鎬讳换鍔�
topTask: {},
+ // 鍦烘櫙绫诲瀷id
+ sceneTypeId: undefined,
+ // 鎬讳换鍔″贰鏌ヨ鍒掓竻鍗�
+ curMonitorObjList: [],
//瀛愪换鍔″垪琛�
subtasks: [],
//褰撳墠閫変腑鐨勪换鍔�
@@ -116,21 +118,23 @@
buttons: [
{
name: '鏂板闂',
- color: 'success',
+ // color: 'success',
+ color: 'primary',
click: () => {
this.proAddOrUpdDialogVisible = true;
}
},
{
name: '鍦烘櫙鍥剧墖',
- color: 'warning',
+ // color: 'warning',
+ color: 'primary',
click: () => {
this.anyPhotoDialog = true;
}
},
{
name: '璁炬柦璁惧',
- color: 'info',
+ color: 'primary',
click: () => {
this.openDeviceShowDialog();
}
@@ -147,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,21 +161,6 @@
this.$refs.deviceShowRef.init(this.curSubtask.data.scene);
});
},
- // 鍏抽棴璁惧鍥惧脊绐�
- beforeDeviceShowDialogclose(done) {
- // this.deviceShowDialog = false;
- done();
- },
- // 鍏抽棴浠绘剰鍥剧墖寮圭獥
- beforeAnyPhotoDialogclose() {
- this.anyPhotoDialog = false;
- },
- handleCloseCheckAnyPhono() {
- this.beforeAnyPhotoDialogclose();
- },
- proAddOrUpdDialogClose() {
- this.proAddOrUpdDialogVisible = false;
- },
//鏌ヨ瀛愪换鍔＄粺璁′俊鎭�
search(formSearch) {
this.topTask = formSearch.topTask;
@@ -254,6 +168,7 @@
this.mainLoading = true;
this.curProList = [];
this.curSubtask = {};
+ this.sceneTypeId = formSearch.sceneTypeId
const param = {
topTaskId: formSearch.topTask.tguid,
sceneTypeId: formSearch.sceneTypeId
@@ -261,8 +176,9 @@
taskApi.getSubtaskSummary(param).then((res) => {
const list = [];
res.forEach((s) => {
- const t = this.getSubtaskType(s);
+ const t = ProCheckProxy.getSubtaskType(s);
list.push({
+ status: s.subtask.status,
type: t,
title: s.stName,
categoly: s.stPlanTime.split('T')[0],
@@ -275,39 +191,9 @@
this.mainLoading = false;
}
});
- },
- //鑾峰彇浠诲姟闂鐨勫鏍告儏鍐�
- getSubtaskType(s) {
- let type = 0;
- // 鏃犻棶棰�
- if (s.proNum == 0) {
- type = 0;
- }
- // 闂鏈鏍�
- else if (s.proCheckedNum == 0) {
- type = 1;
- }
- // 闂閮ㄥ垎瀹℃牳
- else if (s.proCheckedNum < s.proNum) {
- type = 2;
- }
- // 鏈暣鏀�
- else if (s.changeNum < s.proNum) {
- type = 3;
- }
- // 鏁存敼鏈鏍�
- else if (s.changeCheckedNum == 0) {
- type = 4;
- }
- // 鏁存敼閮ㄥ垎瀹℃牳
- else if (s.changeCheckedNum < s.changeNum) {
- type = 5;
- }
- // 瀹屽叏瀹℃牳
- else {
- type = 6;
- }
- return type;
+ taskApi.fetchMonitorObjectVersion(param.topTaskId).then((res) => {
+ this.curMonitorObjList = res;
+ });
},
//鐐瑰嚮宸︿晶鑿滃崟浠诲姟浜嬩欢
chooseSubtask(s) {
@@ -325,45 +211,53 @@
this.mainLoading = false;
});
},
+ onAddProCanceled() {},
// 闂鍗＄墖缁勪欢涓诲姩鍙戣捣鍒锋柊鐖剁粍浠舵暟鎹�
- updateSubtask(refresh = true) {
+ updateSubtask(refresh = false) {
this.curSubtask.data.proCheckedNum++;
- this.curSubtask.type = this.getSubtaskType(this.curSubtask.data);
- if (refresh) {
- this.refreshCurrSubtask();
+ this.curSubtask.type = ProCheckProxy.getSubtaskType(this.curSubtask.data);
+ if (this.proAddOrUpdDialogVisible) {
+ this.proAddOrUpdDialogVisible = false;
}
- },
- onProSubmited(isOk) {
- this.proAddOrUpdDialogClose();
- if (!isOk) {
- return;
- }
- this.updateSubtask();
- },
- newProSubmit(isOk) {
- this.proAddOrUpdDialogVisible = false;
- if (!isOk) {
- return;
- }
- this.refreshCurrSubtask();
+ this.refreshCurrSubtask(refresh);
},
// 鍒锋柊褰撳墠閫変腑瀛愪换鍔�
- refreshCurrSubtask() {
- this.compProblemCardVisible = false;
+ refreshCurrSubtask(refresh) {
this.sideLoading = false;
- this.mainLoading = true;
setTimeout(() => {
+ this.mainLoading = true;
taskApi
.getProBySubtask(this.curSubtask.data.stGuid)
.then((res) => {
- this.curProList = res;
+ if (refresh) {
+ this.curProList = res;
+ return;
+ }
+ const currProLen = this.curProList.length;
+ // 涓嶆敼鍙樻暟缁勫鍍忓紩鐢ㄧ殑鍓嶆彁涓嬮噸鏂拌祴鍊�
+ for (let index = 0; index < res.length; index++) {
+ const element = res[index];
+ if (currProLen < index + 1) {
+ this.curProList.push(element);
+ } else {
+ this.curProList[index] = element;
+ }
+ }
// this.curSubtask = s;
})
.finally(() => {
this.mainLoading = false;
- this.compProblemCardVisible = true;
});
- }, 150);
+ }, 500);
+ },
+ // 闂瀹℃牳瀹屾垚鍚庯紝鏇存柊宸︿晶鍒楄〃瀵瑰簲瀛愪换鍔＄姸鎬�
+ handleProblemCheck() {
+ const status = ProCheckProxy.calProStatus(this.curProList);
+ this.curSubtask.data.proNum = status.proNum;
+ this.curSubtask.data.proCheckedNum = status.proCheckedNum;
+ this.curSubtask.data.changeNum = status.changeNum;
+ this.curSubtask.data.changeCheckedNum = status.changeCheckedNum;
+ this.curSubtask.type = ProCheckProxy.getSubtaskType(this.curSubtask.data);
}
},
mounted() {}
@@ -371,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