From fd934f83afae1e3fce46db8610837d0e0f4d9393 Mon Sep 17 00:00:00 2001 From: zmc <zmc_li@foxmail.com> Date: 星期四, 02 十一月 2023 10:44:56 +0800 Subject: [PATCH] 按开发清单已修改 --- src/views/line_graph/SiteComprehensiveRskRanking.vue | 57 +++++++++++++++++++++++++++++++-------------------------- 1 files changed, 31 insertions(+), 26 deletions(-) diff --git a/src/views/line_graph/SiteComprehensiveRskRanking.vue b/src/views/line_graph/SiteComprehensiveRskRanking.vue index 082d7ed..e0c2597 100644 --- a/src/views/line_graph/SiteComprehensiveRskRanking.vue +++ b/src/views/line_graph/SiteComprehensiveRskRanking.vue @@ -8,14 +8,17 @@ import ButtonClick from '@/sfc/ButtonClick.vue' import { ElMessage } from 'element-plus' import MonthSelect from '@/sfc/MonthSelect.vue'; +import SiteDetail from '@/views/line_graph/components/SiteDetail.vue' +import { useLoadingStore } from '@/stores/loadingStore'; +import { mapStores } from 'pinia'; export default { components: { AreaAndmonitorType, ButtonExportExcel, ButtonClick, - MonthSelect + MonthSelect, + SiteDetail, }, - data() { return { // 琛ㄦ牸鏁版嵁 @@ -54,13 +57,17 @@ // 琛ㄦ牸鏁版嵁 table: [], // 琛ㄦ牸楂樺害 - tableHeight: 600 + tableHeight: 600, + currentRow:[] } }, setup() { // 寮曞叆 鐧惧垎鍙锋瘮杈冨ぇ灏� 瀵煎嚭鍔熻兘 const { exportToExcel } = useCommonFunction() return { exportToExcel } + }, + computed: { + ...mapStores(useLoadingStore), }, mounted(){ // @@ -119,7 +126,7 @@ exceptionApi .exceptiondata1({ - siteName: this.form.name, + siteName: '', beginTime: this.form.beginTime, endTime: this.form.endTime }) @@ -143,22 +150,6 @@ }) }, - - // 浼佷笟寮傚父璇︽儏 - // exceptiondataCount() { - // exceptionApi - // .exceptiondata1({ - // // siteName: this.form.name, - // siteName: '', - // beginTime: this.form.beginTime, - // endTime: this.form.endTime - // }) - // .then((res) => { - // let obj = index.calRecur(res.data.data) - // this.bill.exceptionRecurrence = obj['exceptionRecurrence'] - // this.bill.exceptionTypeAggregation = obj['exceptionTypeAggregation'] - // }) - // }, /** * 鍒濆鍔犺浇鍑芥暟 @@ -202,6 +193,9 @@ } else { ElMessage('鏃犳暟鎹渶瑕佸鍑�') } + }, + openDetail(row){ + this.$router.push(`/detail/${row.siteName}/${this.form.month}`) } } } @@ -215,12 +209,8 @@ <AreaAndmonitorType></AreaAndmonitorType> </el-form-item> - <!-- <el-form-item> - <InputSearch isNeedDefaultSite="1" @submit-value="(n) => (form.name = n)"></InputSearch> - </el-form-item> --> - <el-form-item> - <MonthSelect @submit-value="giveMonth"></MonthSelect> + <MonthSelect @submit-value="giveMonth"></MonthSelect> </el-form-item> <el-form-item> @@ -247,6 +237,7 @@ :data="table" :height="tableHeight" v-loading="loading" + element-loading-text="鍚庡彴鍒嗘瀽涓�..." style="width: 98%" :cell-class-name="tableCellClassName" :default-sort="{ prop: 'riskValue', order: 'descending' }" @@ -263,7 +254,13 @@ width="55" show-overflow-tooltip /> - <el-table-column prop="siteName" label="绔欑偣鍚嶇О" align="center" show-overflow-tooltip /> + <el-table-column prop="siteName" label="绔欑偣鍚嶇О" align="center" show-overflow-tooltip > + <template #default="{ row }"> + <el-button type="primary" text class="table-button" @click="openDetail(row)" + >{{row.siteName}}</el-button + > + </template> + </el-table-column> <el-table-column prop="region" label="鍖哄煙" align="center" width="80" show-overflow-tooltip /> <el-table-column prop="monitorType" label="妫�娴嬬被鍨�" align="center" width="80" show-overflow-tooltip /> <el-table-column @@ -294,6 +291,9 @@ /> </el-table> <el-empty v-show="isNoData" :image-size="200" /> + + + </template> <style scoped> @@ -306,5 +306,10 @@ background-color: red; /* color: rgb(241, 236, 236); */ } +.table-button { + letter-spacing: 1px; + text-decoration: underline; + border-radius: 0px; +} </style> -- Gitblit v1.9.3