From c24a5a2a99515b365ebc343b04538bb862790de1 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 21 十二月 2023 11:44:22 +0800
Subject: [PATCH] Merge branch 'feature-code-refactoring' and 'feature-002'
---
src/views/data_management/HistoryData.vue | 51 ++++++++++++++++++++++++++++++---------------------
1 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/src/views/data_management/HistoryData.vue b/src/views/data_management/HistoryData.vue
index 86454df..df6f031 100644
--- a/src/views/data_management/HistoryData.vue
+++ b/src/views/data_management/HistoryData.vue
@@ -32,6 +32,8 @@
// 缁撴潫鏃堕棿
endTime: ''
},
+ // 鎼滅储妗嗕紶閫掍笂鏉ョ殑璁惧缂栧彿
+ tempMnCode :'',
// 杩斿洖鐨勬暟鎹�
tableData: [],
// 琛ㄦ牸鏁版嵁
@@ -50,7 +52,9 @@
// 宸查�変腑鐨勫満鏅被鍨�
scenarioType: [],
// 琛ㄦ牸楂樺害
- tableHeight: '500'
+ tableHeight: '500',
+ // 绔欑偣鎬绘暟閲�
+ siteNums:0
};
},
setup() {
@@ -141,10 +145,7 @@
// 鏌ヨ鏁版嵁
handleSubmit() {
- // if (this.isExceedOneMonth(this.form.beginTime, this.form.endTime)) {
- // alert('鏃堕棿璺ㄥ害涓嶈兘瓒呰繃涓�涓湀');
- // return;
- // }
+
this.loading = true;
this.queryButton = true
let params = {};
@@ -161,7 +162,6 @@
if (this.scenarioType.length != 0) {
params['scenarioType'] = this.scenarioType.join();
}
-
this.$http.get('/dust/history1', { params: params }).then((response) => {
// 淇濆瓨杩斿洖鐨�
this.tableData = response.data.data.rows;
@@ -194,14 +194,14 @@
// 淇濆瓨杩斿洖鐨�
this.tableData = response.data.data.rows;
this.displayData = this.tableData;
-
+ this.loading = false;
if (response.data.data.total == 0) {
ElMessage('璇ユ椂娈垫棤鏁版嵁');
this.isNoData = true;
return;
}
this.total = response.data.data.total;
- this.loading = false;
+
});
}
}
@@ -220,10 +220,12 @@
<el-form-item>
<AreaAndmonitorType></AreaAndmonitorType>
</el-form-item>
+
<el-form-item>
- <InputSearch isNeedDefaultSite="1" @submit-value="(n) => (form.name = n)">
+ <InputSearch isNeedDefaultSite="1" @submit-value="(n) => (form.name = n)" @submit-site-nums="(n)=>(siteNums=n)">
</InputSearch>
</el-form-item>
+
<el-form-item>
<template #label>
<span class="font-label">璁惧缂栧彿:</span>
@@ -249,19 +251,21 @@
</div>
<div class="button-and-export">
<el-form-item>
- <!-- <el-button
- type="primary"
- @click="handleSubmit"
- style="margin-left: 10px"
- ><el-icon style="margin-right: 6px;font-size: 1.2em;"><i-ep-Search/></el-icon>鏌ヨ</el-button
- >
- <el-button type="success" @click="exportDom" round><el-icon style="margin-right: 6px;margin-bottom:2px;font-size: 1.2em;"><i-ep-Download ></i-ep-Download></el-icon>瀵煎嚭鏁版嵁</el-button> -->
+ <el-tag class="ml-2" type="success" size="large">绔欑偣鎬绘暟</el-tag>
+ <span class="tag-text">{{ siteNums }}</span>
+ </el-form-item>
+
+ <el-form-item>
<ButtonClick style="margin-right: 12px;" content="鎼滅储" type="primary" :loading="queryButton" @do-search="handleSubmit"></ButtonClick>
<ButtonExportExcel content="瀵煎嚭鏁版嵁" type="success" :loading="exportButton" @do-export="exportDom"></ButtonExportExcel>
</el-form-item>
</div>
</el-form>
+
</el-card>
+ </el-col>
+ <el-col>
+
</el-col>
</el-row>
@@ -272,12 +276,12 @@
v-loading="loading">
<!--缁戝畾涓�涓柟娉曪紝灏嗚繑鍥炲�艰祴缁檌ndex,鍗宠〃鏍兼瘡琛屾暟鎹殑涓嬫爣-->
<el-table-column type="index" label="搴忓彿" align="center" fixed :index="indexMethod"></el-table-column>
- <el-table-column prop="name" label="绔欑偣鍚嶇О" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="name" label="鐐逛綅鍚嶇О" show-overflow-tooltip></el-table-column>
<el-table-column prop="address" label="鍦板潃" align="center" show-overflow-tooltip></el-table-column>
- <el-table-column prop="dutyCompany" label="渚涘簲鍟�" align="center" show-overflow-tooltip></el-table-column>
- <el-table-column prop="mnCode" label="璁惧缂栧彿" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="dutyCompany" label="杩愮淮鍟�" align="center" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="mnCode" label="璁惧缂栫爜" show-overflow-tooltip></el-table-column>
<el-table-column prop="typeName" label="绫诲瀷" align="center" show-overflow-tooltip></el-table-column>
- <el-table-column prop="dustValue" label="鎵皹娴撳害(mg/m鲁)" align="center" sortable
+ <el-table-column prop="dustValue" label="TSP(mg/m鲁)" align="center" sortable
show-overflow-tooltip></el-table-column>
<el-table-column prop="noiseValue" label="鍣０(dB)" align="center" sortable show-overflow-tooltip></el-table-column>
<el-table-column prop="lst" label="閲囬泦鏃堕棿" sortable align="center" show-overflow-tooltip></el-table-column>
@@ -329,7 +333,8 @@
.button-and-export {
display: flex;
- justify-content: flex-end;
+ /* justify-content: flex-end; */
+ justify-content: space-between;
/* 浠庤灏句綅缃紑濮嬫帓鍒� */
}
@@ -340,4 +345,8 @@
.el-pagination {
margin: 10px 10px;
}
+.tag-text{
+ margin-left: 10px;
+ font-size: 14px;
+}
</style>
--
Gitblit v1.9.3