From 5fd4b77bba2899e08043e3a879bcecb653e58d6f Mon Sep 17 00:00:00 2001
From: LokerL <loker80@qq.com>
Date: Sun, 13 Oct 2024 11:00:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9C=88=E5=BA=A6=E6=95=B0=E6=8D=AE-?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=80=BB=E8=A7=88=E5=8E=BB=E9=99=A4=E9=AB=98?=
 =?UTF-8?q?=E4=BD=8E=E6=8A=A5=E5=80=BC=EF=BC=9B=E4=BF=AE=E6=94=B9=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../monthData/data-overview.vue               | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/ruoyi-ui/src/views/dataStatistics/monthData/data-overview.vue b/ruoyi-ui/src/views/dataStatistics/monthData/data-overview.vue
index 848eea6..20785df 100644
--- a/ruoyi-ui/src/views/dataStatistics/monthData/data-overview.vue
+++ b/ruoyi-ui/src/views/dataStatistics/monthData/data-overview.vue
@@ -30,7 +30,17 @@
         :border="true"
         :header-cell-style="headerStyle"
       >
-        <el-table-column prop="month" label="名称">
+        <!-- <el-table-column  label="港区">
+          <template slot-scope="scope">
+            {{ deptName }}
+          </template>
+        </el-table-column>
+        <el-table-column  label="月份">
+          <template slot-scope="scope">
+            <span>{{ dateValue.replace("-", "年") }}月</span>
+          </template>
+        </el-table-column> -->
+        <el-table-column prop="month" label="名称" align="center">
           <template slot-scope="scope">
             {{ getTableFirstColumnName(scope.row) }}
           </template>
@@ -41,18 +51,6 @@
           align="center"
           :formatter="dataFormatter"
         ></el-table-column>
-        <el-table-column
-          prop="avgDbz"
-          label="低报值"
-          align="center"
-          :formatter="dataFormatter"
-        ></el-table-column>
-        <el-table-column
-          prop="avgGbz"
-          label="高报值"
-          align="center"
-          :formatter="dataFormatter"
-        ></el-table-column>
       </el-table>
       <el-table
         :data="cmDeviceDs"
@@ -120,10 +118,10 @@ export default {
       this.queryData();
     },
     getTableFirstColumnName(row) {
-      if (row.month && row.month === this.month) {
+      if (row.month && row.month === this.dateValue) {
         return "本月均值";
       }
-      if (row.month && row.month !== this.month) {
+      if (row.month && row.month !== this.dateValue) {
         return "上月均值";
       }
       return "变化率";
@@ -172,8 +170,8 @@ export default {
       const ws_name = "SheetJS";
       const ws_data = [
         [filename],
-        ["名称", "读数", "低报值", "高报值"],
-        ...this.overViewTableData.map(row => [this.getTableFirstColumnName(row), row.avgDs, row.avgDbz, row.avgGbz]),
+        ["名称", "读数",],
+        ...this.overViewTableData.map(row => [this.getTableFirstColumnName(row), row.avgDs,]),
         ["港区", "企业", "编号", "平均值"],
         ...this.cmDeviceDs.map(row => [row.gangQu, row.deptName, row.sn, row.avgDs]),
       ];