From 73cb3ec2b1660610e3621d7614ad308f2c19331d Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期四, 16 十一月 2023 17:19:38 +0800
Subject: [PATCH] 1.修改了综合风险模型表格数据的获取 2.修改了时间选择器
---
src/views/exception/SiteAuditAssistance.vue | 149 ++++++++++++++++++++++++++++---------------------
1 files changed, 84 insertions(+), 65 deletions(-)
diff --git a/src/views/exception/SiteAuditAssistance.vue b/src/views/exception/SiteAuditAssistance.vue
index 0fa2676..e575a35 100644
--- a/src/views/exception/SiteAuditAssistance.vue
+++ b/src/views/exception/SiteAuditAssistance.vue
@@ -12,6 +12,7 @@
import { ElMessage, ElMessageBox } from 'element-plus'
import ButtonClick from '@/sfc/ButtonClick.vue'
import index from '@/utils/exception_common_function/index.js'
+import DaySelect from '@/sfc/DaySelect.vue';
export default {
components: {
ExceptionType,
@@ -19,7 +20,8 @@
TimeShortCuts,
DustLineChart,
AreaAndmonitorType,
- ButtonClick
+ ButtonClick,
+ DaySelect
},
data() {
return {
@@ -30,6 +32,9 @@
// 閫夋嫨鐨勫紓甯哥被鍨�
exceptionName: []
},
+ // 鏃ユ湡閫夋嫨
+ day:'',
+ // 鏃ユ湡鏃堕棿閫夋嫨
beginTime: '',
endTime: '',
// 杩斿洖鐨勬暟鎹�
@@ -116,16 +121,16 @@
// 鐩戝惉 鍒ゆ柇鎸夐挳鏄惁鍙偣鍑�
watch: {
selectedRowIndex(newVaue) {
- // 澶勪簬琛ㄦ牸鐨勬渶鍚庝竴鏉℃暟鎹� 璁剧疆鈥樹笂涓�鏉♀�欐寜閽笉鍙偣
- if (newVaue === this.displayData.length - 1) {
- this.dialog.isPreCantouch = true
+ // 澶勪簬琛ㄦ牸鐨勬渶鍚庝竴鏉℃暟鎹� 璁剧疆鈥樹笂涓�鏉♀�欐寜閽笉鍙偣
+ if (newVaue === 0) {
+ this.dialog.isPreCantouch = true
//鐢ㄦ埛鍏堢偣浜嗙涓�鏉★紝pre涓簍rue,鐒跺悗鐐瑰嚮鏈�鍚庝竴鏉�,next涓簍rue銆傛鏃朵袱涓寜閽兘琚皝閿�
if (this.dialog.isNextCantouch == true) {
this.dialog.isNextCantouch = false
}
}
- // 澶勪簬琛ㄦ牸绗竴鏉℃暟鎹� 璁剧疆鈥樹笅涓�鏉♀�欐寜閽笉鍙偣
- else if (newVaue === 0) {
+ // 澶勪簬琛ㄦ牸绗竴鏉℃暟鎹� 璁剧疆鈥樹笂涓�鏉♀�欐寜閽笉鍙偣
+ else if (newVaue === this.displayData.length - 1) {
this.dialog.isNextCantouch = true
//鐢ㄦ埛鍏堢偣浜嗚〃鏍兼渶鍚庝竴鏉�,next涓簍rue,鐒跺悗鐐瑰嚮绗竴鏉★紝pre涓簍rue銆傛鏃朵袱涓寜閽兘琚皝閿�
if (this.dialog.isPreCantouch == true) {
@@ -137,6 +142,7 @@
this.dialog.isPreCantouch = false
this.dialog.isNextCantouch = false
}
+
},
dialogTableVisible() {
@@ -187,6 +193,12 @@
},
methods: {
+ giveDay(val){
+ // 灏嗕腑鍥芥爣鍑嗘椂闂磋浆涓烘寚瀹氭牸寮�(璇ョ粍浠惰繑鍥炵殑鏍囧噯鏃堕棿鐨勬牸寮忥紝鎵�浠ュ繀椤荤殑鍔犺繖涓嚱鏁�)
+
+ this.beginTime = dayjs(val).format('YYYY-MM-DD 00:00:00');
+ this.endTime = dayjs(val).format('YYYY-MM-DD 23:59:59');
+ },
/**
* 瀹¤鍐呭淇濆瓨涓鸿崏绋�
* @param锛�
@@ -262,25 +274,7 @@
})
},
close() {
- // if (this.auditDialog.checkerNotes || this.auditDialog.enterpriseNotes) {
- // ElMessageBox.confirm('杩欏皢浼氾紝纭畾瑕佸叧闂悧', '鎻愮ず',
- // {
- // confirmButtonText: '纭畾',
- // cancelButtonText: '鍙栨秷',
- // type: 'warning',
- // center :'true',
- // icon: markRaw(Delete),
- // draggable: true,
- // }).then(() => {
- // ElMessage({
- // type: 'success',
- // message: '宸插叧闂�',
- // })
- // this.auditDialog.visible = false
- // })
- // }else{
- // this.auditDialog.visible = false
- // }
+
this.auditDialog.visible = false
},
// 琛ㄦ牸琛岀殑棰滆壊
@@ -544,6 +538,14 @@
// 鏂數鎴栨柇缃� 鏃堕棿娈�
case '0':
this.dialog.option = {
+ title: {
+ text: this.tableCurrentRowData.exception,
+ left: '1%',
+ textStyle:{
+ fontSize:14
+ }
+ },
+
tooltip: {},
toolbox: {
// 宸ュ叿鏍�
@@ -597,7 +599,16 @@
break
// 瓒呮爣
case '2':
+ case '5':
+ case '6':
this.dialog.option = {
+ title: {
+ text: this.tableCurrentRowData.exception,
+ left: '1%',
+ textStyle:{
+ fontSize:14
+ }
+ },
tooltip: {},
toolbox: {
// 宸ュ叿鏍�
@@ -710,6 +721,13 @@
// 鏁版嵁瓒呬綆 鍙湁鏃堕棿鐐�
case '1':
this.dialog.option = {
+ title: {
+ text: this.tableCurrentRowData.exception,
+ left: '1%',
+ textStyle:{
+ fontSize:14
+ }
+ },
tooltip: {},
toolbox: {
// 宸ュ叿鏍�
@@ -805,6 +823,13 @@
break
case '3':
this.dialog.option = {
+ title: {
+ text: this.tableCurrentRowData.exception,
+ left: '1%',
+ textStyle:{
+ fontSize:14
+ }
+ },
tooltip: {},
toolbox: {
// 宸ュ叿鏍�
@@ -888,14 +913,20 @@
}
break
case '4':
+ case '7':
this.dialog.option = {
+ title: {
+ text: this.tableCurrentRowData.exception,
+ left: '1%',
+ textStyle:{
+ fontSize:14
+ }
+ },
tooltip: {},
toolbox: {
// 宸ュ叿鏍�
feature: {
- // dataZoom: {
- // yAxisIndex: 'none'
- // },
+
// 淇濆瓨涓哄浘鐗�
saveAsImage: {}
}
@@ -1245,17 +1276,26 @@
<el-form :inline="true">
<div class="head-container-text">
<el-form-item>
- <AreaAndmonitorType></AreaAndmonitorType>
+ <AreaAndmonitorType :isHideArea="1"></AreaAndmonitorType>
</el-form-item>
+
<el-form-item>
<InputSearch isNeedDefaultSite="0" isNeedRealTimeAdvice="1" :exceptionType="form.exceptionName" :beginTime="beginTime" :endTime="endTime" @submit-value="(n) => (form.name = n)">
</InputSearch>
</el-form-item>
<el-form-item>
+ <DaySelect
+ @submit-time="giveDay"
+ :day-begin="beginTime"
+ ></DaySelect>
+ </el-form-item>
+
+ <el-form-item>
<TimeShortCuts
@submit-time="giveTime"
timeType="day"
+ :begin-and-end-time="[beginTime,endTime]"
></TimeShortCuts>
</el-form-item>
@@ -1288,7 +1328,7 @@
<el-col>
<div class="checknum">
<div class="checknum-text">
- <el-tag>搴斿鏍告暟</el-tag><span>{{ total }} ({{ checkedRate }}%)</span>
+ <el-tag>搴斿鏍告暟</el-tag><span >{{ total }} ({{ checkedRate }}%)</span>
</div>
<div class="checknum-text">
@@ -1335,7 +1375,7 @@
<el-table-column prop="region" label="鍖哄煙" align="center" show-overflow-tooltip />
<el-table-column prop="beginTime" label="寮�濮嬫椂闂�" align="center" show-overflow-tooltip />
<el-table-column prop="endTime" label="缁撴潫鏃堕棿" align="center" show-overflow-tooltip />
- <el-table-column prop="typename" label="鍦烘櫙" align="center" show-overflow-tooltip />
+ <el-table-column prop="typename" label="鍦烘櫙" align="center" width="82" show-overflow-tooltip />
<el-table-column prop="address" label="鍦板潃" align="center" show-overflow-tooltip />
<el-table-column prop="dutyCompany" label="杩愮淮鍟�" align="center" show-overflow-tooltip />
<el-table-column label="鎿嶄綔" align="center" width="200" fixed="right">
@@ -1472,18 +1512,9 @@
<div class="diag-head">
<div class="diag-head-text">
<div><span class="diag-head-text1">绔欑偣鍚嶇О锛�</span>{{ tableCurrentRowData.name }}</div>
-
- <div>
- <span class="diag-head-text1">寮傚父绫诲瀷锛�</span>
- <span v-if="tableCurrentRowData.exceptionType == '0'">鏁版嵁缂哄け寮傚父</span>
- <span v-else-if="tableCurrentRowData.exceptionType == '1'">鏁版嵁瓒呬綆</span>
- <span v-else-if="tableCurrentRowData.exceptionType == '2'">瓒呮爣</span>
- <span v-else-if="tableCurrentRowData.exceptionType == '3'">鏁版嵁闀挎椂闂存棤娉㈠姩</span>
- <span v-else-if="tableCurrentRowData.exceptionType == '4'">閲忕骇绐佸彉寮傚父</span>
- <span v-else-if="tableCurrentRowData.exceptionType == '5'">涓磋繎瓒呮爣寮傚父</span>
- <span v-else-if="tableCurrentRowData.exceptionType == '6'">鍗曟棩瓒呮爣娆℃暟涓寸晫寮傚父</span>
- <span v-else-if="tableCurrentRowData.exceptionType == '7'">婊戝姩骞冲潎鍊煎紓甯�</span>
- </div>
+ <div><span class="diag-head-text1">璁惧缂栧彿锛�</span>{{ tableCurrentRowData.mnCode }}</div>
+ <div><span class="diag-head-text1">杩愮淮鍟嗭細</span>{{ tableCurrentRowData.dutyCompany }}</div>
+
<div>
<span class="diag-head-text1">寮傚父鏃堕棿娈碉細</span>{{ tableCurrentRowData.beginTime }} ~
@@ -1496,14 +1527,14 @@
type="danger"
:loading="loading.preButton"
:disabled="dialog.isPreCantouch || flag.banTouch"
- @click="getPreviousRowData"
+ @click="getNextRowData"
>涓婃潯寮傚父</el-button
>
<el-button
type="danger"
:loading="loading.afterButton"
:disabled="dialog.isNextCantouch || flag.banTouch"
- @click="getNextRowData"
+ @click="getPreviousRowData"
>涓嬫潯寮傚父</el-button
>
</div>
@@ -1529,9 +1560,7 @@
fixed
:index="indexMethod2"
></el-table-column>
- <el-table-column fixed prop="name" label="绔欑偣鍚嶇О" show-overflow-tooltip />
- <el-table-column prop="mnCode" label="璁惧缂栧彿" align="center" show-overflow-tooltip />
- <el-table-column prop="dutyCompany" label="杩愮淮鍟�" align="center" show-overflow-tooltip />
+
<el-table-column prop="lst" label="閲囬泦鏃堕棿" align="center" show-overflow-tooltip />
<el-table-column
prop="dustValue"
@@ -1574,7 +1603,7 @@
.head-container-search {
display: flex;
justify-content: space-between;
- // float: right;
+
}
.head-describtion-text {
justify-content: flex-end;
@@ -1585,9 +1614,7 @@
/* 鏉′欢鏌ヨ妯″潡缁撴潫 */
/*鍒嗘瀽 */
-
.checknum {
- // border: 2px solid orange;
margin: 10px 5px 20px 20px;
display: flex;
}
@@ -1616,7 +1643,7 @@
:global(.el-table .deep-gray-row) {
color: #7f9fcf;
}
-//瀵硅瘽妗嗘爣棰�
+/* 瀵硅瘽妗嗘爣棰� */
.el-form-item__labe {
font-weight: bold;
}
@@ -1625,7 +1652,6 @@
margin-right: 20px;
}
.check-button {
- // justify-content: flex-end;
float: right;
margin-top: 10px;
margin-right: 20px;
@@ -1636,19 +1662,15 @@
/* 琛ㄦ牸妯″潡缁撴潫 */
/* 鏌ョ湅璇︽儏瀵硅瘽妗嗘ā鍧楃殑鏍峰紡 */
-.diag-head {
- // 瀵硅瘽妗嗗ご閮ㄥ尯鍩�
- // min-height: 200px;
- // border: 1px solid #fdc2db;
-}
+
.diag-head-text1 {
- // 瀵硅瘽妗嗗ご閮ㄧ殑灞炴�у瓧娈靛姞绮�
+ /* 瀵硅瘽妗嗗ご閮ㄧ殑灞炴�у瓧娈靛姞绮� */
font-weight: bold;
}
.diag-head-text > div {
- // 瀵硅瘽妗嗗紓甯告椂闂存
+ /* 瀵硅瘽妗嗗紓甯告椂闂存 */
margin-top: 15px;
}
@@ -1660,16 +1682,13 @@
}
.chart-jump-button {
- // 鈥樹笂涓�鏉♀�欙紝鈥樹笅涓�鏉♀�� 鎸夐挳
- // min-height: 30px;
- // width: 200px;
- // float: right;
+
display: flex;
justify-content: right;
}
.line-chart {
- // 寮傚父鎶樼嚎鍥�
+ /* 寮傚父鎶樼嚎鍥� */
width: 920px;
height: 300px;
margin-bottom: 20px;
--
Gitblit v1.9.3