From a407fb7f7add411f92fb4ae750d38183bd6396cf Mon Sep 17 00:00:00 2001
From: liub <itliubiao@qq.com>
Date: Tue, 16 Sep 2025 15:05:41 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=E5=92=8C=E4=BD=93?=
 =?UTF-8?q?=E9=AA=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/equipmentManagement/devices/Usr.vue | 45 ++++++++++++-------
 src/views/fys-equipment/group/index.vue       | 11 +++--
 2 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/src/views/equipmentManagement/devices/Usr.vue b/src/views/equipmentManagement/devices/Usr.vue
index 12fe3cd..b06ba2a 100644
--- a/src/views/equipmentManagement/devices/Usr.vue
+++ b/src/views/equipmentManagement/devices/Usr.vue
@@ -108,6 +108,13 @@ function initData(item) {
     return;
   }
   deviceid = item.data.deviceId;
+  detailData.value=[];
+  lastData.value.code="";
+  lastData.value.name="";
+  lastData.value.unitName="";
+  lastData.value.position="";
+
+
   request({
     url: '/api/device/getDeviceUser/' + item.data.deviceId,
     method: 'get'
@@ -163,12 +170,12 @@ watch(
 
   color: rgba(56, 64, 79, 1);
 
-font-family: Microsoft YaHei;
-font-size: 14px;
-font-weight: 400;
-line-height: 18px;
-letter-spacing: 0px;
-text-align: left;
+  font-family: Microsoft YaHei;
+  font-size: 14px;
+  font-weight: 400;
+  line-height: 18px;
+  letter-spacing: 0px;
+  text-align: left;
 }
 
 .row .item .lable {
@@ -211,19 +218,23 @@ text-align: left;
   height: 21px;
   letter-spacing: 0px;
   text-align: left;
+  margin-left: -7px;
 }
 
-
-.list .itemRow{
+.list .itemRow {
   color: rgba(56, 64, 79, 1);
 
-font-family: Microsoft YaHei;
-font-size: 14px;
-font-weight: 400;
-line-height: 18px;
-letter-spacing: 0px;
-text-align: left;
-margin-bottom: 13px;
+  font-family: Microsoft YaHei;
+  font-size: 14px;
+  font-weight: 400;
+  line-height: 18px;
+  letter-spacing: 0px;
+  text-align: left;
+  margin-bottom: 13px;
+}
+
+.list .itemRow:last-child {
+  margin-bottom: 0px;
 }
 .itemChild.marginBottom {
   margin-bottom: 12px;
@@ -231,7 +242,7 @@ margin-bottom: 13px;
 .list .childContent {
   width: 100%;
   height: auto;
-  border-left: 1px solid rgba(0, 198, 250, 0.2);
+  border-left: 2px solid rgba(0, 198, 250, 0.2);
   box-sizing: border-box;
   padding: 6px 20px;
 }
@@ -241,6 +252,8 @@ margin-bottom: 13px;
   background: rgba(247, 248, 252, 1);
   width: 100%;
   height: auto;
+  box-sizing: border-box;
+  padding: 10px;
 }
 
 .fleft {
diff --git a/src/views/fys-equipment/group/index.vue b/src/views/fys-equipment/group/index.vue
index 35f1f32..d15669f 100644
--- a/src/views/fys-equipment/group/index.vue
+++ b/src/views/fys-equipment/group/index.vue
@@ -11,10 +11,10 @@
       </div>
 
       <div class="treeContent">
-        <el-tree :data="treeData" :props="defaultProps" accordion @node-click="handleNodeClick">
+        <el-tree :data="treeData" :props="defaultProps" accordion @node-click="handleNodeClick" :highlight-current="true">
           <template #default="{ node, data }">
 
-            <div class="custom-tree-node" :class="checkNode.val == data.id ? 'active' : ''">
+            <div class="custom-tree-node" >
               <span :class="data.parentId != null ? '' : 'treeBold'">{{ node.label }}</span>
 
               <div class="iconContent">
@@ -613,6 +613,10 @@ var groupDelDevice = (row) => {
 }
 
 var showDevice = () => {
+  if(!checkNode.val){
+    alert("请先选择分组");
+    return;
+  }
   Status.dialogDeviceVisible = true;
   //获取所有
   let promise1 = api.getNodeDevice({
@@ -936,7 +940,8 @@ onMounted(() => {
 }
 
 .custom-tree-node.active {
-  background: rgba(228, 234, 240, 0.4) !important;
+  background: #80bcf966 !important;
+  color: #FFFFFF;
 }