diff --git a/src/views/hiddenDanger/clap.component.vue b/src/views/hiddenDanger/clap.component.vue index c6b3690..dad184b 100644 --- a/src/views/hiddenDanger/clap.component.vue +++ b/src/views/hiddenDanger/clap.component.vue @@ -558,7 +558,7 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent type: "随手拍", }, res.data) this.updateParams.majorHazard = +this.updateParams.majorHazard - this.updateParams.majorHazardName = !this.updateParams.majorHazard? '不涉及' : this.$store.getters.prevention_risk_source_map[this.updateParams.majorHazard] + this.updateParams.majorHazardName = !this.updateParams.majorHazard ? '不涉及' : this.$store.getters.prevention_risk_source_map[this.updateParams.majorHazard] // 地图定位 this.center = [res.data.locationLng, res.data.locationLat]; diff --git a/src/views/hiddenDanger/common.component.html b/src/views/hiddenDanger/common.component.html index 7c63e1f..9195122 100644 --- a/src/views/hiddenDanger/common.component.html +++ b/src/views/hiddenDanger/common.component.html @@ -18,20 +18,22 @@ - +
{{scope.$index+1}}
@@ -40,8 +42,7 @@ @click="showUpdateModel(scope.row,true)">查看 修改 - 删除 + 删除 reformModeName: this.reformModeMap[row.reformMode], }, row); this.updateParams.majorHazardName = !this.updateParams.majorHazard? '不涉及' : this.$store.getters.prevention_risk_source_map[this.updateParams.majorHazard] - + this.updateParams.majorHazard = +this.updateParams.majorHazard this.getTableCallback() // 获取url if (row.resourceId) { diff --git a/src/views/hiddenDanger/manager.component.vue b/src/views/hiddenDanger/manager.component.vue index 234cec8..8435f24 100644 --- a/src/views/hiddenDanger/manager.component.vue +++ b/src/views/hiddenDanger/manager.component.vue @@ -356,7 +356,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent { if (this.params.type === 1 || this.params.type === 2) { - return `${data.title}` + return `${data.title || '未命名'}` } else { return data.title } @@ -911,7 +911,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent { this.updateParams.number = res.data @@ -935,7 +935,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent { width: "calc(50% - 20px)", require: true, showError: false, + pickerOptions: { + disabledDate(time: any) { + return time.getTime() < moment().subtract(1, 'day').valueOf(); + } + } }, { name: "隐患类别", key: "dangerType", @@ -467,6 +472,14 @@ export default class RulesManagerComponent extends BaseRecordComponent { if (item && item.key === "verifyUserId") { this.updateParams.verifyUserName = this.$store.getters.user_map[data] } + if (item && item.key === "reformDeadline") { + const now = moment().format("YYYY-MM-DD HH"); + if (now > data) { + this.$message.error("整改时限不能早于当前时间") + this.updateParams.reformDeadline = null; + return + } + } }