Kaynağa Gözat

1.0.22 优化数据导入 解决cas单点登录(消息推送声音)问题

liuyanpeng 2 yıl önce
ebeveyn
işleme
df8348a8dc
2 değiştirilmiş dosya ile 18 ekleme ve 8 silme
  1. 3 3
      package.json
  2. 15 5
      public/casLogin.html

+ 3 - 3
package.json

@@ -1,7 +1,7 @@
 {
   "name": "prodog-pc-client",
   "description": "Leanwo Prodog Client",
-  "version": "1.2.21",
+  "version": "1.2.22",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "dev": "cross-env webpack serve --config ./webpack.dev.js",
@@ -16,8 +16,8 @@
     "ant-design-vue": "^3.2.15",
     "axios": "^0.19.2",
     "click-outside-vue3": "^4.0.1",
-    "client-base-v4": "4.0.48",
-    "client-dic-v3": "^3.0.28",
+    "client-base-v4": "4.0.49",
+    "client-dic-v3": "^3.0.29",
     "client-eam-v3": "^3.0.72",
     "client-role-v3": "^3.0.18",
     "client-trace-v3": "^1.0.20",

+ 15 - 5
public/casLogin.html

@@ -61,7 +61,15 @@
           // 根据认证跳转系统对应页面
           getTicket: function () {
             const _self = this;
-            const redirect_uri = window.location.href; // http:192.168.1.129:10022/casLogin.html?authSettingNo=001
+            // 如果是从和系统不同的域名跳转进入系统,系统以prevUrl当作标识播放消息推送声音
+            let prevUrl = localStorage.getItem("#prevUrl");
+            if (!prevUrl) {
+              if (document.referrer) {
+                prevUrl = new URL(document.referrer).hostname;
+                localStorage.setItem("#prevUrl", prevUrl);
+              }
+            }
+            const redirect_uri = window.location.href;
             _self.ticket = _self.getQueryString("ticket");
             if (_self.ticket) {
               // 1.判断是否包含重定向地址
@@ -157,11 +165,11 @@
           },
 
           setLoginInfo: function (loginInfo, newUrl) {
-            var _self = this;
-
+            const _self = this;
+            const prevUrl = localStorage.getItem("#prevUrl");
             _self.clearLocalStorage();
 
-            _self.setLocalStorage(loginInfo);
+            _self.setLocalStorage(loginInfo,prevUrl);
 
             const str = "redirectUrl=";
             const endStart = newUrl.indexOf("redirectUrl");
@@ -173,7 +181,9 @@
           },
 
           //  设置localStorage
-          setLocalStorage: function (loginInfo) {
+          setLocalStorage: function (loginInfo,prevUrl) {
+            localStorage.setItem("allowSound", false);
+            localStorage.setItem("#prevUrl", prevUrl);
             localStorage.setItem("#LoginInfo", JSON.stringify(loginInfo));
             localStorage.setItem("#token", loginInfo.token);
             localStorage.setItem("#accountId", loginInfo.accountId);