From ccc970e575ef3f3e5c67af8da210263f4ac549f9 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 10 四月 2026 16:44:55 +0800
Subject: [PATCH] 2026.4.10
---
src/views/monitor/DataHistory.vue | 61 +++++++-----------------------
1 files changed, 14 insertions(+), 47 deletions(-)
diff --git a/src/views/monitor/DataHistory.vue b/src/views/monitor/DataHistory.vue
index ea6fadc..d949feb 100644
--- a/src/views/monitor/DataHistory.vue
+++ b/src/views/monitor/DataHistory.vue
@@ -1,10 +1,12 @@
<!-- 鍘嗗彶鏁版嵁 -->
<script>
import { defineAsyncComponent } from 'vue'
+import { ElMessage } from 'element-plus'
import * as XLSX from 'xlsx/xlsx.mjs'
import dayjs from 'dayjs'
import axiosInstanceInstance from '@/utils/request.js'
import TimeSelect from '@/sfc/TimeSelect.vue'
+import ExceptionType from '@/sfc/ExceptionType.vue'
const ShopNameAndID = defineAsyncComponent(() => import('@/sfc/ShopNameAndID.vue'))
@@ -15,6 +17,7 @@
lineChart,
ShopNameAndID,
TimeSelect,
+ ExceptionType,
},
data() {
return {
@@ -440,14 +443,13 @@
<template>
<!-- solid #000000 -->
<div style="margin: 20px; padding: 10px; border: 1px; height: 620px">
- <h1 style="margin-bottom: 20px; display: flex; white-space: nowrap">娌圭儫鍘嗗彶鏁版嵁</h1>
<div style="display: flex">
- <span class="palce-text"><span class="palce-text-area">鍖哄煙锛�</span>闈欏畨鍖� </span>
+ <!-- <span class="palce-text"><span class="palce-text-area">鍖哄煙锛�</span>闈欏畨鍖� </span> -->
<!-- 搴楅摵鍚� 绾ц仈 -->
<!-- <el-cascader v-model="devId" :options="optionsShop" :props="{ expandTrigger: 'hover' }" placeholder="璇烽�夋嫨搴楅摵鍚�"
clearable /> -->
- <span class="describe-info">搴楅摵鍚嶉�夋嫨锛�</span>
+ <span class="describe-info">搴楅摵閫夋嫨锛�</span>
<ShopNameAndID @submit-id="(n) => (devId[1] = n)" :devId="beginShowShopName"></ShopNameAndID>
<!-- <span class="describe-time-text">璧锋鏃堕棿锛�</span> -->
@@ -455,6 +457,7 @@
<!-- <el-date-picker v-model="beginTime" type="datetime" placeholder="寮�濮嬫椂闂�" value-format="YYYY-MM-DD HH:mm:ss" />
<el-date-picker v-model="endTime" type="datetime" placeholder="缁撴潫鏃堕棿" value-format="YYYY-MM-DD HH:mm:ss" /> -->
<TimeSelect @submit-time="giveTime"></TimeSelect>
+ <ExceptionType></ExceptionType>
<el-button type="primary" plain :loading="button.queryButton" @click="lineChart"
>鏌ヨ</el-button
>
@@ -550,51 +553,15 @@
:data="displayData"
style="width: 100%; margin-top: 25px"
height="500px"
- table-layout="auto"
+ table-layout="fixed"
+ :show-overflow-tooltip="true"
>
- <el-table-column fixed prop="mvStatCode" label="璁惧缂栧彿">
- <template #default="{ row }">
- <el-tooltip effect="dark" :content="row.mvStatCode">
- <div class="cell ellipsis">{{ row.mvStatCode }}</div>
- </el-tooltip>
- </template>
- </el-table-column>
- <el-table-column prop="diName" label="搴楅摵鍚嶇О">
- <template #default="{ row }">
- <el-tooltip effect="dark" :content="row.diName">
- <div class="cell ellipsis">{{ row.diName }}</div>
- </el-tooltip>
- </template>
- </el-table-column>
-
- <el-table-column prop="mvDataTime" label="閲囬泦鏃堕棿">
- <template #default="{ row }">
- <el-tooltip effect="dark" :content="row.mvDataTime">
- <div class="cell ellipsis">{{ row.mvDataTime }}</div>
- </el-tooltip>
- </template>
- </el-table-column>
- <el-table-column prop="mvFanElectricity" label="椋庢満鐢垫祦(A)">
- <template #default="{ row }">
- <el-tooltip effect="dark" :content="row.mvFanElectricity">
- <div class="cell ellipsis">{{ row.mvFanElectricity }}</div>
- </el-tooltip>
- </template>
- </el-table-column>
- <el-table-column prop="mvPurifierElectricity" label="鍑�鍖栧櫒鐢垫祦(A)">
- <template #default="{ row }">
- <el-tooltip effect="dark" :content="row.mvPurifierElectricity">
- <div class="cell ellipsis">{{ row.mvPurifierElectricity }}</div>
- </el-tooltip>
- </template>
- </el-table-column>
- <el-table-column prop="mvFumeConcentration2" label="娌圭儫娴撳害(mg/m鲁)">
- <template #default="{ row }">
- <el-tooltip effect="dark" :content="row.mvFumeConcentration2">
- <div class="cell ellipsis">{{ row.mvFumeConcentration2 }}</div>
- </el-tooltip>
- </template>
- </el-table-column>
+ <el-table-column fixed prop="mvStatCode" label="璁惧缂栧彿"> </el-table-column>
+ <el-table-column prop="diName" label="搴楅摵鍚嶇О"> </el-table-column>
+ <el-table-column prop="mvDataTime" label="閲囬泦鏃堕棿"> </el-table-column>
+ <el-table-column prop="mvFanElectricity" label="椋庢満鐢垫祦(A)"> </el-table-column>
+ <el-table-column prop="mvPurifierElectricity" label="鍑�鍖栧櫒鐢垫祦(A)"> </el-table-column>
+ <el-table-column prop="mvFumeConcentration2" label="娌圭儫娴撳害(mg/m鲁)"> </el-table-column>
</el-table>
<el-pagination
background
--
Gitblit v1.9.3