From 1e18f0bcee0358e13c0e2cb750d17cd7ef5bf4d6 Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期一, 07 八月 2023 17:55:21 +0800
Subject: [PATCH] 油烟检测系统
---
src/views/HistoryFume.vue | 50 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/src/views/HistoryFume.vue b/src/views/HistoryFume.vue
index 4396b51..1d24f06 100644
--- a/src/views/HistoryFume.vue
+++ b/src/views/HistoryFume.vue
@@ -2,7 +2,7 @@
<script >
import * as XLSX from 'xlsx/xlsx.mjs';
import dayjs from 'dayjs';
-import axiosInstance from '../utils/request.js'
+import axiosInstanceInstance from '../utils/request.js'
import TimeSelect from '../sfc/TimeSelect.vue';
// import ShopNameAndID from '../sfc/TimeSelect.vue';
@@ -23,6 +23,8 @@
},
data() {
return {
+ // 绌虹姸鎬�
+ isNoData:false,
// 涓嬫媺妗嗕竴寮�濮嬪睍绀虹殑鍚嶅瓧
beginShowShopName:[],
options: {},
@@ -256,8 +258,7 @@
beforeRouteUpdate(to, from, next) {
if (to.name === this.$route.name) {
- this.backMinuteDataAWeekAgo();
-
+ this.backMinuteDataAWeekAgo();
}
next();
},
@@ -401,7 +402,7 @@
},
// 杩斿洖鍓嶄竴鍛ㄥ垎閽熸暟鎹〃鏁版嵁
backMinuteDataAWeekAgo() {
-
+
// 鎵撳紑椤甸潰鍔犺浇鏈�杩戜竴鍛ㄧ殑鏁版嵁
this.loading = true;
@@ -412,7 +413,9 @@
// 缁欐椂闂撮�夋嫨鍣ㄨ缃粯璁ゆ椂闂�
// this.beginTime = dayjs().subtract(1, 'week').format('YYYY-MM-DD HH:mm:ss');
// this.endTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
-
+ // 灏嗘椂闂村悓姝ョ粰瀵煎嚭鏃堕棿
+ this.exportBeginTime =this.beginTime
+ this.exportEndTime = this.endTime
console.log(this.currentDateTime, this.oneWeekAgoDateTime);
@@ -421,9 +424,14 @@
params['beginTime'] = this.beginTime;
params['endTime'] = this.endTime;
- axiosInstance
+ axiosInstanceInstance
.get('/fume/history', { params: params })
.then((response) => {
+ if(response.data.data.length==0){
+ alert('璇ユ椂娈垫棤鏁版嵁')
+ this.isNoData = true
+ return
+ }
// 淇濆瓨杩斿洖鐨�
this.exceedingData = response.data.data;
// 鍒嗛〉
@@ -443,6 +451,9 @@
alert('鏃堕棿璺ㄥ害涓嶈兘瓒呰繃涓�涓湀');
return;
}
+ // 灏嗘椂闂村悓姝ョ粰瀵煎嚭鏃堕棿
+ this.exportBeginTime =this.beginTime
+ this.exportEndTime = this.endTime
let params = {};
if (this.devId[1]) {
params['devId'] = this.devId[1];
@@ -453,11 +464,22 @@
if (this.endTime) {
params['endTime'] = this.endTime;
}
- axiosInstance
+ this.loading=true
+ axiosInstanceInstance
.get('/fume/history', { params: params })
.then((response) => {
+
// 淇濆瓨杩斿洖鐨�
this.exceedingData = response.data.data;
+ this.loading=false
+
+ if(response.data.data.length==0){
+ alert('璇ユ椂娈垫棤鏁版嵁')
+ this.isNoData = true
+ return
+ }
+ // 绉婚櫎绌烘暟鎹姸鎬�
+ this.isNoData = false
// this.displayData = response.data.data //琛ㄦ牸娓叉煋
// 鍒嗛〉
this.total = this.exceedingData.length;
@@ -497,7 +519,7 @@
params['exportEndTime'] = this.exportEndTime;
}
- axiosInstance.get('/fume/export', { params: params }).then((result) => {
+ axiosInstanceInstance.get('/fume/export', { params: params }).then((result) => {
this.exportData = result.data.data;
console.log(this.exportData);
});
@@ -524,7 +546,7 @@
// 缂栬緫琛ㄥご琛� 淇敼琛ㄥご
xls['A1'].v = '璁惧缂栧彿';
xls['B1'].v = '搴楅摵鍚嶇О';
- xls['C1'].v = '鎶ヨ鏃堕棿';
+ xls['C1'].v = '閲囬泦鏃堕棿';
xls['D1'].v = '椋庢満鐢垫祦(A)';
xls['E1'].v = '鍑�鍖栧櫒鐢垫祦(A)';
xls['F1'].v = '娌圭儫娴撳害(mg/m鲁)';
@@ -691,12 +713,12 @@
</div>
- <div v-show="!isSwitch" class="chart-container">
+ <div v-show="!isSwitch && !isNoData" v-loading="loading" class="chart-container">
<lineChart :chartData="options"></lineChart>
</div>
<!-- 琛ㄦ牸鏁版嵁 -->
- <div v-show="isSwitch" class="container">
+ <div v-show="isSwitch && !isNoData" v-loading="loading" class="container">
<el-table :data="displayData" style="width: 100%; margin-top: 25px" height="500px" table-layout="auto">
<el-table-column fixed prop="mvStatCode" label="璁惧缂栧彿">
<template #default="{ row }">
@@ -713,7 +735,7 @@
</template>
</el-table-column>
- <el-table-column prop="mvDataTime" label="閲囨牱鏃堕棿">
+ <el-table-column prop="mvDataTime" label="閲囬泦鏃堕棿">
<template #default="{ row }">
<el-tooltip effect="dark" :content="row.mvDataTime">
<div class="cell ellipsis">{{ row.mvDataTime }}</div>
@@ -747,6 +769,7 @@
<!-- layout="total, sizes, prev, pager, next, jumper" -->
</div>
+ <el-empty v-show="isNoData" :image-size="200" />
</div>
</template>
@@ -804,6 +827,9 @@
flex-direction: column;
height: 100vh;
}
+:deep().el-dialog {
+ border-radius: 9px;
+}
@media screen and (max-width: 768px) {
/* 鍦ㄥ皬灞忓箷涓婂簲鐢ㄧ殑鏍峰紡 */
}
--
Gitblit v1.9.3