From 4a1745a29ca6e5a00a3c908a9b885b382e0406a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=B2=81=E8=AA=89=E7=A8=8B?= <2659568239@qq.com>
Date: Fri, 8 Dec 2023 17:46:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/LeftMenuOne/index.tsx             |  1 +
 src/layouts/index.tsx                         | 30 ++++++++++---------
 .../DeviceRegister/AdminsTab/index.tsx        |  4 +--
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/layouts/LeftMenuOne/index.tsx b/src/layouts/LeftMenuOne/index.tsx
index 43d1ce6..96d38cc 100644
--- a/src/layouts/LeftMenuOne/index.tsx
+++ b/src/layouts/LeftMenuOne/index.tsx
@@ -120,6 +120,7 @@ const LeftMenuCom: FC<PageProps> = ({ data }) => {
               <div>{item.name}</div>
               <div className={styles.triangle} style={{ transform: list[index].check ? 'rotate(90deg)' : '' }}></div>
             </div>
+
             {/* 列表 */}
             <div className={styles.item_warp} style={{ display: list[index].check ? 'block' : 'none' }}>
               {
diff --git a/src/layouts/index.tsx b/src/layouts/index.tsx
index 1f5ab70..7efe939 100644
--- a/src/layouts/index.tsx
+++ b/src/layouts/index.tsx
@@ -125,16 +125,7 @@ export default function Layout() {
     if (tabList.length > 0 && !layoutInfo) {
       setActiveName(tabList[0].name)
       let info = MenuType[tabList[0].name];
-
-      if (info[0].name == '设备注册') {
-        for(let i=0; i<treeData.length; i++) {
-          if (treeData[i].children.length > 0) {
-            history.push(`/registerManage/deviceRegister/${treeData[i].children[0].key}`) 
-            break;
-          }
-        }
-        return
-      }
+      if(isTreeType(info)) return
 
       if (info[0].data) {
         history.push(`${info[0].data[0].url}`)
@@ -144,6 +135,19 @@ export default function Layout() {
     }
   }, [selectVal])
 
+  // 校验是否是树结构列表
+  const isTreeType = (info: any) => {
+    if (info[0].name == '设备注册') {
+      for(let i=0; i<treeData.length; i++) {
+        if (treeData[i].children.length > 0) {
+          history.push(`/registerManage/deviceRegister/${treeData[i].children[0].key}`) 
+          break;
+        }
+      }
+      return true
+    }
+  }
+
   return (
     <ConfigProvider
       locale={zhCN}
@@ -199,13 +203,11 @@ export default function Layout() {
 
                       setActive(item.id)
                       setActiveName(item.name)
+                      
+                      if(isTreeType(info)) return
 
                       if (info.length == 0 || info[0].data && info[0].data.length == 0) {
                         history.push('/construction');
-                        // 暂时屏蔽
-                        // setActive(tabList[0].id)
-                        // setActiveName(tabList[0].name)
-                        // message.info(item.name + '模块正在建设中！')
                         return
                       }
 
diff --git a/src/pages/Register/RegisterManage/DeviceRegister/AdminsTab/index.tsx b/src/pages/Register/RegisterManage/DeviceRegister/AdminsTab/index.tsx
index 95c62b5..ef913a0 100644
--- a/src/pages/Register/RegisterManage/DeviceRegister/AdminsTab/index.tsx
+++ b/src/pages/Register/RegisterManage/DeviceRegister/AdminsTab/index.tsx
@@ -25,8 +25,8 @@ export default function Page() {
     { title: '席位名称', dataIndex: 'name', key: 'name', align: 'center' }
   ]
 
-  let inputSty = { width: 220, marginLeft: 16, marginRight: 10 };
-  let inputSty1 = { width: 220, marginLeft: 18, marginRight: 10 };
+  let inputSty = { width: 200, marginLeft: 16, marginRight: 10 };
+  let inputSty1 = { width: 200, marginLeft: 18, marginRight: 10 };
 
   return (
     <div>