@ganwei-web/ganwei-pc-cli 6.2.9 → 6.3.2

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/public/static/js/getLanguage.js

@@ -46,7 +46,6 @@ window.getElementLanguages = async () => {
         //① 是否需要请求 element.el
         const needElementRequest = !elementPkg || isEmptyObject(elementPkg['el']) || isEmptyObject(elementPkg['ele']);
 
-      
         //② 是否需要请求 publics（login.publics）
         const needPublicsRequest = !loginPkg || isEmptyObject(loginPkg['publics']);
 
@@ -72,8 +71,8 @@ window.haveExistLanguage = (pluginName, menuName) => {
         const key = pluginName + '__' + menuName;
         const pkg = JSON.parse(sessionStorage.languagePackage || '{}');
         return pkg[langType] &&
-               pkg[langType][key] &&
-               Object.keys(pkg[langType][key]).length > 0;
+            pkg[langType][key] &&
+            Object.keys(pkg[langType][key]).length > 0;
     } catch {
         return false;
     }
@@ -98,12 +97,12 @@ window.requestLanguage = async (pluginName, menuName, packageId, vm) => {
     }).catch(() => ({}));
 }
 
-window.updateLanguage = (pluginName, menuName,vm, i18n) => {
+window.updateLanguage = (pluginName, menuName, vm, i18n) => {
     if (!(vm && vm.i18nInstance) && !(i18n && i18n._vm)) {
         console.log(pluginName + '__' + menuName + ' 更新语言失败，没有找到 i18n 实例');
         return;
     }
-    
+
     const langType = localStorage.languageType || 'zh-CN';
     let languagePackage = {};
     try {
@@ -131,8 +130,16 @@ window.updateLanguage = (pluginName, menuName,vm, i18n) => {
 
     // Vue3 基座
     if (vm && vm.i18nInstance) {
-        vm.i18nInstance.locale = langType;
-        vm.i18nInstance.mergeLocaleMessage(langType, JSON.parse(JSON.stringify(merged)));
+        // composition API 模式下，locale 和 mergeLocaleMessage 在 i18n.global 上
+        const i18nInstance = vm.i18nInstance.global || vm.i18nInstance;
+        if (i18nInstance.locale && typeof i18nInstance.locale === 'object' && 'value' in i18nInstance.locale) {
+            // composition API 模式
+            i18nInstance.locale.value = langType;
+        } else {
+            // legacy 模式
+            i18nInstance.locale = langType;
+        }
+        i18nInstance.mergeLocaleMessage(langType, JSON.parse(JSON.stringify(merged)));
     }
     // Vue2 基座
     else if (i18n && i18n._vm) {
@@ -151,8 +158,8 @@ window.haveExistLanguage = (pluginName, menuName) => {
         const key = pluginName + '__' + menuName;
         const pkg = JSON.parse(sessionStorage.languagePackage || '{}');
         return pkg[langType] &&
-               pkg[langType][key] &&
-               Object.keys(pkg[langType][key]).length > 0;
+            pkg[langType][key] &&
+            Object.keys(pkg[langType][key]).length > 0;
     } catch {
         return false;
     }
@@ -178,9 +185,9 @@ window.saveToSession = (pluginName, menuName, language) => {
             languagePackage[langType]['publics'] = language['publics'] || {};
         }
         else if (key === 'ganwei-iotcenter-login__element') {
-                languagePackage[langType]['element'] = language || {};
-                languagePackage[langType]['el'] = language['el'] || {};
-                languagePackage[langType]['ele'] = language || {};
+            languagePackage[langType]['element'] = language || {};
+            languagePackage[langType]['el'] = language['el'] || {};
+            languagePackage[langType]['ele'] = language || {};
         }
         sessionStorage.setItem('languagePackage', JSON.stringify(languagePackage));
     } catch (e) {

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/public/static/themes/dark-6-1.css

@@ -449,9 +449,9 @@
 
     /* EquipSelect 组件样式 */
     --equipselect-header-background: var(--gw-color-Neutrals23);
-    --equipselect-body-background: var(--gw-color-Neutrals20);
+    --equipselect-body-background: var(--frame-main-background);
 
     /* TaskPopper 组件样式 */
-    --task-popper-background: var(--gw-color-Neutrals27);
-    --task-popper-item-background: var(--gw-color-Neutrals28);
+    --task-popper-background: var(--gw-color-Neutrals23);
+    --task-popper-item-background: var(--gw-color-Neutrals27);
 }

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/public/static/themes/green-6-1.css

@@ -59,15 +59,15 @@
     /* --gw-color-Neutrals30: transparent; */
     --gw-color-Neutrals31: #D8DDEA;
     --gw-color-Neutrals32: #FFFFFF;
-    --gw-color-Neutrals33: rgba(255,255,255,0.42);
-    --gw-color-Neutrals34: rgba(4,4,4,0.14);
+    --gw-color-Neutrals33: rgba(255, 255, 255, 0.42);
+    --gw-color-Neutrals34: rgba(4, 4, 4, 0.14);
     --gw-color-Neutrals35: #F3F6F8;
     --gw-color-Neutrals36: transparent;
     --gw-color-Neutrals37: #191D2B;
     --gw-color-Neutrals38: #F0F3F5;
-    --gw-color-Neutrals39:rgba(154,37,37,0.4);
-    --gw-color-Neutrals40:rgba(0,219,28,0.2);
-    --gw-color-Neutrals41:rgba(197, 154, 99, 0.4);
+    --gw-color-Neutrals39: rgba(154, 37, 37, 0.4);
+    --gw-color-Neutrals40: rgba(0, 219, 28, 0.2);
+    --gw-color-Neutrals41: rgba(197, 154, 99, 0.4);
     /* 命名规则 参考BEM命名法*/
     /* --组件-元素-样式名__状态 */
     /* 样式名：color(字体颜色),background(背景色),border(边框色) */
@@ -98,13 +98,13 @@
     --frame-main-border2: var(--gw-color-Neutrals36);
 
     /* 顶部 */
-    --frame-top-background: var(--gw-color-Neutrals28);
+    --frame-top-background: var(--gw-color-Neutrals27);
     --frame-top-alarm-background: var(--gw-color-Neutrals39);
     --frame-top-normal-background: var(--gw-color-Neutrals40);
     --frame-top-upgrade-background: var(--gw-color-Neutrals41);
     /* 左侧菜单 */
     --frame-left-background: var(--gw-color-primary);
-    --frame-left-box-shadow:  0px 0px 10px 0px rgba(13,17,26,0.1);
+    --frame-left-box-shadow: 0px 0px 10px 0px rgba(13, 17, 26, 0.1);
 
     /* 按钮主要颜色 */
     --button-primary-color: var(--gw-color-primary);
@@ -126,11 +126,11 @@
 
     /* 标签页 */
     --labelpage-header-background: var(--gw-color-Neutrals23);
-    --labelpage-background: var(--frame-main-background);
-    --labelpage-background__active: var(--gw-color-primary5);
+    --labelpage-background: var(--gw-color-Neutrals27);
+    --labelpage-background__active: var(--frame-main-background);
     --labelpage-border__active: var(--gw-color-primary);
     --labelpage-color: var(--gw-color-Neutrals12);
-    --labelpage-color__active: var(--gw-color-Neutrals24);
+    --labelpage-color__active: var(--gw-color-Neutrals12);
     --labelpage-icon-color__hover: var(--gw-color-primary);
     --labelpage-border: var(--gw-color-Neutrals18);
 
@@ -153,6 +153,7 @@
 
     /* 菜单 */
     --menu-color: var(--gw-color-Neutrals27);
+    --menu-color-1: var(--gw-color-Neutrals1);
     --menu-color__hover: var(--gw-color-Neutrals27);
     --menu-color__active: var(--gw-color-Neutrals27);
     --menu-background__hover: var(--gw-color-primary5);
@@ -354,4 +355,4 @@
 
     --task-popper-background: var(--gw-color-Neutrals27);
     --task-popper-item-background: var(--gw-color-Neutrals28);
-}
+}

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/src/App.vue

@@ -1,22 +1,23 @@
 <template>
     <div class="app">
-        <el-config-provider>
-            <router-view v-cloak v-if="isShow" />
+        <!-- 验证通过且语言包加载完成后显示页面 -->
+        <el-config-provider v-if="isShow">
+            <router-view v-cloak />
         </el-config-provider>
     </div>
 </template>
 <script>
 import muduleObserve from '@ganwei-web/gw-base-utils-plus/moduleObserve/dist/index.es.js'
 
-import judgePermission from './mixins/judgePermission'
-import { setTheme } from './utils/setStorage'
+import { setTheme } from './utils/storage.ts'
 
 export default {
-    mixins: [judgePermission, muduleObserve],
+    mixins: [muduleObserve],
     name: 'App',
     data() {
         return {
-            isNoRequestObserveGetPublic: true
+            isNoRequestObserveGetPublic: true,
+            isLoading: true
         }
     },
     mounted() {
@@ -85,4 +86,8 @@ html body div {
 iframe {
     border: none;
 }
+
+.el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
+    background-color: var(--table-body-background__hover) !important;
+}
 </style>

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/src/components/indexRightContent/headerRight/equipAlarmDialog/index.vue

@@ -109,6 +109,12 @@ export default {
 
         // 显示通知
         showNotification(alarmData) {
+            // 检查当前路由是否包含指定路径，如果是则不显示通知
+            const currentPath = this.$route?.path || '';
+            if (currentPath.includes('/ganwei-iotcenter-alarm-manage-h5')) {
+                return;
+            }
+
             // 检查是否达到最大通知数量
             if (this.notificationOrder.length >= this.maxActiveNotifications) {
                 // 移除最早的通知（第一个）

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/src/components/indexRightContent/headerRight/expirationReminder/index.vue

@@ -1,6 +1,6 @@
 <template>
     <el-dialog :title="$t('login.应用到期提醒')" class="systemInformation_main" v-model="dialogVisible" :before-close="closeDialog" width="690" top="6vh" center append-to="#index">
-        <el-table :data="expirepluginList" height="400" border >
+        <el-table :data="expirepluginList" height="400px" border >
             <template v-slot:empty>
                 <div class="noDataTips"></div>
             </template>
@@ -27,11 +27,11 @@ export default {
             dialogVisible: false,
             expirepluginList: [],
             stateList: [{
-                value: true,
+                value: false,
                 label: 'login.即将到期',
                 type: 'warning'
             }, {
-                value: false,
+                value: true,
                 label: 'login.已到期',
                 type: 'error'
             }]
@@ -102,6 +102,10 @@ export default {
     justify-content: center;
     align-items: center;
 }
+.el-table {
+    min-height: 240px;
+    max-height: 480px;
+}
 :deep(td.el-table__cell) {
     border-bottom: 1px solid var(--frame-main-border) !important;
 }

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/src/components/indexRightContent/headerRight/index.scss

@@ -81,7 +81,11 @@
             vertical-align: middle;
             background-color: transparent;
             border-radius: 0px;
+
             // margin: 0 18px;
+            img {
+                border-radius: 6px;
+            }
         }
 
         span {

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/src/components/indexRightContent/headerRight/userInfo/index.js

@@ -18,7 +18,7 @@ export default {
     data() {
         return {
             // 登录者姓名
-            loginUsername: window.sessionStorage.userName,
+            loginUsername: sessionStorage.userName,
             showLogoutDialog: false,
             showPWEditDialog: false,
             showSystemInfoDialog: false,
@@ -28,7 +28,8 @@ export default {
             showSafeModeDialog: false,
             organizationName: '',
             parkDialog: false,
-            showComfirm: localStorage.getItem('multiPark') == 'true' ? true : false
+            showComfirm: localStorage.getItem('multiPark') == 'true' ? true : false,
+            photograph: ''
         }
     },
     mounted() {
@@ -40,7 +41,20 @@ export default {
                 return
             }
             if (code == 200) {
-                this.loginUsername = sessionStorage.userName = data?.userName
+                sessionStorage.personName = data?.personName
+                sessionStorage.userName = data?.userName
+                sessionStorage.aesUserName = data?.aesUserName
+                // 将图片路径转换为 base64 存储
+                if (data?.photograph) {
+                    this.convertImageToBase64(data.photograph).then(base64 => {
+                        sessionStorage.photograph = base64 || ''
+                        this.photograph = base64 || this.theme.user
+                    })
+                } else {
+                    sessionStorage.photograph = ''
+                    this.photograph = this.theme.user
+                }
+                this.loginUsername = data?.personName || sessionStorage.userName
                 sessionStorage.passwordPolicy = this.passwordPolicy = data?.passwordPolicy?.passwordPolicy
                 this.isAdmin = data?.role == 'ADMIN'
                 this.$store.commit('roleInfo', this.isAdmin);
@@ -55,6 +69,24 @@ export default {
         })
     },
     methods: {
+        // 图片路径转 base64
+        async convertImageToBase64(imagePath) {
+            if (!imagePath) return null
+            try {
+                const imageUrl = window.origin + imagePath
+                const response = await fetch(imageUrl)
+                const blob = await response.blob()
+                return new Promise((resolve, reject) => {
+                    const reader = new FileReader()
+                    reader.onloadend = () => resolve(reader.result)
+                    reader.onerror = reject
+                    reader.readAsDataURL(blob)
+                })
+            } catch (error) {
+                console.error('图片转base64失败:', error)
+                return null
+            }
+        },
         openDialog(dialog) {
             this[dialog] = true
         },

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/src/components/indexRightContent/headerRight/userInfo/index.scss

@@ -24,7 +24,7 @@
     }
 
     .user {
-        padding: 4px 15px 14px;
+        padding: 10px 4px;
         display: flex;
         align-items: center;
         margin-bottom: 10px;
@@ -34,6 +34,12 @@
             background: transparent;
             height: auto;
             margin-right: 10px;
+
+            img {
+                width: 28px;
+                height: 28px;
+                border-radius: 6px;
+            }
         }
 
         span {

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/src/components/indexRightContent/headerRight/userInfo/index.vue

@@ -1,12 +1,12 @@
 <template>
     <div class="userInfo">
         <el-dropdown class="index-header-right" popper-class="topToolTip">
-            <el-avatar :src="theme.user" shape="square"></el-avatar>
+            <el-avatar :src="photograph" shape="square"></el-avatar>
             <i class="iconfont icon-xialasanjiao"></i>
             <template #dropdown>
                 <el-dropdown-menu style="padding: 10px">
                     <div class="user">
-                        <el-avatar :src="theme.user" shape="square"></el-avatar>
+                        <el-avatar :src="photograph" shape="square"></el-avatar>
                         <span>{{ loginUsername }}</span>
                     </div>
                     <p v-if="(config?.showTopBtn?.park || config?.showTopBtn?.park === undefined) && showComfirm"

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/src/components/layouts/Navigation/ContractMenu.vue

@@ -7,35 +7,20 @@
       </span>
       <label>{{ data.name }}</label>
     </p>
-    <ContractMenu
-      v-for="item in data.children"
-      :key="item.resourceId"
-      :data="item"
-      :is-collapse="isCollapse"
-      :in-popup="true"
-    />
+    <ContractMenu v-for="item in data.children" :key="item.resourceId" :data="item" :is-collapse="isCollapse"
+      :in-popup="true" />
   </div>
 
   <!-- 一级子菜单：显示为可展开的 el-sub-menu -->
-  <el-sub-menu
-    v-else-if="isSubMenu"
-    :key="`${data.resourceId}-sub-menu`"
-    :index="String(data.resourceId)"
-    class="menu-list-item-scale"
-    :title="data.name"
-  >
+  <el-sub-menu v-else-if="isSubMenu" :key="`${data.resourceId}-sub-menu`" :index="String(data.resourceId)"
+    class="menu-list-item-scale" :title="data.name">
     <template #title>
       <div class="iconBox" :style="iconBoxStyle">
         <i class="iconfont" :class="menuIcon" />
       </div>
     </template>
-    <ContractMenu
-      v-for="item in data.children"
-      :key="item.resourceId"
-      :data="item"
-      :is-collapse="isCollapse"
-      :in-popup="true"
-    />
+    <ContractMenu v-for="item in data.children" :key="item.resourceId" :data="item" :is-collapse="isCollapse"
+      :in-popup="true" />
   </el-sub-menu>
 
   <!-- 3级及以下菜单：在弹出面板中平铺显示 -->
@@ -46,25 +31,13 @@
       </span>
       <label>{{ data.name }}</label>
     </p>
-    <ContractMenu
-      v-for="item in data.children"
-      :key="item.resourceId"
-      :data="item"
-      :is-collapse="isCollapse"
-      :in-popup="true"
-    />
+    <ContractMenu v-for="item in data.children" :key="item.resourceId" :data="item" :is-collapse="isCollapse"
+      :in-popup="true" />
   </div>
 
   <!-- 菜单项 -->
-  <el-menu-item
-    v-else-if="isMenuItem"
-    :name="data.resourceId"
-    :key="`${data.resourceId}-menu-item`"
-    :index="data.route"
-    class="menu-list-item-scale"
-    :title="showTitle ? data.name : ''"
-    @click="handleMenuClick"
-  >
+  <el-menu-item v-else-if="isMenuItem" :name="data.resourceId" :key="`${data.resourceId}-menu-item`" :index="data.route"
+    class="menu-list-item-scale" :title="showTitle ? data.name : ''" @click="handleMenuClick">
     <div class="iconBox" :style="iconBoxStyle">
       <i class="iconfont" :class="data.icon" />
     </div>
@@ -283,6 +256,7 @@ onMounted(() => {
 
     label {
       cursor: pointer;
+      color: var(--menu-color-1);
     }
   }
 

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/src/components/layouts/Navigation/TopNav.vue

@@ -6,8 +6,9 @@
     <div :class="$style.scrollView" id="topNavScrollView">
       <div :class="$style.topNavContainer" id="topNavContainer">
         <div v-for="item in options" :key="item.id" :id="`${item.id}${item.name}`"
-          :class="[$style.topNavItem, { [$style.active]: modelValue === item.index }]" @click="handleItemClick(item)">
-          <div :class="$style.iconBox" :style="{ backgroundColor: item.backgroundColor }">
+          :class="[$style.topNavItem, { 'top-nav-item': true, 'active': modelValue === item.index, [$style.active]: modelValue === item.index }]"
+          @click="handleItemClick(item)">
+          <div :class="$style.iconBox" class="iconBox" :style="{ backgroundColor: item.backgroundColor }">
             <i v-if="item.icon" class="iconfont" :class="item.icon" />
           </div>
           {{ item.name }}

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/src/components/layouts/Sidebar/LeftContent/index.vue

@@ -391,7 +391,7 @@ globalProperties.$bus.on('navTopSelectChange', () => {
 .minImg {
   width: 80%;
   height: auto;
-  margin: 0 auto;
+  margin-left: 10%;
 }
 
 .organizationalStructure {
@@ -531,11 +531,17 @@ globalProperties.$bus.on('navTopSelectChange', () => {
 [data-theme="green"] .el-container {
   #menuRef {
     background: url(/static/images/menu-background.png) no-repeat center center/100% 100%, var(--frame-left-background);
+    box-shadow: none;
   }
 
   .maxActive {
     box-shadow: none !important;
   }
+
+  .el-menu>.el-sub-menu .el-sub-menu__title .el-icon {
+    color: var(--menu-color);
+  }
+
 }
 
 .el-menu--vertical {

package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/src/router.js

@@ -4,31 +4,133 @@ import {
     createRouter,
     createWebHashHistory
 } from 'vue-router'
+import hostMap from './hostMap.js'
 
 const INDEX = () => import('./views/Index.vue')
 const jumpIframe = () => import('@/views/jumpIframe/index.vue')
+
 const router = createRouter({
     history: createWebHashHistory(),
-    routes: [{
-        path: '/',
-        redirect: '/Index'
-    },
-    {
-        path: '/Index',
-        name: 'INDEX',
-        component: INDEX,
-        children: [
-            {
-                path: 'jumpIframe/:packageName([^/]*)/:route(.*)',
-                name: 'jumpIframe3',
-                component: jumpIframe
-            }
-        ]
-    },
+    routes: [
+        {
+            path: '/',
+            redirect: '/Index'
+        },
+        {
+            path: '/Index',
+            name: 'INDEX',
+            component: INDEX,
+            meta: { requiresAuth: true },
+            children: [
+                {
+                    path: 'jumpIframe/:packageName([^/]*)/:route(.*)',
+                    name: 'jumpIframe3',
+                    component: jumpIframe,
+                    meta: { requiresAuth: true }
+                }
+            ]
+        }
     ]
 })
+
+// ==================== 登录验证状态管理 ====================
+let authCheckPromise = null
+let isAuthChecked = false
+
+// 带超时的请求
+function fetchWithTimeout(promise, timeout) {
+    return Promise.race([
+        promise,
+        new Promise((_, reject) =>
+            setTimeout(() => reject(new Error('请求超时')), timeout)
+        )
+    ])
+}
+
+// 用 AxiosBuilder 构建的带拦截器的实例
+function getAxiosInstance() {
+    return window.AxiosBuilder?.axios || window.axios
+}
+
+// 验证登录状态（复用同一个 Promise，避免重复请求）
+async function checkAuthStatus() {
+    if (isAuthChecked) return true
+    if (authCheckPromise) return authCheckPromise
+
+    authCheckPromise = (async () => {
+        try {
+            console.time('getSystemInfo')
+            const res = await fetchWithTimeout(
+                getAxiosInstance().get('/IoT/api/v3/Auth/GetSystemRuntimeInfo'),
+                3000
+            )
+            console.timeEnd('getSystemInfo')
+
+            if (res?.data?.code == 200 || res?.data?.code == -99999) {
+                isAuthChecked = true
+                return true
+            }
+            return false
+        } catch (err) {
+            console.log('登录验证失败:', err?.message || err)
+            return false
+        } finally {
+            authCheckPromise = null
+        }
+    })()
+
+    return authCheckPromise
+}
+
+// 跳转登录页
+function redirectToLogin() {
+    const url = process.env.NODE_ENV === 'development'
+        ? hostMap('ganwei-iotcenter-login')
+        : '/ganwei-iotcenter-login/#/'
+    window.location.href = url
+}
+
+// 设置开发环境参数（从 URL 参数中读取）
+function setDevelopmentParams() {
+    let map = window?.getParameterMap() || {}
+    if (process.env.NODE_ENV === 'development' && map) {
+        if (map.get('languageType')) {
+            sessionStorage.languageType = localStorage.languageType = map.get('languageType')
+        }
+        sessionStorage.userName = map.get('userName')
+        sessionStorage.passwordPolicy = map.get('passwordPolicy')
+        if (map.get('multiPark')) {
+            localStorage.multiPark = map.get('multiPark')
+        }
+        if (!sessionStorage.getItem('theme') || sessionStorage.getItem('theme') == 'null' || sessionStorage.getItem('theme') == 'undefined') {
+            sessionStorage.setItem('theme', map.get('theme'))
+        }
+    }
+}
+
+// ==================== 路由守卫 ====================
 router.beforeEach(async (to, from, next) => {
-    next()
+
+    // 不需要认证的路由直接放行
+    if (!to.meta.requiresAuth) {
+        next()
+        return
+    }
+
+    // 设置开发环境参数
+    setDevelopmentParams()
+
+    // 验证登录状态
+    const isValid = await checkAuthStatus()
+
+    if (isValid) {
+        next()
+    } else {
+        // 验证失败，跳转登录页
+        redirectToLogin()
+    }
 })
-router.afterEach((to, from, next) => { })
+
+router.afterEach(() => { })
+
 export default router