From f2863c52837205596feec6c2596356a87d123897 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Mon, 26 Feb 2024 14:21:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9B=91=E6=B5=8B=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dataReport/index.vue                | 54 +++++++++----------
 src/views/equipment/index.vue                 |  8 +--
 src/views/equipment/monitoring/index.vue      |  5 +-
 .../components/addunitDialog.vue              |  2 +-
 4 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/src/views/dataReport/index.vue b/src/views/dataReport/index.vue
index ab17ab89..3a4eee6a 100644
--- a/src/views/dataReport/index.vue
+++ b/src/views/dataReport/index.vue
@@ -145,7 +145,7 @@
                   <el-table-column
                     v-for="(column, index) in columns"
                     :key="index"
-                    :label="column.fieldDesc"
+                    :label="column.fieldDesc + '（' + column.unit + '）'"
                     :prop="column.field"
                   ></el-table-column>
                 </el-table>
@@ -288,29 +288,6 @@ export default {
         return true;
       }
     },
-    handleNodeClick(data, node) {
-      console.log(data, node);
-      console.log(this.currentNodeKey);
-      if (data.hasOwnProperty("children")) {
-        this.$nextTick(() => {
-          this.$refs.tree.setCurrentKey(this.currentNodeKey);
-        });
-        return;
-      }
-
-      // if (data.children?.length) {
-      //   this.$nextTick(() => {
-      //     this.$refs.tree.setCurrentKey(this.currentNodeKey);
-      //   });
-      //   return;
-      // }
-      this.currentNodeKey = data.id;
-      this.crrrentName = data.name;
-      this.currentId = data.id;
-      this.page = 1;
-      this.pageSize = 20;
-      this.handleSearch();
-    },
 
     async getSubNodes() {
       try {
@@ -339,6 +316,29 @@ export default {
         console.error("Failed to fetch sub-nodes:", error); // 处理请求错误，可以根据实际需求进行错误处理操作
       }
     },
+    handleNodeClick(data, node) {
+      console.log(data, node);
+      console.log(this.currentNodeKey);
+      if (data.hasOwnProperty("children")) {
+        this.$nextTick(() => {
+          this.$refs.tree.setCurrentKey(this.currentNodeKey);
+        });
+        return;
+      }
+
+      // if (data.children?.length) {
+      //   this.$nextTick(() => {
+      //     this.$refs.tree.setCurrentKey(this.currentNodeKey);
+      //   });
+      //   return;
+      // }
+      this.currentNodeKey = data.id;
+      this.crrrentName = data.name;
+      this.currentId = data.id;
+      this.page = 1;
+      this.pageSize = 20;
+      this.handleSearch();
+    },
     changestartdate(val) {
       console.log(val);
       if (val == null) {
@@ -594,12 +594,12 @@ export default {
   height: 100%;
   //background: #fcc;
   .leftTree {
-    min-width: 280px;
-    max-width: 280px;
+    min-width: 380px;
+    max-width: 380px;
     height: 100%;
     overflow: auto;
     //border: 1px solid #fff;
-    margin-right: 16px;
+    margin-right: 12px;
     background: rgba(8, 9, 36, 0.28);
     -webkit-backdrop-filter: blur(10px);
     backdrop-filter: blur(10px);
diff --git a/src/views/equipment/index.vue b/src/views/equipment/index.vue
index fd74a95b..72d488b1 100644
--- a/src/views/equipment/index.vue
+++ b/src/views/equipment/index.vue
@@ -40,10 +40,10 @@ export default {
           name: "设备类型管理",
           path: "/equipment/sblx",
         },
-        {
-          name: "监测设备类型管理",
-          path: "/equipment/modevtype",
-        },
+        // {
+        //   name: "监测设备类型管理",
+        //   path: "/equipment/modevtype",
+        // },
         {
           name: "监测设备管理",
           path: "/equipment/monitoring",
diff --git a/src/views/equipment/monitoring/index.vue b/src/views/equipment/monitoring/index.vue
index 7070c483..d8605ab9 100644
--- a/src/views/equipment/monitoring/index.vue
+++ b/src/views/equipment/monitoring/index.vue
@@ -55,8 +55,7 @@
         >
           <el-table-column type="selection" width="55"> </el-table-column>
           <el-table-column prop="id" label="ID" width="50"> </el-table-column>
-          <el-table-column prop="zsbName" label="主设备名称" width="100">
-          </el-table-column>
+          <el-table-column prop="zsbName" label="主设备名称"> </el-table-column>
           <el-table-column prop="name" label="名称"> </el-table-column>
           <el-table-column
             prop="phase"
@@ -161,7 +160,7 @@ export default {
           message: res.errorMsg,
           type: "error",
         });
-        this.$refs.upload.clearFiles();
+        // this.$refs.upload.clearFiles();
       }
     },
     getmonitoringAllList() {
diff --git a/src/views/equipment/unitController/components/addunitDialog.vue b/src/views/equipment/unitController/components/addunitDialog.vue
index ad425d4d..ac911623 100644
--- a/src/views/equipment/unitController/components/addunitDialog.vue
+++ b/src/views/equipment/unitController/components/addunitDialog.vue
@@ -14,7 +14,7 @@
         :rules="rules"
         :model="formInfo"
       >
-        <el-form-item label="名称：" prop="field">
+        <el-form-item label="字段：" prop="field">
           <el-input v-model="formInfo.field"></el-input>
         </el-form-item>
         <el-form-item label="单位：" prop="unit">