From 43c2f5b94d87263cf189f7ba51c8dc6c5e6144c8 Mon Sep 17 00:00:00 2001 From: zmc <zmc_li@foxmail.com> Date: 星期四, 23 十一月 2023 08:52:22 +0800 Subject: [PATCH] 1.修改了雷达图传入的数据 2.数据指标排名一进来按日均值倒序排列 3.修改了一些局部的样式 --- src/views/risk_assessment/DataRiskModel.vue | 108 ++++++++++++++++++++++-------------------------------- 1 files changed, 44 insertions(+), 64 deletions(-) diff --git a/src/views/risk_assessment/DataRiskModel.vue b/src/views/risk_assessment/DataRiskModel.vue index d0bd569..5f1d32c 100644 --- a/src/views/risk_assessment/DataRiskModel.vue +++ b/src/views/risk_assessment/DataRiskModel.vue @@ -76,7 +76,21 @@ // 鏃犳暟鎹厤缃椂闂存 areaColor: [], // 鏌愮珯鐐圭殑鍩烘湰淇℃伅 - siteInfo:{} + siteInfo: {}, + + // 寮傚父椋庨櫓鐨勫�� + exceptionRisk: { + // 鍦ㄧ嚎鐜囬闄� + onlineRisk: '', + // 鏈夋晥鐜囬闄� + validRisk: '', + // 瓒呮爣椋庨櫓 + exceedRisk: '', + // 寮傚父绫诲瀷鑱氶泦搴� + exceptionTypeAggregation: '', + // 鍏稿瀷寮傚父澶嶇幇鐜� + typicalExceptionRepetitionRate:'' + } } }, mounted() { @@ -91,6 +105,9 @@ }, methods: { + + + // 鏌ヨ绔欑偣缁熻淇℃伅 async querySiteStaticsInfo(row) { this.form.name = row.siteName @@ -130,7 +147,7 @@ // 鏃ョ粺璁℃暟鎹� this.fetchDayAnalysisData() // 寮傚父鏁版嵁 - this.fetchExceptionAnalysisData() + // this.fetchExceptionAnalysisData() }, findObjectByPropertyValue(array, property, value) { @@ -161,11 +178,24 @@ }, - // 璁$畻椋庨櫓鍊� + + /** + * 寰楀埌鏁版嵁椋庨櫓鍊� 锛屽苟璁$畻椋庨櫓鍊� + * @param锛� + * @returns锛� + */ 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) + + + const riskValue = response.data.data[0] + this.exceptionRisk.onlineRisk = riskValue.onlineRisk + this.exceptionRisk.validRisk = riskValue.validRisk + this.exceptionRisk.exceedRisk = riskValue.exceedRisk + this.exceptionRisk.exceptionTypeAggregation = riskValue.exceptionTypeAggregation + this.exceptionRisk.typicalExceptionRepetitionRate = riskValue.typicalExceptionRepetitionRate + + this.weight = riskValue.calRiskValue(riskValue).toFixed(2) }) }, @@ -206,6 +236,8 @@ // 鏃犳暟鎹厤缃椂闂存 this.areaColor = lineChart.getMarkArea(noDataTimeInteval) this.setChart() + + // 鎶樼嚎鍥炬暟鎹� let temp = index.calBillData(this.chartData, begin, end) this.bill.min = temp['min'] @@ -338,43 +370,21 @@ </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"> - <span>鏁版嵁缁熻鏃舵锛歿{ form.beginTime }} ~ {{ form.endTime }}</span> - <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> + <h4>{{form.name}}</h4> <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 type="primary" size="default" class="exception-button" @click="openDetail"> + 鏁版嵁寮傚父璇︽儏 </el-button> </el-card> @@ -439,13 +449,7 @@ '瓒呮爣寮傚父椋庨櫓', '鏁版嵁鍦ㄧ嚎椋庨櫓' ]" - :yData="[ - bill.valid, - bill.exceptionRecurrence, - bill.exceptionTypeAggregation, - bill.exceeding, - bill.online - ]" + :yData="exceptionRisk" ></DustRadarChart> </el-card> </el-col> @@ -537,20 +541,6 @@ <el-col :span="12"> <el-card shadow="never" class="card-value"> <LineChart - title="鏃ュ湪绾跨巼" - :chartData="chartData2" - yName="%" - seriesName="鏃ュ湪绾跨巼" - :areaColor="areaColor" - > - </LineChart> - </el-card> - </el-col> - </el-row> - <el-row :gutter="20"> - <el-col :span="12"> - <el-card shadow="never" class="card-value"> - <LineChart title="鏃ユ湁鏁堢巼" :chartData="chartData3" yName="%" @@ -560,20 +550,10 @@ </LineChart> </el-card> </el-col> - - <el-col :span="12"> - <el-card shadow="never" class="card-value"> - <LineChart - title="鏃ヨ秴鏍囩巼" - :chartData="chartData4" - yName="%" - seriesName="鏃ヨ秴鏍囩巼" - :areaColor="areaColor" - > - </LineChart> - </el-card> - </el-col> </el-row> + + + </div> </div> <el-empty description="鏆傛棤鏁版嵁" v-show="isNoData" :image-size="200" /> -- Gitblit v1.9.3