sujunling 1 سال پیش
والد
کامیت
bee95f88d3
5فایلهای تغییر یافته به همراه50 افزوده شده و 13 حذف شده
  1. 2 2
      .env.development
  2. 43 9
      src/api/sys/tips.ts
  3. 1 0
      src/api/sys/user.ts
  4. 1 0
      src/layouts/default/header/index.vue
  5. 3 2
      src/router/guard/permissionGuard.ts

+ 2 - 2
.env.development

@@ -11,10 +11,10 @@ VITE_GLOB_PUBLIC_PATH = /
 # VITE_PROXY = [["/api","http://192.168.2.225/api"]]
 
 # 线上演示环境
-VITE_PROXY = [["/api","http://117.174.10.73:19200"],["/agent","http://117.174.10.73:31895"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]
+# VITE_PROXY = [["/api","http://117.174.10.73:19200"],["/agent","http://117.174.10.73:31895"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]
 # VITE_PROXY = [["/api","http://192.168.49.163:20043"],["/agent","http://192.168.49.163:20043"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]
 # VITE_PROXY = [["/api","http://127.0.0.1:20043"],["/agent","http://127.0.0.1:20043"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]
-# VITE_PROXY = [["/api","http://192.168.49.163:20043"],["/agent","http://192.168.49.163:20043"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]
+VITE_PROXY = [["/api","http://192.168.49.163:20043"],["/agent","http://192.168.49.163:20043"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]
 # VITE_PROXY = [["/api","http://127.0.0.1:8008"],["/agent","http://127.0.0.1:8008"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]
 # VITE_PROXY = [["/api","http://127.0.0.1:8008"],["/agent","http://127.0.0.1:8008"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"],["/mapTools","http://106.12.170.138:10090"]]
 # VITE_PROXY = [["/api","http://192.168.119.143:9200"],["/agent","http://192.168.119.143:31895"],["/iserver","http://221.182.8.141:15000/iserver"],["/onlineIde","http://106.12.170.138:4001/examples"],["/tfDemo","http://106.12.170.138:4001/demo"]]                                                            

+ 43 - 9
src/api/sys/tips.ts

@@ -17,17 +17,51 @@ export function getSmsByUserId(data) {
         keyStr: data.keyStr,
         page: data.page,
         rows: data.rows,
-        userid:session.getItem('userId')
+        userid: session.getItem('userId')
+    }
+    var obj = {
+        "datas": {
+            "records": [
+                {
+                    "id": "32b28674-2f0e-4694-b75d-7532b5d4326e",
+                    "message": "您申请的【组件资源上传】业务,未通过审核!",
+                    "userid": "27AF004A-8BDN-885T-30FU-89DE3388762B",
+                    "smslx": 1,
+                    "createtime": "2023-11-27 16:18:18",
+                    "bussid": "f78ddf0a-7d0b-4752-bd94-81fe65c7b10e",
+                    "status": 0
+                },
+                {
+                    "id": "c84d238a-3856-4f58-b65d-4ee083c8c936",
+                    "message": "您有一个业务名称为【组件资源授权】的业务件未处理,请及时处理!",
+                    "userid": "27AF004A-8BDN-885T-30FU-89DE3388762B",
+                    "smslx": 0,
+                    "createtime": "2023-10-23 17:15:42",
+                    "bussid": "38aabe11-169a-492f-9a08-d21967bde86a",
+                    "status": 0
+                },
+            ],
+            "total": 142,
+            "size": 1000000,
+            "current": 1,
+            "searchCount": true,
+            "pages": 1
+        },
+        "resp_code": 0,
+        "resp_msg": "获取成功"
     }
     return new Promise<void>((resolve, reject) => {
-        defHttp.post({ url: Api.GetSms, params })
-            .then((r) => {
-                resolve(r);
-            }).
-            catch((e) => {
-                reject(e);
-            })
+        resolve(obj);
     })
+    // return new Promise<void>((resolve, reject) => {
+    //     defHttp.post({ url: Api.GetSms, params })
+    //         .then((r) => {
+    //             resolve(r);
+    //         }).
+    //         catch((e) => {
+    //             reject(e);
+    //         })
+    // })
 }
 
 /**
@@ -36,7 +70,7 @@ export function getSmsByUserId(data) {
  */
 export function editSmsById(data) {
     let params = {
-        smid:data.smid
+        smid: data.smid
     }
     return new Promise<void>((resolve, reject) => {
         defHttp.post({ url: Api.EditSms, params })

+ 1 - 0
src/api/sys/user.ts

@@ -95,6 +95,7 @@ export function loginCallProvider() {
 
 
 export function getMyInfo() {
+  debugger
   var a = session.getItem('loginFrom');
   const formData = new URLSearchParams();
   formData.append('interfaceName', 'atp-provider.controller.AtpController');

+ 1 - 0
src/layouts/default/header/index.vue

@@ -194,6 +194,7 @@ export default defineComponent({
         page: 1,
         rows: 1000000
       }
+      //消息接口循环
       getSmsByUserId(params).then(res => {
         if (res.datas?.records?.length) {
           let todoNum = 0;

+ 3 - 2
src/router/guard/permissionGuard.ts

@@ -18,8 +18,9 @@ export async function createPermissionGuard(router: Router) {
   const userStore = useUserStoreWithOut();
   const permissionStore = usePermissionStoreWithOut();
   const userStore2 = useUserStore();
-
-  if (location.href.indexOf('refreshToken') > -1) {
+  var token = session.getItem('token')
+  var tokenV2 = session.getItem('tokenV2')
+  if ((location.href.indexOf('refreshToken') > -1) && (!token || !tokenV2)) {
     await userStore2.login({
       password: 'Tofly@028',
       username: 'ADMIN2',