diff --git a/src/pages/regulatoryRepository/standardForComments/index.vue b/src/pages/regulatoryRepository/standardForComments/index.vue index 128f670dc..39b63a38b 100644 --- a/src/pages/regulatoryRepository/standardForComments/index.vue +++ b/src/pages/regulatoryRepository/standardForComments/index.vue @@ -137,7 +137,7 @@ export default { this.$router.push({ name: "consultationDetails", query: { - item: item + item: JSON.stringify(item) } }); }, diff --git a/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue index 55764abd8..53f6ac132 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/AddFileDetails.vue +++ b/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, diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index 92bdf4bd1..dfe93e83d 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -14,34 +14,34 @@ - {{ this.$route.query.item.cid }} + {{ this.lawsStand.cid }}

- - - - - - - - + + + + + + + +
-
- {{ file.name }} - -
+
+ {{ file.name }} + +
- @@ -69,11 +69,11 @@

- {{ this.$route.query.item.startTime || '-' }} + {{ this.lawsStand.startTime || '-' }}

- {{ this.$route.query.item.startTime + ' ~ ' + this.$route.query.item.endTime }} + {{ this.lawsStand.startTime + ' ~ ' + this.lawsStand.endTime }} -

@@ -87,25 +87,25 @@
+ type="index" + label="序号" + align="center" + width="50"> + prop="partCode" + label="章节编号" + sortable + align="center" + width="120"> @@ -149,17 +149,17 @@ > @@ -182,18 +182,18 @@
+ style="position: static;width: 100%;" + :page="form.page" + :total="total" + @pageChange="handlePageChange" + @pageSizeChange="handlePageSizeChange">
@@ -234,9 +234,9 @@ 数据加载中…… + title="查看修改前内容" + :visible.sync="itermsConditionsFlag" + width="800px">
关闭 @@ -246,449 +246,493 @@ diff --git a/src/router/index.js b/src/router/index.js index 2be48c1b8..6e4ee771c 100644 --- a/src/router/index.js +++ b/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'), diff --git a/src/store/getters/index.js b/src/store/getters/index.js index 1d90d8ad3..fbf6e9278 100644 --- a/src/store/getters/index.js +++ b/src/store/getters/index.js @@ -179,5 +179,8 @@ export default { } else { return JSON.parse(state.accessStandRegRows) } + }, + refreshFlag: state => { + return state.refreshFlag } } diff --git a/src/store/mutations/index.js b/src/store/mutations/index.js index e326e7cee..3503672c8 100644 --- a/src/store/mutations/index.js +++ b/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) {} } } diff --git a/src/store/state/index.js b/src/store/state/index.js index 3b3f7571f..b4ee9092f 100644 --- a/src/store/state/index.js +++ b/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 } diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 9255ff530..df4b0063f 100644 --- a/src/sysConfig/index.js +++ b/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 = '62.234.136.153' -const devInterfacePORT = '9999' +// const devIp = '192.168.10.6' +const devIp = '62.234.136.153' +const devInterfacePORT = '8033' // const devIp = '10.19.11.243' // const devInterfacePORT = '4304' // 配置 idm 认证