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