From 2162dec5e0acc98f8e22fa9907cdc5f70eba6dcc Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期四, 23 十一月 2023 17:57:39 +0800
Subject: [PATCH] 1.修改了风险模型页面有效率，在线率的展示百分比 2.站点审核辅助页面增加了标识
---
src/views/risk_assessment/components/CompDataRiskModel.vue | 6 +-
src/utils/risk_estimate_common_function/index.js | 3 -
src/views/risk_assessment/DataIndexRank.vue | 5 --
src/utils/chartFunction/lineChart.js | 32 ++++++----------
src/views/exception/SiteAuditAssistance.vue | 49 ++++++++++++++++--------
src/views/exception/components/CompFlightInspection.vue | 1
6 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/src/utils/chartFunction/lineChart.js b/src/utils/chartFunction/lineChart.js
index d9bd8e2..e43ead8 100644
--- a/src/utils/chartFunction/lineChart.js
+++ b/src/utils/chartFunction/lineChart.js
@@ -47,10 +47,6 @@
xData.push(tempData.lst)
yAvg.push(tempData.dayAvg)
- // yOnline.push(this.deleteLastStr(tempData.dayOnline))
- // yValid.push(this.deleteLastStr(tempData.dayValid))
- // yExceed.push(this.deleteLastStr(tempData.dayExceeding))
-
yOnline.push(tempData.dayOnline)
yValid.push(tempData.dayValid)
yExceed.push(tempData.dayExceeding)
@@ -123,7 +119,7 @@
* @param锛� 2缁存暟缁�
* @returns锛�
*/
- getMarkArea(timeInteval,describe='鏃犳暟鎹�') {
+ getMarkArea(timeInteval, describe = '鏃犳暟鎹�') {
let result = []
for (let i = 0; i < timeInteval.length; i++) {
let temp = []
@@ -170,48 +166,44 @@
return valueStr.slice(0, -1)
},
-
/**
* 鎸囧畾鏃堕棿鍖洪棿鐨勭嚎娈靛彉棰滆壊
- * @param锛�
+ * @param锛�
* @returns锛�
*/
- getLineColor(timeInteval,xList){
+ getLineColor(timeInteval, xList) {
let result = []
// 鍙彇
let temp = []
- for (let i = 0; i < timeInteval.length; i++){
- if(timeInteval[i][0]!=timeInteval[i][1]){
+ for (let i = 0; i < timeInteval.length; i++) {
+ if (timeInteval[i][0] != timeInteval[i][1]) {
temp.push(timeInteval[i])
}
- }
+ }
// 鏃犺繛缁殑鏁版嵁 鐩存帴閫�鍑�
- if(temp.length == 0){
+ if (temp.length == 0) {
return []
}
// 鍙栫涓�涓繛缁殑鏃舵
- result.push(
- [
+ result.push([
{
lte: temp[0][0],
color: 'green'
},
{
gt: temp[0][0],
- lte:temp[0][1],
+ lte: temp[0][1],
color: 'red'
},
{
gt: temp[0][1],
- lte:xList[xList.length-1],
+ lte: xList[xList.length - 1],
color: 'green'
}
- ]
- )
+ ])
return result[0]
- },
-
+ }
}
diff --git a/src/utils/risk_estimate_common_function/index.js b/src/utils/risk_estimate_common_function/index.js
index 9f6aaa3..a721e26 100644
--- a/src/utils/risk_estimate_common_function/index.js
+++ b/src/utils/risk_estimate_common_function/index.js
@@ -44,9 +44,6 @@
}
// 璁＄畻骞冲潎鍊硷紝鍦ㄧ嚎鐜囷紝鏈夋晥鐜囷紝瓒呮爣鐜�
sumAvg = sumAvg + item.dayAvg
- // sumOnline = sumOnline + Number(item.dayOnline.slice(0, -1))
- // sumValid = sumValid + Number(item.dayValid.slice(0, -1))
- // sumExceeding = sumExceeding + Number(item.dayExceeding.slice(0, -1))
sumOnline = sumOnline + Number(item.dayOnline)
sumValid = sumValid + Number(item.dayValid)
diff --git a/src/views/exception/SiteAuditAssistance.vue b/src/views/exception/SiteAuditAssistance.vue
index aa35978..c56b980 100644
--- a/src/views/exception/SiteAuditAssistance.vue
+++ b/src/views/exception/SiteAuditAssistance.vue
@@ -1714,22 +1714,30 @@
</el-table>
</div>
<template #footer>
- <el-tag type="success" class="mx-1" effect="dark" round
- ><span class="table-line-lable" v-show="tableCurrentRowData.exceptionType == '0'"
- >缂哄け鏁版嵁锛�
- </span>
- <span
- v-show="
- tableCurrentRowData.exceptionType == '1' ||
- tableCurrentRowData.exceptionType == '2' ||
- tableCurrentRowData.exceptionType == '3' ||
- tableCurrentRowData.exceptionType == '4'
- "
- >寮傚父鏁版嵁锛�</span
- >
- <span class="table-line-num">{{ dialog.exceptionTotal }}鏉�</span>
- <span v-show="tableCurrentRowData.exceptionType === '0'"> (閫昏緫璁＄畻)</span>
- </el-tag>
+ <div class="dialog-footer">
+ <el-tag type="success" class="mx-1" effect="dark" round
+ ><span class="table-line-lable" v-show="tableCurrentRowData.exceptionType == '0'"
+ >缂哄け鏁版嵁锛�
+ </span>
+ <span
+ v-show="
+ tableCurrentRowData.exceptionType == '1' ||
+ tableCurrentRowData.exceptionType == '2' ||
+ tableCurrentRowData.exceptionType == '3' ||
+ tableCurrentRowData.exceptionType == '4' ||
+ tableCurrentRowData.exceptionType == '5' ||
+ tableCurrentRowData.exceptionType == '6' ||
+ tableCurrentRowData.exceptionType == '7' ||
+ tableCurrentRowData.exceptionType == '8'
+ "
+ >寮傚父鏁版嵁锛�</span
+ >
+ <span class="table-line-num">{{ dialog.exceptionTotal }}鏉�</span>
+ <span v-show="tableCurrentRowData.exceptionType == '0'"> (閫昏緫璁＄畻)</span>
+ </el-tag>
+ <el-text v-show="tableCurrentRowData.exceptionType == '8'" type="warning" class="dialog-footer-text">鏁版嵁鏍囪瘑A涓烘暟鎹暱鏈熺己澶�,绯荤粺鑷姩琛ュ叏</el-text>
+ <!-- <el-text class="mx-1" type="warning">Warning</el-text> -->
+ </div>
</template>
</el-dialog>
</template>
@@ -1844,6 +1852,15 @@
left: 10px;
bottom: 10px;
}
+.dialog-footer{
+ display: flex;
+}
+.dialog-footer-text {
+ justify-content: flex-end;
+ margin-left: auto;
+ font-size: 14px;
+ /* color: #333333; */
+}
/* 鏌ョ湅璇︽儏瀵硅瘽妗嗘ā鍧楃粨鏉� */
</style>
diff --git a/src/views/exception/components/CompFlightInspection.vue b/src/views/exception/components/CompFlightInspection.vue
index 01b7aea..b2dbd4f 100644
--- a/src/views/exception/components/CompFlightInspection.vue
+++ b/src/views/exception/components/CompFlightInspection.vue
@@ -1251,7 +1251,6 @@
<span v-show="tableCurrentRowData.exceptionType == '0'"> (閫昏緫璁＄畻)</span>
</el-tag>
<el-text v-show="tableCurrentRowData.exceptionType == '8'" type="warning" class="dialog-footer-text">鏁版嵁鏍囪瘑A涓烘暟鎹暱鏈熺己澶�,绯荤粺鑷姩琛ュ叏</el-text>
- <!-- <el-text class="mx-1" type="warning">Warning</el-text> -->
</div>
</template>
</el-dialog>
diff --git a/src/views/risk_assessment/DataIndexRank.vue b/src/views/risk_assessment/DataIndexRank.vue
index d7c9407..20fc00b 100644
--- a/src/views/risk_assessment/DataIndexRank.vue
+++ b/src/views/risk_assessment/DataIndexRank.vue
@@ -8,8 +8,6 @@
import ButtonExportExcel from '@/sfc/ButtonExportExcel.vue'
import ButtonClick from '@/sfc/ButtonClick.vue'
-
-
export default {
components: {
TimeShortCuts,
@@ -104,7 +102,6 @@
}
}
-
if (columnIndex == 8) {
if (row.dayValid < 0.9) {
return 'red-color'
@@ -189,8 +186,6 @@
}
}
</script>
-
-
<template>
<el-form :inline="true" :model="form" ref="h1">
diff --git a/src/views/risk_assessment/components/CompDataRiskModel.vue b/src/views/risk_assessment/components/CompDataRiskModel.vue
index 0c1fc5b..18594a3 100644
--- a/src/views/risk_assessment/components/CompDataRiskModel.vue
+++ b/src/views/risk_assessment/components/CompDataRiskModel.vue
@@ -567,9 +567,9 @@
<el-form>
<el-form-item label="鏈�澶у�硷細"> {{ bill.max }} mg/m鲁 </el-form-item>
<el-form-item label="鏈�灏忓�硷細"> {{ bill.min }} mg/m鲁 </el-form-item>
- <el-form-item label="鏁版嵁鏈夋晥鐜囷細"> {{ bill.online }}% </el-form-item>
- <el-form-item label="鏁版嵁鍦ㄧ嚎鐜囷細"> {{ bill.valid }}% </el-form-item>
- <el-form-item label="鏁版嵁瓒呮爣鐜囷細"> {{ bill.exceeding }}% </el-form-item>
+ <el-form-item label="鏁版嵁鏈夋晥鐜囷細"> {{ bill.online*100 }}% </el-form-item>
+ <el-form-item label="鏁版嵁鍦ㄧ嚎鐜囷細"> {{ bill.valid*100 }}% </el-form-item>
+ <el-form-item label="鏁版嵁瓒呮爣鐜囷細"> {{ bill.exceeding*100 }}% </el-form-item>
<el-form-item label="寮傚父绫诲瀷鑱氶泦搴︼細">
{{ exceptionRisk.exceptionTypeAggregation * 100 }}%
</el-form-item>
--
Gitblit v1.9.3