Merge branch 'develop' into 'FOTON'

Develop

See merge request LAWS/laws-system-front-FOTON!306

src/pages/regulatoryRepository/standardForComments/index.vue

@@ -137,7 +137,7 @@ export default {
       this.$router.push({
         name: "consultationDetails",
         query: {
-          item: item
+          item: JSON.stringify(item)
         }
       });
     },

src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue

@@ -102,6 +102,7 @@
                         }, res => {
                             if (res.respCode === '200') {
                                 // 储存变量监听刷新页面
+                                this.$store.commit('SET_REFRESH_FLAG', true)
                                 localStorage.setItem('freshClueNum', new Date().getTime())
                                 this.isSubmit = false
                                 this.opinionContent.partCode = ''
@@ -125,7 +126,6 @@
             },
         },
         mounted() {
-            console.log(this.$route.query);
             this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
                 standId: this.$route.query.standId,
                 fileType: this.$route.query.fileType,

src/router/index.js

@@ -3753,7 +3753,7 @@ const routes = [
   // 详情页
   // **************************   其他详情页   ******************************* //
   {
-    path: '/consultationDetails/:id/:pageType',
+    path: '/consultationDetails/:id?/:pageType?',
     name: 'consultationDetails',
     component: () =>
       import('@/pages/regulatoryRepository/standardForComments/pags/consultationDetails'),

src/store/getters/index.js

@@ -179,5 +179,8 @@ export default {
     } else {
       return JSON.parse(state.accessStandRegRows)
     }
+  },
+  refreshFlag: state => {
+    return state.refreshFlag
   }
 }

src/store/mutations/index.js

@@ -296,5 +296,11 @@ export default {
       state.accessStandRegTabName = ''
       sessionStorage.removeItem('accessStandRegTabName')
     }
+  },
+  SET_REFRESH_FLAG(state, flag) {
+    state.refreshFlag = flag
+    try {
+      localStorage.setItem('refreshFlag', flag)
+    } catch (e) {}
   }
 }

src/store/state/index.js

@@ -33,6 +33,7 @@ let proLastDetail = '' // 流程结果详情
 let rukuBaseInfo = '' // 入库流程基础表单信息(后几步展示用)
 let accessStandRegRows = '' // 标准法规清单编辑
 let accessStandRegTabName = '' // 标准法规清单页面当前页签
+let refreshFlag = '' // 监听其他页面刷新
 try {
   if (localStorage.theme) { defaultTheme = localStorage.theme }
   if (localStorage.token) { defaultToken = localStorage.token }
@@ -65,6 +66,7 @@ try {
   if (sessionStorage.rukuBaseInfo) { rukuBaseInfo = sessionStorage.rukuBaseInfo }
   if (sessionStorage.accessStandRegRows) { accessStandRegRows = sessionStorage.accessStandRegRows }
   if (sessionStorage.accessStandRegTabName) { accessStandRegTabName = sessionStorage.accessStandRegTabName }
+  if (sessionStorage.refreshFlag) { refreshFlag = localStorage.refreshFlag }
 } catch (e) {}
 export default {
   theme: defaultTheme, // 主题
@@ -99,5 +101,6 @@ export default {
   proLastDetail,
   rukuBaseInfo,
   accessStandRegRows,
-  accessStandRegTabName
+  accessStandRegTabName,
+  refreshFlag
 }

src/sysConfig/index.js

@@ -6,9 +6,9 @@
 // 服务器地址
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
-const devIp = '192.168.10.6'
+// const devIp = '192.168.10.6'
-// const devIp = '62.234.136.153'
+const devIp = '62.234.136.153'
-const devInterfacePORT = '9999'
+const devInterfacePORT = '8033'
 // const devIp = '10.19.11.243'
 // const devInterfacePORT = '4304'
 // 配置 idm 认证