From 0ecf7b3bc6d6a008a804d55c859833bf2cf6473a Mon Sep 17 00:00:00 2001 From: zmc <zmc_li@foxmail.com> Date: 星期三, 22 十一月 2023 10:06:29 +0800 Subject: [PATCH] 1.增加了有效率异常展示页面 2.风险模型的所属场景和运维商的详细信息,以及1个跳转页面链接 3.飞行巡检页面增加增加地址和运维商的筛选条件 4.飞行巡检页面是最新当日日期时,每类异常右上角增加一个“辅助审核” 5.历史数据管理增加 站点总数 --- src/views/risk_assessment/DataRiskModel.vue | 110 +++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 98 insertions(+), 12 deletions(-) diff --git a/src/views/risk_assessment/DataRiskModel.vue b/src/views/risk_assessment/DataRiskModel.vue index e91ba3e..d0bd569 100644 --- a/src/views/risk_assessment/DataRiskModel.vue +++ b/src/views/risk_assessment/DataRiskModel.vue @@ -13,6 +13,7 @@ import riskApi from '@/api/risk/riskApi.js' import riskValue from '@/utils/risk_estimate_common_function/riskValue.js' import lineChart from '@/utils/chartFunction/lineChart.js' +import siteInfo from '@/api/site/siteInfo.js' export default { components: { LineChart, @@ -73,7 +74,9 @@ // 椋庨櫓鍊� weight: '', // 鏃犳暟鎹厤缃椂闂存 - areaColor: [] + areaColor: [], + // 鏌愮珯鐐圭殑鍩烘湰淇℃伅 + siteInfo:{} } }, mounted() { @@ -89,10 +92,10 @@ methods: { // 鏌ヨ绔欑偣缁熻淇℃伅 - querySiteStaticsInfo(row) { + async querySiteStaticsInfo(row) { this.form.name = row.siteName // 鏇存柊缁熻鏁版嵁 - this.getAnalysisData() + await this.getAnalysisData() // 璁$畻椋庨櫓鍊� this.calRiskValue() }, @@ -114,6 +117,8 @@ riskAssessment() { // 鏇存柊鎺掑悕娓呭崟 this.getRiskRank() + // 鏇存柊璇ョ珯鐐圭殑鎵�灞炲満鏅拰杩愮淮鍟� + this.getSiteInfo(this.form.number) // 鏇存柊鍒嗘瀽鏁版嵁 this.getAnalysisData() // 璁$畻椋庨櫓鍊� @@ -147,14 +152,18 @@ this.form.number = arr[1] this.screenLoading = false + // 鏇存柊璇ョ珯鐐圭殑鎵�灞炲満鏅拰杩愮淮鍟� + this.getSiteInfo(this.form.number) // 鏇存柊鏃ョ粺璁℃暟鎹� this.getAnalysisData() // 璁$畻椋庨櫓鍊� this.calRiskValue() + }, // 璁$畻椋庨櫓鍊� calRiskValue() { + console.log('璁惧缂栫爜锛�',this.form.number) riskApi.queryRiskValue(this.form.number, this.month, 'month').then((response) => { this.weight = riskValue.calRiskValue(response.data.data[0]).toFixed(2) }) @@ -196,7 +205,6 @@ let noDataTimeInteval = lineChart.backNoDataInteval(begin, end) // 鏃犳暟鎹厤缃椂闂存 this.areaColor = lineChart.getMarkArea(noDataTimeInteval) - console.log('鍖哄煙', this.areaColor) this.setChart() // 鎶樼嚎鍥炬暟鎹� let temp = index.calBillData(this.chartData, begin, end) @@ -283,6 +291,20 @@ arr.sort((a, b) => b.riskValue - a.riskValue) // 鑾峰彇鍓峮um涓厓绱� return arr.slice(0, num) + }, + /** + * 鏍规嵁璁惧缂栧彿鏌ヨ绔欑偣鍩烘湰淇℃伅 + * @param锛� 璁惧缂栧彿 + */ + getSiteInfo(mnCode) { + siteInfo.querySiteInfoByMnCode(mnCode).then(response => { + this.siteInfo = response.data.data[0] + }) + }, + + openDetail() { + const encodedSiteName = encodeURIComponent(this.form.name) + this.$router.push(`/exceptionDetail/${encodedSiteName}/${this.month}`) } } } @@ -316,12 +338,45 @@ </el-form-item> </el-form> + <!-- <el-card class="site-info time-text" > + <span>{{form.name}}</span> + <br/> + <br/> + <span>鏁版嵁缁熻鏃舵锛歿{ form.beginTime }} ~ {{ form.endTime }}</span> + <el-tag class="mx-1" >鍦烘櫙</el-tag>{{siteInfo.typename}} + + <el-tag class="mx-1">杩愮淮鍟�</el-tag>{{siteInfo.dutyCompany}} + <el-button type="primary" size="small" class="exception-button" @click="openDetail()"> + 寮傚父璇︽儏 + </el-button> + </el-card> --> + <div v-loading="screenLoading" class="wait-name"> <div class="chart-container" v-show="!isNoData && !screenLoading"> - <div class="time-text"> + <!-- <div class="time-text"> <span>鏁版嵁缁熻鏃舵锛歿{ form.beginTime }} ~ {{ form.endTime }}</span> - <span class="site-name">{{ form.name }}</span> - </div> + <span class="site-name"> + <el-button type="primary" text class="exception-button" @click="openDetail()"> + 寮傚父璇︽儏 + </el-button> + + </span> + <el-tag class="mx-1" >鍦烘櫙</el-tag>{{siteInfo.typename}} + <el-tag class="mx-2">杩愮淮鍟�</el-tag>{{siteInfo.dutyCompany}} + </div> --> + + <el-card class="time-text" > + <span>{{form.name}}</span> + <br/> + <br/> + <span>鏁版嵁缁熻鏃舵锛歿{ form.beginTime }} ~ {{ form.endTime }}</span> + <el-tag class="mx-1" >鍦烘櫙</el-tag>{{siteInfo.typename}} + + <el-tag class="mx-1">杩愮淮鍟�</el-tag>{{siteInfo.dutyCompany}} + <el-button type="primary" size="small" class="exception-button" @click="openDetail"> + 寮傚父璇︽儏 + </el-button> + </el-card> <el-row :gutter="10"> <el-col :span="5"> @@ -333,7 +388,6 @@ :default-sort="{ prop: 'riskValue', order: 'descending' }" height="540" > - <!-- :index="indexMethod" --> <el-table-column type="index" @@ -345,8 +399,9 @@ /> <el-table-column prop="siteName" - label="绔欑偣鍚嶇О" + label="鐐逛綅鍚嶇О" show-overflow-tooltip + width="97" align="center" > <template #default="{ row }"> @@ -355,7 +410,11 @@ text class="table-button" @click="querySiteStaticsInfo(row)" - >{{ row.siteName }}</el-button + > + <span class="risk-rank-site"> + {{ row.siteName }} + </span> + </el-button > </template> </el-table-column> @@ -432,10 +491,11 @@ <div>浣庨闄�(锛�0.2)</div> </div> </div> - + </div> </el-card> </el-col> + <el-col :span="4"> <el-card shadow="never" class="card-height"> @@ -533,6 +593,7 @@ font-size: 14px; color: #333333; letter-spacing: 1px; + } .el-card { margin-top: 15px; @@ -621,7 +682,14 @@ .table-button { letter-spacing: 1px; text-decoration: underline; - border-radius: 0px; + /* border-radius: 0px; */ + +} +.risk-rank-site { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + width: 80px; } .site-name { margin-left: 20px; @@ -643,4 +711,22 @@ flex-direction: column; justify-content: space-around; } + +.el-tag{ + margin-left: 25px; + font-size: 14px; + vertical-align: baseline; +} +.exception-button { + vertical-align: baseline; + margin-left: 150px; +} + +.site-info-detail{ + display: flex; + justify-content: space-between; +} +.mx-1{ + margin-left: 100px; +} </style> -- Gitblit v1.9.3