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/risk_assessment/components/subRiskModel.vue | 197 +++++++++++++++---------------------------------
1 files changed, 62 insertions(+), 135 deletions(-)
diff --git a/src/views/line_graph/DataRiskModel.vue b/src/views/risk_assessment/components/subRiskModel.vue
similarity index 76%
rename from src/views/line_graph/DataRiskModel.vue
rename to src/views/risk_assessment/components/subRiskModel.vue
index 2da5caf..39a5f98 100644
--- a/src/views/line_graph/DataRiskModel.vue
+++ b/src/views/risk_assessment/components/subRiskModel.vue
@@ -1,19 +1,34 @@
-<!-- 鏃ュ潎鍊� -->
+<!-- 椋庨櫓妯″瀷鐨勯〉闈�
+鍖哄埆锛�
+1.鎺ュ彈鐖剁粍浠朵紶鍙�
+2.鏃犲垵濮嬪姞杞芥暟鎹紙鏃爉ounted锛�
+-->
<script>
-import InputSearch from '@/sfc/InputSearch.vue'
+// import InputSearch from '@/sfc/InputSearch.vue'
import AreaAndmonitorType from '@/sfc/AreaAndmonitorType.vue'
-import DustRadarChart from './components/DustRadarChart.vue'
+import DustRadarChart from '@/views/risk_assessment/components/DustRadarChart.vue'
import exceptionApi from '@/api/exceptionApi.js'
-import LineChart from './components/LineChart.vue'
+import LineChart from '@/views/risk_assessment/components/LineChart.vue'
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'
export default {
+ props: {
+ sName: {
+ type: String,
+ default: ''
+ },
+ month_1: {
+ type: String,
+ default: ''
+ }
+ },
components: {
LineChart,
- InputSearch,
+ // DateSelectWithShortCuts,
+ // InputSearch,
AreaAndmonitorType,
DustRadarChart,
ButtonClick,
@@ -30,6 +45,7 @@
chartData2: {},
chartData3: {},
chartData4: {},
+ //devId:'', //璁惧缂栧彿
begin: '', //寮�濮嬫椂闂�
end: '', //缁撴潫鏃堕棿
@@ -38,6 +54,8 @@
name: '',
// 璁惧缂栧彿
number: '',
+
+ // month:'',
// 寮�濮嬫椂闂�
beginTime: '',
// 缁撴潫鏃堕棿
@@ -82,9 +100,12 @@
// 鏇存柊绔欑偣鍚嶅瓧鍜屾椂闂�
this.form.name = this.sName
this.month = this.month_1
+ // 鍚屾椂鏇存柊鏈堣捣濮嬫椂闂�
+ 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.parentDataFlag = true
- // 鏇存柊鎺掓竻鍗�
- this.getRiskRank()
+
// 鏇存柊缁熻鏁版嵁
this.getAnalysisData()
// 璁＄畻椋庨櫓鍊�
@@ -93,10 +114,7 @@
}
},
- mounted() {
- // // 鍔犺浇椋庨櫓鍊兼渶楂樼殑绔欑偣鏁版嵁
- this.ShowDefaultData()
- },
+ mounted() {},
methods: {
// 鏌ヨ绔欑偣缁熻淇℃伅
@@ -115,6 +133,7 @@
// 鍚屾椂鏇存柊寮�濮嬪拰缁撴潫鏃堕棿
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')
+ console.log(this.form.beginTime, this.form.endTime)
},
/**
@@ -151,10 +170,9 @@
// 鍔犺浇榛樿灞曠ず鐨勫唴瀹�
async updateOriginPage() {
- this.screenLoading = true
// 鏇存柊鎺掑悕娓呭崟锛屽苟寰楀埌椋庨櫓鍊兼渶楂樼珯鐐�
this.form.name = await this.getRiskRank()
- this.screenLoading = false
+
// 鏇存柊鏃ョ粺璁℃暟鎹�
this.getAnalysisData()
// 璁＄畻椋庨櫓鍊�
@@ -201,6 +219,7 @@
if (this.form.endTime) {
params['endTime'] = this.form.endTime
}
+ this.screenLoading = true
this.loading = true
this.queryButton = true
exceptionApi
@@ -218,6 +237,7 @@
// 绉婚櫎绌烘暟鎹姸鎬�
this.isNoData = false
+ this.screenLoading = false
this.setChart()
// 鎶樼嚎鍥炬暟鎹�
let temp = index.calBillData(this.chartData, this.begin, this.end)
@@ -282,44 +302,6 @@
y: dataExceed
}
}
- },
-
- // 寰楀埌鍓�10椋庨櫓鎺掑悕娓呭崟
- async getRiskRank() {
- let staticsData = await exceptionApi.analysisdataByType(this.month, 'month')
-
- let exceptionData = await exceptionApi.exceptiondata1({
- siteName: '',
- beginTime: this.form.beginTime,
- endTime: this.form.endTime
- })
-
- const riskValueSites = index.merge(
- staticsData.data.data,
- exceptionData.data.data,
- this.form.beginTime,
- this.form.endTime
- )
- this.top_10_sites_with_risk_values = this.getTopRiskData(riskValueSites, 10)
- if (this.top_10_sites_with_risk_values.length != 0) {
- // 琛ㄦ牸鎸夐闄╁�煎�掑彊鎺掑垪
- this.$nextTick(() => {
- this.$refs.table.sort('riskValue', 'descending')
- })
- // Promise
- return this.top_10_sites_with_risk_values[0].siteName
- }
- },
-
- /**
- * 闄嶅簭鎺掑垪锛岃繑鍥為檷搴忓墠num鐨勫厓绱�
- * @param锛� 瀵硅薄鏁扮粍锛岃繑鍥炵殑鏁伴噺
- */
- getTopRiskData(arr, num) {
- // 鎸夌収riskValue闄嶅簭鎺掑垪
- arr.sort((a, b) => b.riskValue - a.riskValue)
- // 鑾峰彇鍓峮um涓厓绱�
- return arr.slice(0, num)
}
}
}
@@ -330,26 +312,27 @@
<el-form-item class="form-item">
<AreaAndmonitorType></AreaAndmonitorType>
</el-form-item>
- <el-form-item class="form-item">
- <InputSearch
- :site-name="form.name"
- isNeedDefaultSite="0"
- @submit-value="(n) => (form.name = n)"
- ></InputSearch>
- </el-form-item>
- <el-form-item>
- <MonthSelect :month="this.month_1" @submit-value="giveMonth"></MonthSelect>
- </el-form-item>
+ <!-- <el-form-item class="form-item">
+ <InputSearch
+ :site-name="form.name"
+ isNeedDefaultSite="0"
+ @submit-value="(n) => (form.name = n)"
+ ></InputSearch>
+ </el-form-item> -->
- <el-form-item>
- <ButtonClick
- content="椋庨櫓璇勪及"
- type="primary"
- :loading="queryButton"
- @do-search="riskAssessment"
- ></ButtonClick>
- </el-form-item>
+ <!-- <el-form-item>
+ <MonthSelect :month="this.month_1" @submit-value="giveMonth"></MonthSelect>
+ </el-form-item> -->
+
+ <!-- <el-form-item>
+ <ButtonClick
+ content="椋庨櫓璇勪及"
+ type="primary"
+ :loading="queryButton"
+ @do-search="riskAssessment"
+ ></ButtonClick>
+ </el-form-item> -->
</el-form>
<div v-loading="screenLoading" class="wait-name">
@@ -360,70 +343,14 @@
</div>
<el-row :gutter="10">
- <el-col :span="5">
- <el-card shadow="never" class="table-class">
- <el-table
- ref="table"
- highlight-current-row="true"
- :data="top_10_sites_with_risk_values"
- :default-sort="{ prop: 'riskValue', order: 'descending' }"
- height="540"
- >
- <el-table-column
- type="index"
- label="搴忓彿"
- :index="indexMethod"
- fixed
- width="52"
- show-overflow-tooltip
- align="center"
- />
- <el-table-column
- prop="siteName"
- label="绔欑偣鍚嶇О"
- show-overflow-tooltip
- align="center"
- >
- <template #default="{ row }">
- <el-button
- type="primary"
- text
- class="table-button"
- @click="querySiteStaticsInfo(row)"
- >{{ row.siteName }}</el-button
- >
- </template>
- </el-table-column>
- <el-table-column
- prop="riskValue"
- label="椋庨櫓鍊�"
- sortable
- show-overflow-tooltip
- align="center"
- />
- <!-- <el-table-column label="鎿嶄綔" align="center">
- <template #default="{ row }">
- <el-button
- type="primary"
- text
- class="table-button"
- @click="querySiteStaticsInfo(row)"
- >璇︽儏</el-button
- >
- </template>
- </el-table-column> -->
- </el-table>
- </el-card>
- </el-col>
-
- <el-col :span="12">
- <el-card shadow="never" class="table-class">
+ <el-col :span="14">
+ <el-card shadow="never">
<DustRadarChart
:name="[
'鏁版嵁鏈夋晥椋庨櫓',
'鍏稿瀷寮傚父澶嶇幇椋庨櫓',
'寮傚父绫诲瀷鑱氶泦椋庨櫓',
- '瓒呮爣寮傚父椋庨櫓',
+ '鏁版嵁瓒呮爣椋庨櫓',
'鏁版嵁鍦ㄧ嚎椋庨櫓'
]"
:yData="[
@@ -437,7 +364,7 @@
</el-card>
</el-col>
- <el-col :span="3">
+ <el-col :span="5">
<el-card shadow="never" class="card-height">
<template #header>
<h1
@@ -480,7 +407,7 @@
</el-card>
</el-col>
- <el-col :span="4">
+ <el-col :span="5">
<el-card shadow="never" class="card-height">
<template #header><span class="title-16">椋庨櫓璇︽儏</span></template>
@@ -564,7 +491,7 @@
/* padding:0px */
}
.card-height {
- height: 570px;
+ height: 540px;
}
.el-header {
background-color: #010408;
@@ -627,13 +554,13 @@
color: red;
}
/* .wait-name {
- width: 500px;
- height: 600px;
- } */
+ width: 500px;
+ height: 600px;
+ } */
.table-class {
/* border: 1px solid blue; */
/* margin: 20px 0px 20px 0px; */
- height: 570px;
+ height: 540px;
}
.table-button {
--
Gitblit v1.9.3