From ae74554deb79ba0f80fb0c8fcb36e877a905be5a Mon Sep 17 00:00:00 2001
From: "3067418132@qq.com" <ljf25604@163.com>
Date: Thu, 26 Mar 2026 17:13:07 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E7=A9=BA=E8=B0=83?=
 =?UTF-8?q?=E6=9C=BA=E6=88=BF=E5=88=86=E9=A1=B5=E7=95=8C=E9=9D=A2=EF=BC=9B?=
 =?UTF-8?q?=202=E3=80=81=E4=BC=98=E5=8C=96=E5=A4=87=E4=BB=B6=E5=BA=93?=
 =?UTF-8?q?=E5=AF=B8=E7=AE=A1=E7=90=86=EF=BC=8C=E8=AE=BE=E5=A4=87=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8Bid=E6=B2=A1=E6=9C=89=E6=9B=BF=E6=8D=A2=E4=BB=8E?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E8=8E=B7=E5=8F=96=EF=BC=9B=203=E3=80=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?=E5=B7=A6=E8=BE=B9=E6=A0=91=E5=BD=A2=E7=BB=93=E6=9E=84=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enSourceAnalysis/components/equipment.vue |  2 +-
 src/views/centerairC/overview/index.vue       |  2 +-
 src/views/device/spare/index.vue              | 39 +++++++++++++++++--
 src/views/system/user/index.vue               | 11 ++++++
 4 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/src/views/centerairC/enSourceAnalysis/components/equipment.vue b/src/views/centerairC/enSourceAnalysis/components/equipment.vue
index 2947695..184c3e1 100644
--- a/src/views/centerairC/enSourceAnalysis/components/equipment.vue
+++ b/src/views/centerairC/enSourceAnalysis/components/equipment.vue
@@ -512,7 +512,7 @@ export default {
               };
             }),
           ];
-          this.pageParm.total = res.data.totalSize;
+          this.pageParm.total = res.data[3].total;
           console.log("header", this.headers);
         } else {
           this.tableData = [];
diff --git a/src/views/centerairC/overview/index.vue b/src/views/centerairC/overview/index.vue
index 7a5f7c3..c326b4e 100644
--- a/src/views/centerairC/overview/index.vue
+++ b/src/views/centerairC/overview/index.vue
@@ -427,7 +427,7 @@ export default {
             electData: res.data[1].meter[index].toString(), // 转换为字符串
             copData: res.data[2].cop[index].toString(), // 转换为字符串
           }));
-          this.pageParm.total = res.data.totalSize;
+          this.pageParm.total = res.data[5].total;
         } else {
           this.tableData = [];
         }
diff --git a/src/views/device/spare/index.vue b/src/views/device/spare/index.vue
index f765f7e..98a33db 100644
--- a/src/views/device/spare/index.vue
+++ b/src/views/device/spare/index.vue
@@ -123,7 +123,14 @@
       <el-table-column label="备件序列号" align="center" prop="serialNum" />
       <el-table-column label="备件名称" align="center" prop="spareName" />
       <el-table-column label="规格与型号" align="center" prop="modelSpecs" />
-      <el-table-column label="设备类型Id" align="center" prop="deviceTypeId" />
+      <el-table-column label="设备类型" align="center" prop="deviceTypeId">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.sys_mt_type"
+            :value="scope.row.deviceTypeId"
+          />
+        </template>
+      </el-table-column>
       <el-table-column label="库存数量" align="center" prop="inventoryLevels" />
       <el-table-column
         label="最低库存"
@@ -208,13 +215,29 @@
               /> </el-form-item
           ></el-col>
           <el-col :span="12">
-            <el-form-item label="设备类型Id" prop="deviceTypeId">
+            <!-- <el-form-item label="设备类型Id" prop="deviceTypeId">
               <el-input
                 v-model="form.deviceTypeId"
                 placeholder="请输入设备类型Id"
                 clearable
               /> </el-form-item
-          ></el-col>
+          > -->
+          <el-form-item label="设备类型" prop="deviceTypeId">
+            <el-select
+              v-model="form.deviceTypeId"
+              placeholder="请选择设备类型"
+              clearable
+              filterable
+            >
+              <el-option
+                v-for="dict in dict.type.sys_mt_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
         </el-row>
         <el-row type="flex" justify="center">
           <el-col :span="12">
@@ -274,6 +297,16 @@ import {
 
 export default {
   name: "spare",
+  dicts: [
+    "sys_mt_type",
+    "sys_type",
+    "sys_param_type",
+    "sys_data_type",
+    "sys_protocol_type",
+    "sys_communication_type",
+    "sys_device_type",
+    "alarm_collection_type",
+  ],
   data() {
     return {
       timeArr: [],
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 1e6fd1c..615b454 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -584,4 +584,15 @@ export default {
     align-items: center;
   }
 }
+</style>
+<style scoped>
+/* 自定义高亮颜色 */
+.head-container
+  >>> .el-tree--highlight-current
+  .el-tree-node.is-current
+  > .el-tree-node__content {
+  background-color: #285b9e !important;
+  /* color: #f56c6c;  */
+  color: #25f1f8;
+}
 </style>
\ No newline at end of file