From ad208889ad6ca2283a06d7bc440ecd289c535d83 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 03 四月 2025 17:26:29 +0800
Subject: [PATCH] 1. 添加显示问题整改的时间； 2. 新增巡查场景数、巡查点次、复查点次的统计； 3. 添加扬尘监测数据统计结果管理（待完成）
---
src/views/fysp/check/components/CompProblemCard.vue | 170 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 137 insertions(+), 33 deletions(-)
diff --git a/src/views/fysp/check/components/CompProblemCard.vue b/src/views/fysp/check/components/CompProblemCard.vue
index e599f5c..77f907d 100644
--- a/src/views/fysp/check/components/CompProblemCard.vue
+++ b/src/views/fysp/check/components/CompProblemCard.vue
@@ -1,15 +1,19 @@
<template>
- <el-card class="layout" shadow="hover">
- <el-steps
- :active="proStatus.index"
- finish-status="success"
- style=""
- align-center
- >
- <el-step v-for="(s, i) in getSteps" :key="i" :title="s" />
- </el-steps>
+ <el-card class="layout" shadow="never">
+ <!-- <el-row justify="space-between"> -->
+ <div>
+ <el-steps
+ :active="proStatus.index"
+ finish-status="success"
+ style=""
+ align-center
+ >
+ <el-step v-for="(s, i) in getSteps" :key="i" :title="s" />
+ </el-steps>
+ </div>
+ <!-- </el-row> -->
- <el-descriptions :column="3" size="small">
+ <el-descriptions :column="2" size="small" border>
<template #title>
<span class="d-index">{{ index }}</span>
<span class="d-title">{{ title }}</span>
@@ -30,8 +34,14 @@
v-for="(d, i) in descriptions"
:key="i"
:label="d.name"
- >{{ d.value }}</el-descriptions-item
>
+ <template #label>
+ <el-text tag="b" size="small">
+ {{ d.name }}
+ </el-text>
+ </template>
+ {{ d.value }}
+ </el-descriptions-item>
</el-descriptions>
<el-scrollbar>
@@ -50,6 +60,11 @@
t == 0 ? 'descriptions-label-1' : 'descriptions-label-2'
"
>
+ <template #label>
+ <el-text tag="b" size="small">
+ {{ pic.title }}
+ </el-text>
+ </template>
<el-space>
<el-image
v-for="(p, i) in pic.path"
@@ -89,11 +104,22 @@
type="danger"
size="small"
@click="deletePro"
- :disabled="!proStatus.deletable"
+ :disabled="true"
>鍒犻櫎</el-button
>
+ <!-- <el-button
+ type="danger"
+ size="small"
+ @click="deletePro"
+ :disabled="!proStatus.deletable"
+ >鍒犻櫎</el-button
+ > -->
+ <!-- 瀹℃牳椹冲洖鎿嶄綔 -->
<el-button
- v-if="proStatus.name.indexOf('涓嶉�氳繃') != -1"
+ v-if="
+ this.problem.extension3 == 'fail' ||
+ this.problem.extension3 == 'change_fail'
+ "
type="danger"
size="small"
@click="revokePro"
@@ -106,12 +132,12 @@
size="small"
@click="rejectPro"
:disabled="!proStatus.checkable"
- >椹冲洖</el-button
+ >瀹℃牳椹冲洖</el-button
>
<el-button
v-if="
- proStatus.name.indexOf('涓嶉�氳繃') == -1 &&
- proStatus.name.indexOf('閫氳繃') != -1
+ this.problem.extension3 == 'pass' ||
+ this.problem.extension3 == 'change_pass'
"
type="danger"
size="small"
@@ -125,7 +151,7 @@
size="small"
@click="passPro"
:disabled="!proStatus.checkable"
- >閫氳繃</el-button
+ >瀹℃牳閫氳繃</el-button
>
</el-row>
</el-col>
@@ -139,6 +165,7 @@
:subtask="subtask"
:topTask="topTask"
ref="compProblemAddOrUpdRef"
+ @cancel="onProCanceled"
@submit="onProSubmited"
/>
<!-- 鏁存敼 -->
@@ -151,6 +178,7 @@
:subtask="subtask"
:month="month"
:oldChangeFileList="problem.mediafileList"
+ @cancel="onChangeCanceled"
@submit="onChangeSubmited"
/>
<!-- 闂澶嶇幇 -->
@@ -173,7 +201,7 @@
import CompProRecent from './CompProRecent.vue';
import { useCloned } from '@vueuse/core';
export default {
- emits: ['submmit'],
+ emits: ['check', 'submit', 'cancel'],
components: {
CompProblemAddOrUpd,
ComChangeEdit,
@@ -210,7 +238,6 @@
default: 1
}
},
- emits: ['submit', 'updated'],
data() {
return {
changeDialogVisible: false,
@@ -232,11 +259,11 @@
},
{
bef: '闂寰呮暣鏀�',
- aft: '闂宸叉暣鏀�'
+ aft: '鏁存敼宸蹭笂浼�'
},
{
bef: '鏁存敼寰呭鏍�',
- aft: '鏁存敼宸插鏍�'
+ aft: '闂宸叉暣鏀�'
}
]
};
@@ -249,16 +276,28 @@
},
// 闂鎻忚堪
descriptions() {
- return [
+ const des = [
{
+ icon: 'Location',
name: '闂浣嶇疆',
value: this.problem.location
},
{
+ icon: 'Clock',
name: '鎻愪氦鏃堕棿',
value: this.problem.time.replace('T', ' ').split('.')[0]
}
];
+ if (this.problem.ischanged) {
+ des.push({
+ icon: 'Clock',
+ name: '鏁存敼鏃堕棿',
+ value: this.problem.changedtime
+ ? this.problem.changedtime.replace('T', ' ').split('.')[0]
+ : this.problem.time.replace('T', ' ').split('.')[0]
+ });
+ }
+ return des;
},
// 闂鍥剧墖
pics() {
@@ -282,10 +321,14 @@
}
},
methods: {
+ onProCanceled() {
+ this.proAddOrUpdDialogVisible = false;
+ },
onProSubmited(isOk) {
this.$emit('submit', isOk);
this.proAddOrUpdDialogVisible = false;
},
+ onChangeCanceled() {},
onChangeSubmited(isOk) {
this.$emit('submit', isOk);
this.changeDialogVisible = false;
@@ -333,7 +376,8 @@
.checkProblem({ pId: pro.guid, action: action })
.then((res) => {
if (res.success) {
- this.$emit('submit', false);
+ pro.extension3 = status;
+ this.$emit('check');
}
});
}
@@ -354,7 +398,8 @@
.checkProblem({ pId: pro.guid, action: action })
.then((res) => {
if (res.success) {
- this.$emit('submit', false);
+ pro.extension3 = status;
+ this.$emit('check');
}
});
}
@@ -396,15 +441,16 @@
<style scoped>
.layout {
background-color: transparent;
- margin-top: 20px;
+ margin-bottom: 20px;
/* border: none; */
- border-color: rgba(0, 0, 0, 0.308);
+ /* border-color: rgba(0, 0, 0, 0.308); */
}
.image {
- width: 200px;
- height: 210px;
+ width: 240px;
+ height: 250px;
border-radius: 4px;
+ margin-bottom: 6px;
}
.d-index {
@@ -428,13 +474,71 @@
.d-extra {
}
-.descriptions-label-1 {
- color: whitesmoke;
- background: var(--el-color-danger-light-3);
+:deep(.descriptions-label-1) {
+ /* color: whitesmoke; */
+ /* background: var(--el-color-danger-light-3); */
}
.descriptions-label-2 {
- color: whitesmoke;
- background-color: var(--el-color-success-light-3);
+ /* color: whitesmoke; */
+ /* background-color: var(--el-color-success-light-3); */
+}
+</style>
+
+<!-- 姝ラ鏉¤嚜瀹氫箟鏍峰紡 -->
+<style scoped>
+:deep(.el-steps--simple) {
+ background: #fffbf731;
+}
+
+:deep(.is-wait .el-step__icon) {
+ height: 17px;
+ width: 17px;
+ margin-top: 3px;
+}
+
+:deep(.is-wait .is-text .el-step__icon-inner) {
+ font-size: var(--el-font-size-small);
+}
+
+:deep(.is-success .el-step__icon) {
+ height: 17px;
+ width: 17px;
+ margin-top: 3px;
+}
+
+:deep(.is-success .is-text .el-step__icon-inner) {
+ font-size: var(--el-font-size-small);
+}
+
+:deep(.el-step__head.is-process) {
+ border-color: var(--el-color-danger);
+ color: var(--el-color-danger);
+}
+
+:deep(.el-step__head.is-wait) {
+ border-color: var(--el-text-color-placeholder);
+ color: var(--el-text-color-placeholder);
+}
+
+:deep(.el-step__head.is-success) {
+ border-color: var(--el-color-success-light-3);
+ color: var(--el-color-success-light-3);
+}
+
+:deep(.el-step__title.is-process) {
+ color: var(--el-color-danger);
+ font-weight: bolder;
+ font-size: var(--el-font-size-large);
+}
+
+:deep(.el-step__title.is-wait) {
+ color: var(--el-text-color-placeholder);
+ font-size: var(--el-font-size-small);
+}
+
+:deep(.el-step__title.is-success) {
+ color: var(--el-color-success-light-3);
+ font-size: var(--el-font-size-small);
}
</style>
--
Gitblit v1.9.3