From 7445e789a43f859c7dfb2bef517eee7b055bef5f Mon Sep 17 00:00:00 2001
From: liub <itliubiao@qq.com>
Date: Sat, 11 Oct 2025 11:01:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87=E5=88=86?=
 =?UTF-8?q?=E7=BB=84=E5=8A=9F=E8=83=BD=E9=BB=98=E8=AE=A4=E5=B1=95=E5=BC=80?=
 =?UTF-8?q?=E5=B7=A6=E8=BE=B9=E7=9A=84=E6=A0=91=EF=BC=8C=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E7=AC=AC=E4=B8=80=E5=88=86=E7=BB=84=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/fys-equipment/group/index.vue  | 60 +++++++++++-------
 src/views/system/user/profile/appVer.vue | 79 +-----------------------
 src/views/system/user/profile/index.vue  |  4 +-
 3 files changed, 39 insertions(+), 104 deletions(-)

diff --git a/src/views/fys-equipment/group/index.vue b/src/views/fys-equipment/group/index.vue
index 9799273..eee4ba7 100644
--- a/src/views/fys-equipment/group/index.vue
+++ b/src/views/fys-equipment/group/index.vue
@@ -10,7 +10,7 @@
       </div>
 
       <div class="treeContent">
-        <el-tree :data="treeData" :props="defaultProps" accordion @node-click="handleNodeClick" :highlight-current="true">
+        <el-tree :default-expand-all="true" :data="treeData" :props="defaultProps" accordion @node-click="handleNodeClick" :highlight-current="true">
           <template #default="{ node, data }">
             <div class="custom-tree-node">
               <span :class="data.parentId != null ? '' : 'treeBold'">{{ node.label }}</span>
@@ -171,13 +171,18 @@
     </el-dialog>
 
     <!-- 添加节点的弹出框 -->
-    <el-dialog :width="350" :draggable="true" v-model="Status.dialogEditNode" :title="cEdit.id ? '修改分组' :(cEdit.pNode?'新增子节点': '新增根节点')" center>
+    <el-dialog
+      :width="350"
+      :draggable="true"
+      v-model="Status.dialogEditNode"
+      :title="cEdit.id ? '修改分组' : cEdit.pNode ? '新增子节点' : '新增根节点'"
+      center
+    >
       <div>
         <el-form class="demo-form-inline" :inline="true" :model="cEdit" label-width="auto" style="width: 100%">
-          <el-form-item label="分组名称"> <el-input v-model="cEdit.groupName" placeholder="请输入" /> </el-form-item
-        >
-        <div style="text-indent: 68px;color: #f56c6c;margin-top: -15px;">{{ cEdit.groupName?'':'请输入分组名称' }}</div>
-      </el-form>
+          <el-form-item label="分组名称"> <el-input v-model="cEdit.groupName" placeholder="请输入" /> </el-form-item>
+          <div style="text-indent: 68px; color: #f56c6c; margin-top: -15px">{{ cEdit.groupName ? '' : '请输入分组名称' }}</div>
+        </el-form>
       </div>
       <template #footer>
         <div class="dialog-footer">
@@ -337,18 +342,21 @@ var getDeviceList = () => {
     deviceName: GjSearchForm.deviceName
   };
   showloading();
-  api
-    .getNodeDevice(para)
-    .then((res) => {
-      deviceList.value = res.rows;
-      pagin.total = res.total;
-    })
-    .catch((ex) => {
-      console.log('出现了异常', ex);
-    })
-    .finally(() => {
-      hideloading();
-    });
+  return new Promise((resolve, reject) => {
+    api
+      .getNodeDevice(para)
+      .then((res) => {
+        deviceList.value = res.rows;
+        pagin.total = res.total;
+      })
+      .catch((ex) => {
+        console.log('出现了异常', ex);
+      })
+      .finally(() => {
+        hideloading();
+        resolve();
+      });
+  });
 };
 //树控件节点点击事件
 var handleNodeClick = (node) => {
@@ -363,6 +371,12 @@ var handleNodeClick = (node) => {
 //树控件筛选后显示的数据源
 var treeData = computed(() => {
   let arr = api.treeNodeSearch(treeDataOrin.value, searchTxt.value, 'groupName', 'children');
+  if (arr.length && !checkNode.val) {
+    checkNode.val = arr[0].id;
+    getDeviceList().finally(() => {
+      checkNode.val = '';
+    });
+  }
   return arr;
 });
 
@@ -379,7 +393,7 @@ var editNode = (node) => {
   Status.isEditTreeNode = true;
   cEdit.value.editNode = node;
   cEdit.value.pNode = null;
-  Status.dialogEditNode=true;
+  Status.dialogEditNode = true;
   //
 };
 
@@ -413,7 +427,7 @@ var completeEdit = (node) => {
       if (res.code == 200) {
         alert('操作成功');
         RefreshTree();
-        Status.dialogEditNode=false;
+        Status.dialogEditNode = false;
       } else {
         alert(res.msg);
       }
@@ -477,7 +491,7 @@ var addNode = (node) => {
 };
 
 var saveNode = () => {
-  if(!cEdit.value.groupName){
+  if (!cEdit.value.groupName) {
     return;
   }
   let val = new Date().getTime();
@@ -917,8 +931,8 @@ onMounted(() => {
 }
 
 .custom-tree-node .iconContent .icon {
-  width: 18px;
-  height: 18px;
+  width: 15px;
+  height: 15px;
   visibility: hidden;
 }
 
diff --git a/src/views/system/user/profile/appVer.vue b/src/views/system/user/profile/appVer.vue
index 000a39d..3cf56cc 100644
--- a/src/views/system/user/profile/appVer.vue
+++ b/src/views/system/user/profile/appVer.vue
@@ -1,83 +1,6 @@
 <template>
-  <el-form :model="user" label-width="80px">
-    <div v-for="item in user">
-      <el-form-item :label="item.dictLabel" prop="dictLabel">
-        <el-input v-model="item.dictLabel" disabled />
-      </el-form-item>
-      <el-form-item label="版本号" prop="dictValue">
-        <el-input v-model="item.dictValue" placeholder="请输入版本号" clearable />
-      </el-form-item>
-      <el-form-item label="下载地址" prop="remark">
-        <el-input v-model="item.remark" placeholder="请输入wgt下载地址" clearable />
-      </el-form-item>
-    </div>
-
-    <el-form-item>
-      <el-button type="primary" @click="submit">保存</el-button>
-    </el-form-item>
-  </el-form>
+<div>敬请期待</div>
 </template>
 
 <script setup lang="ts">
-import request from '@/utils/request';
-const user = ref([
-  {
-    'dictValue': '',
-    'dictLabel': 'ios',
-    'remark': ''
-  },
-  {
-    'dictValue': '',
-    'dictLabel': 'android',
-    'remark': ''
-  }
-]);
-
-function getCfg() {
-  request({
-    url: '/app/auth/version',
-    method: 'get'
-  }).then((res) => {
-    if (res && res.code === 200) {
-      user.value.forEach((v) => {
-        let f = res.data.find((item) => {
-          return item.dictLabel === v.dictLabel;
-        });
-        if (f) {
-          v.dictValue = f.dictValue;
-          v.remark = f.remark;
-        }
-      });
-    }
-  });
-}
-
-function submit() {
-  let flag = [];
-  user.value.forEach((v) => {
-    let keys = Object.keys(v);
-    keys.forEach((k) => {
-      if (!v[k]) {
-        flag.push(false);
-      }
-    });
-  });
-  if (flag.length > 0) {
-    ElMessageBox.alert('所有项都是必填');
-    return;
-  }
-  request({
-    url: '/api/xinghan/device/UpVersion',
-    method: 'post',
-    data: user.value
-  }).then((res) => {
-    if (res && res.code === 200) {
-      ElMessageBox.alert('操作成功');
-    }
-  });
-}
-
-onMounted(() => {
-  getCfg();
-});
 </script>
diff --git a/src/views/system/user/profile/index.vue b/src/views/system/user/profile/index.vue
index 4618fa4..9afe566 100644
--- a/src/views/system/user/profile/index.vue
+++ b/src/views/system/user/profile/index.vue
@@ -61,9 +61,7 @@
             <el-tab-pane label="在线设备" name="onlineDevice">
               <onlineDevice :devices="state.devices" />
             </el-tab-pane>
-            <el-tab-pane label="App版本" name="appVer">
-              <appVer />
-            </el-tab-pane>
+        
           </el-tabs>
         </el-card>
       </el-col>