From d1ccf7e1835b3c583da16d90a286e749d5e27c84 Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期四, 07 十二月 2023 14:15:20 +0800
Subject: [PATCH] 修改无数据时段的算法
---
src/views/risk_assessment/components/CompDataRiskModel.vue | 65 ++++++++++----------------------
1 files changed, 20 insertions(+), 45 deletions(-)
diff --git a/src/views/risk_assessment/components/CompDataRiskModel.vue b/src/views/risk_assessment/components/CompDataRiskModel.vue
index 5a8cdaf..d30dcb1 100644
--- a/src/views/risk_assessment/components/CompDataRiskModel.vue
+++ b/src/views/risk_assessment/components/CompDataRiskModel.vue
@@ -3,17 +3,13 @@
import InputSearch from '@/sfc/InputSearch.vue'
import AreaAndmonitorType from '@/sfc/AreaAndmonitorType.vue'
import exceptionApi from '@/api/exceptionApi.js'
-
import DustRadarChart from '@/views/risk_assessment/components/DustRadarChart.vue'
-import FYLineChart from '@/components/chart/FYLineChart.vue'
-import time from '@/utils/time.js'
import index from '@/utils/risk_estimate_common_function/index.js'
import ButtonClick from '@/sfc/ButtonClick.vue'
import dayjs from 'dayjs'
import MonthSelect from '@/sfc/MonthSelect.vue'
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'
import CompDailyStatistic from '@/views/risk_assessment/riskModel/components/CompDailyStatistic.vue'
export default {
@@ -35,7 +31,6 @@
}
},
components: {
- FYLineChart,
InputSearch,
AreaAndmonitorType,
DustRadarChart,
@@ -59,9 +54,9 @@
form: {
// 绔欑偣鍚嶇О
- name: '',
+ siteName: '',
// 璁惧缂栧彿
- number: '3234',
+ mnCode: '3234',
// 寮�濮嬫椂闂�
beginTime: '',
// 缁撴潫鏃堕棿
@@ -119,29 +114,20 @@
}
},
watch: {
- // showAll() {
- // console.log('1111')
- // // 椤甸潰鍔犺浇鏃秙howAll鎵嶄細鍙樺寲涓�娆�
- // // 涓簍rue琛ㄧず鐨勯闄╂ā鍨嬮〉闈�
- // if (this.showAll) {
- // // 鍔犺浇椋庨櫓鍊兼渶楂樼殑绔欑偣鏁版嵁
- // this.ShowDefaultData()
- // }
- // },
siteName() {
if (this.siteName != '') {
// 鏇存柊绔欑偣鍚嶅瓧鍜屾椂闂�
- this.form.name = this.siteName
+ this.form.siteName = this.siteName
this.screenLoading = true
siteInfo.queryMnCode(this.siteName).then((response) => {
- this.form.number = response.data.data[0].mnCode
+ this.form.mnCode = response.data.data[0].mnCode
this.month = this.time
// 鍚屾椂鏇存柊鏈堣捣濮嬫椂闂�
this.form.beginTime = dayjs(this.month).startOf().format('YYYY-MM-DD HH:mm:ss')
this.form.endTime = dayjs(this.month).endOf('month').format('YYYY-MM-DD HH:mm:ss')
// 鏇存柊璇ョ珯鐐圭殑鎵�灞炲満鏅拰杩愮淮鍟�
- this.getSiteInfo(this.form.number)
+ this.getSiteInfo(this.form.mnCode)
// 鏇存柊缁熻鏁版嵁
this.getAnalysisData()
// 璁＄畻椋庨櫓鍊�
@@ -167,7 +153,7 @@
methods: {
// 鏌ヨ绔欑偣缁熻淇℃伅
async querySiteStaticsInfo(row) {
- this.form.name = row.siteName
+ this.form.siteName = row.siteName
// 鏇存柊缁熻鏁版嵁
await this.getAnalysisData()
// 璁＄畻椋庨櫓鍊�
@@ -192,7 +178,7 @@
// 鏇存柊鎺掑悕娓呭崟
this.getRiskRank()
// 鏇存柊璇ョ珯鐐圭殑鎵�灞炲満鏅拰杩愮淮鍟�
- this.getSiteInfo(this.form.number)
+ this.getSiteInfo(this.form.mnCode)
// 鏇存柊鍒嗘瀽鏁版嵁
this.getAnalysisData()
// 璁＄畻椋庨櫓鍊�
@@ -222,12 +208,12 @@
this.screenLoading = true
// 鏇存柊鎺掑悕娓呭崟锛屽苟寰楀埌椋庨櫓鍊兼渶楂樼珯鐐�
let arr = await this.getRiskRank()
- this.form.name = arr[0]
- this.form.number = arr[1]
+ this.form.siteName = arr[0]
+ this.form.mnCode = arr[1]
this.screenLoading = false
// 鏇存柊璇ョ珯鐐圭殑鎵�灞炲満鏅拰杩愮淮鍟�
- this.getSiteInfo(this.form.number)
+ this.getSiteInfo(this.form.mnCode)
// 鏇存柊鏃ョ粺璁℃暟鎹�
this.getAnalysisData()
// 璁＄畻椋庨櫓鍊�
@@ -240,7 +226,7 @@
* @returns锛�
*/
calRiskValue() {
- riskApi.queryRiskValue(this.form.number, this.month, 'month').then((response) => {
+ riskApi.queryRiskValue(this.form.mnCode, this.month, 'month').then((response) => {
const rValue = response.data.data[0]
this.exceptionRisk.onlineRisk = rValue.onlineRisk
this.exceptionRisk.validRisk = rValue.validRisk
@@ -254,29 +240,18 @@
// 鏍规嵁鐩墠绔欑偣锛屾湀浠斤紝鏌ユ姌绾垮浘鏃ョ粺璁℃暟鎹�
fetchDayAnalysisData() {
- let params = {}
- if (this.form.name) {
- params['siteName'] = this.form.name
- }
- if (this.form.beginTime) {
- params['beginTime'] = this.form.beginTime
- }
- if (this.form.endTime) {
- params['endTime'] = this.form.endTime
- }
this.loading = true
this.queryButton = true
exceptionApi
- .analysisdata(this.form.name, this.form.beginTime, this.form.endTime, 'day')
+ .analysisdata(this.form.siteName, this.form.beginTime, this.form.endTime, 'day')
.then((response) => {
- this.chartData = response.data.data
+ this.chartData = response
this.loading = false
this.queryButton = false
- if (response.data.data.length == 0) {
+ if (response.length == 0) {
this.isNoData = true
return
}
- this.chartData.sort(time.compareByScore)
// 鍒嗘瀽鏁版嵁涓殑鏈�鏃╂椂闂�
let begin = this.chartData[0].lst
// 鍒嗘瀽鏁版嵁涓殑鏈�鏅氭椂闂�
@@ -300,7 +275,7 @@
fetchExceptionAnalysisData() {
exceptionApi
.exceptiondata1({
- siteName: this.form.name,
+ siteName: this.form.siteName,
beginTime: this.form.beginTime,
endTime: this.form.endTime
})
@@ -357,7 +332,7 @@
},
openDetail() {
- const encodedSiteName = encodeURIComponent(this.form.name)
+ const encodedSiteName = encodeURIComponent(this.form.siteName)
const timeType = '1'
const jumpPage = '2'
this.$router.push(`/exceptionDetail/${encodedSiteName}/${this.month}/${timeType}/${jumpPage}`)
@@ -374,10 +349,10 @@
<el-form-item class="form-item">
<InputSearch
- :site-name="form.name"
+ :site-name="form.siteName"
isNeedDefaultSite="0"
- @submit-value="(n) => (form.name = n)"
- @submit-mncode="(n) => (form.number = n)"
+ @submit-value="(n) => (form.siteName = n)"
+ @submit-mncode="(n) => (form.mnCode = n)"
></InputSearch>
</el-form-item>
@@ -398,7 +373,7 @@
<div v-loading="screenLoading" class="wait-name">
<div class="chart-container" v-show="!isNoData && !screenLoading">
<el-card class="time-text">
- <h4>{{ form.name }}</h4>
+ <h4>{{ form.siteName }}</h4>
<br />
<br />
--
Gitblit v1.9.3