Merge branch 'main_dev' into ft

@@ -8,12 +8,10 @@ VITE_GLOB_PUBLIC_PATH = /
 # Please note that no line breaks
 # Please note that no line breaks
 
 
 # 本地
 # 本地
-VITE_PROXY = [["/api","http://222.180.200.114:48080/api"],["/thingskit-scada","http://localhost:3000/"],["/large-designer", "http://localhost:5555/large-designer/"]]
-# VITE_PROXY = [["/api","http://192.168.10.112:8080/api"],["/thingskit-scada","http://localhost:3000/"],["/large-designer", "http://localhost:5555/large-designer/"]]
+VITE_PROXY = [["/api","http://localhost:8080/api"],["/thingskit-scada","http://localhost:3000/"],["/large-designer", "http://localhost:5555/large-designer/"]]
 
 
 # 实时数据的ws地址
 # 实时数据的ws地址
-VITE_GLOB_WEB_SOCKET = ws://222.180.200.114:48080/api/ws/plugins/telemetry?token=
-# VITE_GLOB_WEB_SOCKET = ws://192.168.10.112:48080/api/ws/plugins/telemetry?token=
+VITE_GLOB_WEB_SOCKET = ws://localhost:8080/api/ws/plugins/telemetry?token=
 
 
 # Delete console
 # Delete console
 VITE_GLOB_DROP_CONSOLE = true
 VITE_GLOB_DROP_CONSOLE = true

@@ -16,11 +16,11 @@ VITE_GLOB_BUILD_COMPRESS = 'gzip'
 VITE_GLOB_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
 VITE_GLOB_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
 
 
 # Basic interface address SPA
 # Basic interface address SPA
-VITE_GLOB_API_URL=http://122.9.141.195:8080/api
+VITE_GLOB_API_URL=http://localhost:8080/api
 
 
 # File upload address， optional
 # File upload address， optional
 # It can be forwarded by nginx or write the actual address directly
 # It can be forwarded by nginx or write the actual address directly
-VITE_GLOB_UPLOAD_URL=http://122.9.141.195:8080/api/yt/oss/upload
+VITE_GLOB_UPLOAD_URL=http://localhost:8080/api/yt/oss/upload
 
 
 # Interface prefix
 # Interface prefix
 VITE_GLOB_API_URL_PREFIX=/yt
 VITE_GLOB_API_URL_PREFIX=/yt
@@ -35,7 +35,7 @@ VITE_USE_PWA = false
 VITE_LEGACY = true
 VITE_LEGACY = true
 
 
 # 实时数据的ws地址
 # 实时数据的ws地址
-VITE_GLOB_WEB_SOCKET = ws://122.9.141.195:8080/api/ws/plugins/telemetry?token=
+VITE_GLOB_WEB_SOCKET = ws://localhost:8080/api/ws/plugins/telemetry?token=
 
 
 #configuration
 #configuration
 VITE_GLOB_CONFIGURATION = /thingskit-scada
 VITE_GLOB_CONFIGURATION = /thingskit-scada

@@ -17,7 +17,6 @@
           icon="ion:document-text-outline"
           icon="ion:document-text-outline"
         />
         />
         <MenuItem
         <MenuItem
-          v-if="hasPermission('system:password:view')"
           key="changePassword"
           key="changePassword"
           :text="t('layout.header.dropdownItemChangePassword')"
           :text="t('layout.header.dropdownItemChangePassword')"
           icon="ant-design:unlock-twotone"
           icon="ant-design:unlock-twotone"

@@ -91,9 +91,11 @@
           },
           },
         ];
         ];
       });
       });
-
       const getCommonProps = computed(() => {
       const getCommonProps = computed(() => {
-        const menus = unref(menusRef);
+        let menus = unref(menusRef);
+        // 子菜单都隐藏后 目录隐藏
+        menus = menus.filter((item) => !item.children?.every((temp) => temp.hideMenu));
+
         return {
         return {
           menus,
           menus,
           beforeClickFn: beforeMenuClickFn,
           beforeClickFn: beforeMenuClickFn,