瀏覽代碼

更新依赖和授权登录

ZaiZai 1 年之前
父節點
當前提交
ea4ef93c54
共有 3 個文件被更改,包括 20 次插入19 次删除
  1. 3 3
      package.json
  2. 5 4
      src/plugins/HcTopMenu.js
  3. 12 12
      yarn.lock

+ 3 - 3
package.json

@@ -13,14 +13,14 @@
         "lint:fix": "eslint . --fix"
     },
     "dependencies": {
-        "axios": "^1.6.3",
+        "axios": "^1.6.6",
         "crypto-js": "^4.2.0",
         "dayjs": "^1.11.10",
         "echarts": "^5.4.3",
-        "element-plus": "^2.5.2",
+        "element-plus": "^2.5.3",
         "hc-vue3-ui": "^2.9.2",
         "js-base64": "^3.7.6",
-        "js-fast-way": "^0.4.0",
+        "js-fast-way": "0.4.2",
         "js-md5": "^0.8.3",
         "js-web-screen-shot": "^1.9.9-rc.10",
         "nprogress": "^0.2.0",

+ 5 - 4
src/plugins/HcTopMenu.js

@@ -2,7 +2,7 @@ import { isPathUrl } from '~uti/tools'
 import { getToken } from '~src/api/util/auth'
 import { getStoreValue } from '~uti/storage'
 import { getTenantDetail } from '~api/other'
-import { getArrValue, getObjValue } from 'js-fast-way'
+import { getArrValue, getObjValue, newWindow } from 'js-fast-way'
 
 export default class HcTopMenu {
 
@@ -27,8 +27,8 @@ export default class HcTopMenu {
     static async setMenuItem(item) {
         if (isPathUrl(item?.path)) {
             let token = getToken(), domain = item?.path
-            if (item?.code === 'to-archives-url') {
-                const tenantId = getStoreValue('tenantId')
+            const tenantId = getStoreValue('tenantId')
+            if (item?.code === 'to-archives-url' || item?.code === 'to-measure-url') {
                 if (tenantId === '000000' || !tenantId) {
                     domain = item?.path
                 } else {
@@ -39,7 +39,8 @@ export default class HcTopMenu {
                     }
                 }
             }
-            window.open(domain + '/#/auth?token=' + token, '_blank')
+            //跳转到新页面
+            newWindow(`${domain}/#/auth?token=${token}&tenantid=${tenantId}`)
         } else {
             return getArrValue(item?.children)
         }

+ 12 - 12
yarn.lock

@@ -538,10 +538,10 @@ autoprefixer@^10.4.17:
     picocolors "^1.0.0"
     postcss-value-parser "^4.2.0"
 
-axios@^1.6.3:
-  version "1.6.5"
-  resolved "http://39.108.216.210:9000/axios/-/axios-1.6.5.tgz"
-  integrity sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==
+axios@^1.6.6:
+  version "1.6.6"
+  resolved "http://39.108.216.210:9000/axios/-/axios-1.6.6.tgz#878db45401d91fe9e53aed8ac962ed93bde8dd1c"
+  integrity sha512-XZLZDFfXKM9U/Y/B4nNynfCRUqNyVZ4sBC/n9GDRCkq9vd2mIvKjKKsbIh1WPmHmNbg6ND7cTBY3Y2+u1G3/2Q==
   dependencies:
     follow-redirects "^1.15.4"
     form-data "^4.0.0"
@@ -939,10 +939,10 @@ electron-to-chromium@^1.4.601:
   resolved "http://39.108.216.210:9000/electron-to-chromium/-/electron-to-chromium-1.4.626.tgz"
   integrity sha512-f7/be56VjRRQk+Ric6PmIrEtPcIqsn3tElyAu9Sh6egha2VLJ82qwkcOdcnT06W+Pb6RUulV1ckzrGbKzVcTHg==
 
-element-plus@^2.5.2:
-  version "2.5.2"
-  resolved "http://39.108.216.210:9000/element-plus/-/element-plus-2.5.2.tgz#8523e48e67f84ea434f4026b2a52d08e79230d26"
-  integrity sha512-0Xbihy5CvpdH+OZeRPnZlfkbZS8uyLvHJiALehvw6n7nvHGrujCmdiw8NXvYhkLpRtwue/N6oBfAvMJvQSPoNA==
+element-plus@^2.5.3:
+  version "2.5.3"
+  resolved "http://39.108.216.210:9000/element-plus/-/element-plus-2.5.3.tgz#d4f8988ea199ad28ef15a6b0b8f94b7639d262fb"
+  integrity sha512-wmtstxaMkD6UinIgD+45CjrhbRh4u0vt+/GgxfPeMLt5pDpIVwZFjkUaVcWqqxcxd5a80HP3XlDF74fW7wim9A==
   dependencies:
     "@ctrl/tinycolor" "^3.4.1"
     "@element-plus/icons-vue" "^2.3.1"
@@ -1438,10 +1438,10 @@ js-base64@^3.7.6:
   resolved "http://39.108.216.210:9000/js-base64/-/js-base64-3.7.6.tgz#6ccb5d761b48381fd819f9ce04998866dbcbbc99"
   integrity sha512-NPrWuHFxFUknr1KqJRDgUQPexQF0uIJWjeT+2KjEePhitQxQEx5EJBG1lVn5/hc8aLycTpXrDOgPQ6Zq+EDiTA==
 
-js-fast-way@^0.4.0:
-  version "0.4.0"
-  resolved "http://39.108.216.210:9000/js-fast-way/-/js-fast-way-0.4.0.tgz#ae319da4c0a24276d27f49a1e8efb20036259739"
-  integrity sha512-CJW2XL8IEhWgiDBLnEUZ/Urh9VlMClt4XRWQlRznbh1x+neAHzjiV7OYUdBHoXPhkkClds1FK6NS/qcGUSQVCg==
+js-fast-way@0.4.2:
+  version "0.4.2"
+  resolved "https://registry.npmjs.org/js-fast-way/-/js-fast-way-0.4.2.tgz#6a67c7f9658c1c42634e6123c5acd95debd4b92f"
+  integrity sha512-koj29mHpwfVhMv2nvvMVJMiMJvU8Vt9n07UdWTxMGVUwWKwEkMZrwgS0qN+94PVbyinBtXThIKZYI9fkjkyW3A==
 
 js-md5@^0.8.3:
   version "0.8.3"