lilei 1 year ago
parent
commit
3fbc9afce5
4 changed files with 13 additions and 9 deletions
  1. 1 1
      public/version.json
  2. 3 0
      src/store/modules/app.js
  3. 7 6
      src/utils/request.js
  4. 2 2
      vue.config.js

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1710396503610
+  "version": 1710409814704
 }

+ 3 - 0
src/store/modules/app.js

@@ -141,6 +141,9 @@ const app = {
     SET_printLoading: (state, val) => {
       state.printLoading = val
     },
+    SET_appVersion: (state, val) => {
+      state.appVersion = val
+    },
     SET_printDefNeedle: (state, val) => {
       state.printDefNeedle = val
       localStorage.setItem('DEFAULT_PRINT_NEEDLE',val)

+ 7 - 6
src/utils/request.js

@@ -90,7 +90,8 @@ service.interceptors.request.use(config => {
     config.headers['access-org'] = changeOrg // 当前要切换的账号 sn
   }
   // 操作系统、浏览器信息
-  config.headers['os'] = getUserOsInfo()+','+getBrowserType()
+  config.headers['os'] = getUserOsInfo()
+  config.headers['bws'] = getBrowserType()
   // 分辨率
   config.headers['sdr'] = window.screen.width+'X'+window.screen.height
   // 当前页面路径
@@ -150,14 +151,14 @@ service.interceptors.response.use((response) => {
   }
   
   // 检测版本号是否变更
-  if(store.state.app.appVersion == ''){
-    if(response.data.data.version){
-      store.state.app.appVersion = response.data.data.version
+  if(!store.state.app.appVersion){
+    if(response.data.version){
+      store.commit('SET_appVersion', response.data.version)
     }
   }else{
-    if(store.state.app.appVersion != response.data.data.version){
+    if(store.state.app.appVersion != response.data.version){
       store.dispatch('getAllLookUp')
-      store.state.app.appVersion = response.data.data.version
+      store.commit('SET_appVersion', response.data.version)
     }
   }
   

+ 2 - 2
vue.config.js

@@ -209,8 +209,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.2.117/qpls-md',
-        target: 'https://p.iscm.360arrow.com/qpls-md',
+        target: 'http://192.168.2.103/qpls-md',
+        // target: 'https://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,