diff --git a/src/views/hidden/rectify/components/change.vue b/src/views/hidden/rectify/components/change.vue index aa45fd9..2c3fe2b 100644 --- a/src/views/hidden/rectify/components/change.vue +++ b/src/views/hidden/rectify/components/change.vue @@ -33,7 +33,7 @@ - + @@ -426,7 +426,7 @@ export default { this.loading = true if (this.DAYNUM >= 1 && this.form.TEMPORARY_SAFE_MEASURE == '') { this.$message({ - message: '临时安全措施不能为空,请先返回上个页面填写临时安全措施!!!', + message: '请先输入临时安全措施!!!', type: 'error' }) this.loading = false diff --git a/src/views/hiddenApi/publicMethod/list.vue b/src/views/hiddenApi/publicMethod/list.vue index 1635f0e..381fed6 100644 --- a/src/views/hiddenApi/publicMethod/list.vue +++ b/src/views/hiddenApi/publicMethod/list.vue @@ -18,7 +18,7 @@ = 1) { - this.$message({ - message: '请填写临时安全措施', - type: 'error' - }) - this.loading = false - return false + if (!this.addSafeMeasureForm.TEMPORARY_SAFE_MEASURE) { + alert(this.dayNum) + if (this.dayNum >= 1) { + this.$message({ + message: '请填写临时安全措施', + type: 'error' + }) + this.loading = false + return false + } else { + this.addSafeMeasureForm.TEMPORARY_SAFE_MEASURE = '' + } } + const loading = this.$loading({ lock: true, text: '加载中......', diff --git a/src/views/safetyenvironmental/archive/components/info.vue b/src/views/safetyenvironmental/archive/components/info.vue index 4ed4426..2c568e4 100644 --- a/src/views/safetyenvironmental/archive/components/info.vue +++ b/src/views/safetyenvironmental/archive/components/info.vue @@ -370,7 +370,7 @@ export default { // 导出表格的数据 goExport() { var dataStr = '?INSPECTION_ID=' + encodeURIComponent(this.$parent.INSPECTION_ID) - window.location.href = config.httpurl + 'safetyenvironmental/exportInfo' + dataStr + window.location.href = config.httpurl + '/safetyenvironmental/exportInfo' + dataStr } } } diff --git a/src/views/safetyenvironmental/inspection/components/list.vue b/src/views/safetyenvironmental/inspection/components/list.vue index fb0e7c7..b52cd2e 100644 --- a/src/views/safetyenvironmental/inspection/components/list.vue +++ b/src/views/safetyenvironmental/inspection/components/list.vue @@ -389,7 +389,7 @@ export default { dataStr += '&INSPECTION_SUBJECT=' + encodeURIComponent(this.search.INSPECTION_SUBJECT) // 检查题目 dataStr += '&INSPECTION_TIME_START=' + encodeURIComponent(this.search.INSPECTION_TIME[0]) // 开始检查时间 dataStr += '&INSPECTION_TIME_END=' + encodeURIComponent(this.search.INSPECTION_TIME[1]) // 结束检查时间 - window.location.href = config.httpurl + 'safetyenvironmental/exportexcel' + dataStr + window.location.href = config.httpurl + '/safetyenvironmental/exportexcel' + dataStr }, // 获取列表 getList() {