diff --git a/public/index.html b/public/index.html index ab42df17f..a4234806f 100644 --- a/public/index.html +++ b/public/index.html @@ -11,10 +11,10 @@ 标准法规管理系统 - - + + + +
diff --git a/src/main.js b/src/main.js index a2c5adf76..803cf9d99 100644 --- a/src/main.js +++ b/src/main.js @@ -46,7 +46,8 @@ import 'vant/lib/index.css'; //vant import animate from 'animate.css' - +import tool from './utils/tool' +Vue.use(tool) // 引入路由器 import router from './router' // 路由解析器 diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index a1c289dcd..6db629d24 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -9,13 +9,13 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index cb13c7c2e..9dbaa8b71 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -437,6 +437,7 @@ v-model="plForm.technicalRequir" placeholder="请输入核心技术要求" maxlength="500" + :autosize="{minRows:10,maxRows:10}" > @@ -1036,6 +1037,9 @@ export default { }, handleTabs(name) { this.active = name + this.$nextTick(()=>{ + this.$refs.filterTable.doLayout() + }) }, handleSave() { this.saveLoading = true diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue index a407658e0..7e5cd7c67 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue @@ -237,6 +237,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index 60768153f..35b1d5dac 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -235,6 +235,7 @@ { // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中 if (item === row) { - this.$refs.selection.toggleRowSelection(row, false); + this.$refs.detailedSelection.toggleRowSelection(row, false); } // 不然就让当前的一行勾选 else { - this.$refs.selection.toggleRowSelection(row, true); + this.$refs.detailedSelection.toggleRowSelection(row, true); } }); } else { - this.$refs.selection.toggleRowSelection(row, true); + this.$refs.detailedSelection.toggleRowSelection(row, true); } }, select(selection, row) { // 清除 所有勾选项 - this.$refs.selection.clearSelection(); + this.$refs.detailedSelection.clearSelection(); // 当表格数据都没有被勾选的时候 就返回 // 主要用于将当前勾选的表格状态清除 if (selection.length === 0) return; - this.$refs.selection.toggleRowSelection(row, true); + this.$refs.detailedSelection.toggleRowSelection(row, true); }, //标准表格选择框改变 selectStandChange(data) { @@ -1633,5 +1635,10 @@ export default { height: calc(~'100% - 65px'); overflow: auto; } + .drawer-table{ + /deep/.el-drawer__body{ + overflow-y: hidden; + } + } } diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 8f52060af..d45ece1f4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -235,6 +235,7 @@ { // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中 if (item === row) { - this.$refs.selection.toggleRowSelection(row, false); + this.$refs.detailedSelection.toggleRowSelection(row, false); } // 不然就让当前的一行勾选 else { - this.$refs.selection.toggleRowSelection(row, true); + this.$refs.detailedSelection.toggleRowSelection(row, true); } }) } else { - this.$refs.selection.toggleRowSelection(row, true); + this.$refs.detailedSelection.toggleRowSelection(row, true); } }, choiceZRR(type, title, id) { @@ -1595,5 +1598,10 @@ export default { height: calc(~'100% - 65px'); overflow: auto; } + .drawer-table{ + /deep/.el-drawer__body{ + overflow-y: hidden; + } + } } diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 79a117562..14f185046 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -1771,11 +1771,16 @@ - - {{ opt.label }} - - + + + + + + diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index fa068aab2..7dd20272b 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -809,7 +809,7 @@ {required: true, message: '请选择起草人', trigger: 'change'}, ], rqbJson: [ - {required: true, message: '请选择代替企标编号', trigger: 'change'}, + {required: false, message: '请选择代替企标编号', trigger: ['change', 'blur']}, ] }, form: { @@ -1038,6 +1038,7 @@ } this.addForm.unit = list this.addForm.unitName = listName + this.$refs.addForm.validateField('unitName') this.modalshowflagZRBM = false }, choiceZRBM(id) { @@ -1161,7 +1162,32 @@ }, addData () { this.addDrawerTitle = '新增' - this.addForm = {} + this.addForm = { + bussSort:'', + esMatingRelations: '', + technologic: '', + useLevel: '', + isRelate: '', + esStandRelations: '', + area: [], + tsJson: '', + tsJsonName: '', + rqbJson: '', + rqbName: '', + unit: '', // 单位 + unitName: '', + esName: '', // 企标名称 + planStatus: '', // 计划状态 + reviseStatus: '', // 制修订状态 + resPerson: '', // 评审责任人 + resPersonName: '', + wgLeader: '', // 工作组组长 + wgLeaderName: '', + draftTime: '', // 计划标准初稿完成时间 + releaseTime: '', // 计划标准发布时间 + drafter: '', // 起草人 + drafterName: '' + } this.DrawerType = 'add' this.addForm.planStatus = '0' this.addDrawer = true diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue index 192c3f3a5..f2c5ffc12 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue @@ -457,7 +457,7 @@ export default { let routeUrl = this.$router.resolve({ name: 'OtherStandardDetails', params: { - id: item.id, + id: item.standId, pageType: 'INLAND_STAND' // pageType: item.standType + '_STAND' } diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 7ec42cb0f..2a9d1ff43 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -896,6 +896,7 @@ export default { }, showStand(){ this.dialogTableVisible = true + this.getStandDataBtn() }, //标准查询按钮 getStandDataBtn(){ diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index 89cb9de04..c1c1e7514 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -388,6 +388,7 @@ export default { console.log(res.data.records); this.total = res.data.total this.spinShow = false + localStorage.setItem('refreshFlag', false) }, e => { }) }, @@ -557,6 +558,13 @@ export default { }, handleQueryPdf(file){ window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + file.attId)) + }, + isVisible(e) { + if (e.target.visibilityState === "visible") { + this.getList() + } else if (e.target.visibilityState === "hidden") { + this.getList() + } } }, watch: { @@ -572,6 +580,17 @@ export default { ...mapGetters(['refreshFlag']) }, mounted() { + const that = this; + //监听缓存中指定key的值变化 + window.addEventListener("setItemEvent",function(e){ + //e.key : 是值发生变化的key + //例如 e.key==="token"; + //e.newValue : 是可以对应的新值 + if(e.key === "refreshFlag" && e.newValue === true){ + this.getList() + } + }) + document.addEventListener('visibilitychange', that.isVisible) if (this.lawsStand) { this.form = { ideaId: this.lawsStand.id, @@ -613,7 +632,10 @@ export default { this.getList() this.getIdeaKey() this.getFileInfo() - } + }, + destroyed() { + document.removeEventListener('visibilitychange', this.isVisible) + }, } diff --git a/src/utils/tool.js b/src/utils/tool.js new file mode 100644 index 000000000..2efd74a93 --- /dev/null +++ b/src/utils/tool.js @@ -0,0 +1,13 @@ +function dispatchEventStroage() { + const signSetItem = localStorage.setItem + localStorage.setItem = function(key, val) { + let setEvent = new Event('setItemEvent') + setEvent.key = key + setEvent.newValue = val + window.dispatchEvent(setEvent) + signSetItem.apply(this, arguments) + } +} + +export default dispatchEventStroage +