添加语音识别 及管控功能

api/commonRequest.js

@@ -1,8 +1,12 @@
 let aqEnnable = true // 参数加密开关
 //后端路径
-const commonUrl = "http://127.0.0.1:18080/zhgd/";
+const commonUrl = "http://36.33.26.201:19090/zhgd/";
 //前端路径
-const URL_IP="http://10.138.225.233:21624/zhgd-web"
+const URL_IP="http://36.33.26.201:21624/zhgd-web"
+
+// const commonUrl = "http://127.0.0.1:18080/zhgd/";
+// //前端路径
+// const URL_IP="http://10.138.225.233:21624/zhgd-web"
 /* 登录相关 */
 const login_url = commonUrl + "auth/login"; // 登录url
 const login_out = commonUrl + "auth/logout"; // 登出url

js/login/login.js

@@ -26,6 +26,7 @@ layui.use(function () {
                     sessionStorage.setItem("zhgd_token", result.data.access_token);
                     sessionStorage.setItem("zhgd_us", result.data.us);
                     const us = JSON.parse(result.data.us);
+                    localStorage.setItem("zhgd_type-noLogin",us.jumpType);
                     sessionStorage.setItem("zhgd_type", us.jumpType);
                     if (us.jumpType === '2') {
                         window.location.href = "pages/home/navigation.html";

js/publics/public.js

@@ -1,6 +1,24 @@
 const token = sessionStorage.getItem("zhgd_token");
 const us = sessionStorage.getItem("zhgd_us");
-const zhgd_type = sessionStorage.getItem("zhgd_type");
+let zhgd_type = sessionStorage.getItem("zhgd_type");
+if(!us){
+    if(!zhgd_type){
+        zhgd_type=localStorage.getItem("zhgd_type-noLogin");
+    }
+    if(!zhgd_type){
+        zhgd_type=2;
+    }
+    backLoginPage();
+}
+if(!token){
+    if(!zhgd_type){
+        zhgd_type=localStorage.getItem("zhgd_type-noLogin");
+    }
+    if(!zhgd_type){
+        zhgd_type=2;
+    }
+    backLoginPage();
+}
 const roleCode = JSON.parse(us).roleCode;
 const orgId = JSON.parse(us).orgId;
 const userId = JSON.parse(us).userId;

pages/home/navigation.html

@@ -9,11 +9,11 @@
     <link rel="stylesheet" href="../../css/home/navigation.css">
     <link rel="stylesheet" href="../../plugin/toolTip/mTips.css">
     <script src="../../js/publics/jquery-3.6.0.min.js" type="text/javascript"></script>
+    <script src="../../api/commonRequest.js" type="text/javascript"></script>
     <script src="../../js/publics/public.js"></script>
     <script src="../../plugin/layui-v2.9.7/layui/layui.js"></script>
     <script src="../../plugin/toolTip/mTips.js"></script>
     <script src="../../js/publics/aescbc.js"></script>
-    <script src="../../api/commonRequest.js" type="text/javascript"></script>
     <title>基建现场智慧工地</title>
 </head>
 

pages/web/index.html

@@ -9,9 +9,10 @@
     <link rel="stylesheet" href="./css/index.css">
     <link rel="stylesheet" href="../../plugin/toolTip/mTips.css">
     <script src="../../js/publics/jquery-3.6.0.min.js" type="text/javascript"></script>
+    <script src="../../api/commonRequest.js" type="text/javascript"></script>
     <script src="../../js/publics/public.js"></script>
     <script src="../../plugin/layui-v2.9.7/layui/layui.js"></script>
-    <script src="../../api/commonRequest.js" type="text/javascript"></script>
+
     <script src="../../plugin/toolTip/mTips.js"></script>
     <script src="../../js/publics/aescbc.js"></script>
     <script src="../../js/publics/sm3.js"></script>