From f60f26ae89f87487ec7456cf364b822814ebaf39 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 19 Jul 2024 16:22:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8F=82=E6=95=B0=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=BC=96=E8=BE=91=E5=88=87=E6=8D=A2=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E5=9B=9E=E6=98=BE=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hooks/useConfigList.ts                    | 13 +++++++-----
 .../monitor/topologyArchitecture/index.vue    | 21 +++++++++++++------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/views/configManage/configParamTreeTable/hooks/useConfigList.ts b/src/views/configManage/configParamTreeTable/hooks/useConfigList.ts
index 40c1b393..4cd54450 100644
--- a/src/views/configManage/configParamTreeTable/hooks/useConfigList.ts
+++ b/src/views/configManage/configParamTreeTable/hooks/useConfigList.ts
@@ -9,11 +9,7 @@ import { reactive, toRaw } from 'vue';
  * @param param 父级传入 {t, treeState, ruleVerification}
  * @returns
  */
-export default function useConfigList({
-  t,
-  treeState,
-  ruleVerification,
-}: any) {
+export default function useConfigList({ t, treeState, ruleVerification }: any) {
   /**单列表状态类型 */
   type ListStateType = {
     /**紧凑型 */
@@ -24,6 +20,8 @@ export default function useConfigList({
     data: Record<string, any>[];
     /**编辑行记录 */
     editRecord: Record<string, any>;
+    /**确认提交等待 */
+    confirmLoading: boolean;
   };
 
   /**单列表状态 */
@@ -44,6 +42,7 @@ export default function useConfigList({
       },
     ],
     data: [],
+    confirmLoading: false,
     editRecord: {},
   });
 
@@ -54,11 +53,13 @@ export default function useConfigList({
 
   /**单列表编辑关闭 */
   function listEditClose() {
+    listState.confirmLoading = false;
     listState.editRecord = {};
   }
 
   /**单列表编辑确认 */
   function listEditOk() {
+    if (listState.confirmLoading) return;
     const from = toRaw(listState.editRecord);
     // 检查规则
     const [ok, msg] = ruleVerification(from);
@@ -71,6 +72,7 @@ export default function useConfigList({
     }
 
     // 发送
+    listState.confirmLoading = true;
     const hide = message.loading(t('common.loading'), 0);
     editPtNeConfigData({
       neType: treeState.neType,
@@ -103,6 +105,7 @@ export default function useConfigList({
       })
       .finally(() => {
         hide();
+        listState.confirmLoading = false;
         listState.editRecord = {};
       });
   }
diff --git a/src/views/monitor/topologyArchitecture/index.vue b/src/views/monitor/topologyArchitecture/index.vue
index 551bdc8c..1cd8df2c 100644
--- a/src/views/monitor/topologyArchitecture/index.vue
+++ b/src/views/monitor/topologyArchitecture/index.vue
@@ -24,6 +24,7 @@ import {
 import useNeOptions from '@/views/ne/neInfo/hooks/useNeOptions';
 import useI18n from '@/hooks/useI18n';
 import { OptionsType, WS } from '@/plugins/ws-websocket';
+import { hasRoles } from '@/plugins/auth-user';
 const { t } = useI18n();
 const { fnNeRestart, fnNeStop, fnNeLogFile } = useNeOptions();
 const ws = new WS();
@@ -78,6 +79,9 @@ const graphNodeMenu = new Menu({
     if (!neState) {
       return `<div><span>${label || id}</span></div>`;
     }
+    if (hasRoles(['student'])) {
+      return '学生2024';
+    }
     return `
     <div
       style="
@@ -133,6 +137,16 @@ const graphNodeTooltip = new Tooltip({
     if (!neState) {
       return `<div><span>${label || id}</span></div>`;
     }
+    let notStudentInfo = '';
+    if (hasRoles(['teacher', 'admin'])) {
+      notStudentInfo = `
+        <div><strong>${t('views.monitor.topology.serialNum')}：</strong><span>
+        ${neState.sn ?? '--'}
+        </span></div>
+        <div><strong>${t('views.monitor.topology.expiryDate')}：</strong><span>
+        ${neState.expire ?? '--'}
+        </span></div> `;
+    }
     return `
         <div
         style="
@@ -160,12 +174,7 @@ const graphNodeTooltip = new Tooltip({
         <div><strong>${t('views.monitor.topology.version')}：</strong><span>
         ${neState.version ?? '--'}
         </span></div>
-        <div><strong>${t('views.monitor.topology.serialNum')}：</strong><span>
-        ${neState.sn ?? '--'}
-        </span></div>
-        <div><strong>${t('views.monitor.topology.expiryDate')}：</strong><span>
-        ${neState.expire ?? '--'}
-        </span></div> 
+        ${notStudentInfo}
         </div>
         `;
   },