diff --git a/src/views/hiddenDanger/common.component.html b/src/views/hiddenDanger/common.component.html index d4a7ac7..717bd6b 100644 --- a/src/views/hiddenDanger/common.component.html +++ b/src/views/hiddenDanger/common.component.html @@ -42,7 +42,7 @@ @click="showUpdateModel(scope.row,true)">查看 修改 - 删除 diff --git a/src/views/hiddenDanger/manager.component.vue b/src/views/hiddenDanger/manager.component.vue index eb085ac..38f372f 100644 --- a/src/views/hiddenDanger/manager.component.vue +++ b/src/views/hiddenDanger/manager.component.vue @@ -702,7 +702,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent data.taskInfo.startUser || "--" }); this.tableColumn.push({ name: '隐患来源', width: "150", render: (data) => this.$store.getters.prevention_danger_resource_map[data.source] }); this.tableColumn.push({ name: '上报人', width: "100", key: "reportUserName", render: (data) => data.reportUserName || "--" }); - this.tableColumn.push({ name: '上报时间', width: "120", key: "reportTime", render: (data) => data.reportTime || "--" }); + this.tableColumn.push({ name: '上报时间', width: "150", key: "reportTime", render: (data) => data.reportTime || "--" }); this.tableColumn.push({ name: '隐患标题', width: "150", render: (data) => { if (this.params.type === 1) { @@ -714,7 +714,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent this.levelMap[data.level] }); - this.tableColumn.push({ name: '隐患分类', render: (data) => this.$store.getters.prevention_dangrous_type_map[data.dangerType] }); + this.tableColumn.push({ name: '隐患分类', render: (data) => this.$store.getters.prevention_dangrous_type_map[data.classify] }); this.tableColumn.push({ name: '整改方式', render: (data) => this.reformModeMap[data.reformMode] }); this.tableColumn.push({ name: '隐患位置', width: "150", key: "locationName" }); this.tableColumn.push({ name: '治理责任人', width: "100", key: "executeUserName" }); @@ -792,7 +792,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent data) { - this.$message.error("治理时限不能早于创建时间") + this.$message.error("治理时限不能早于上报时间") this.updateParams.executeDeadline = null; return } @@ -807,7 +807,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent data) { - this.$message.error("确认时间不能早于创建时间") + this.$message.error("确认时间不能早于上报时间") this.updateParams.realConfirmTime = null; return } diff --git a/src/views/risk/area/area.component.vue b/src/views/risk/area/area.component.vue index b5c68ad..efd2aa0 100644 --- a/src/views/risk/area/area.component.vue +++ b/src/views/risk/area/area.component.vue @@ -291,7 +291,7 @@ export default class AreaManagerComponent extends BaseRecordComponent { } }); this.tableColumn.push({ - name: '风险等级', key: "riskLevel", width: "150px", render: (data) => { + name: '区域风险等级', key: "riskLevel", width: "150px", render: (data) => { return "" + (data.riskLevel ? (this.$store.getters.prevention_risk_level_map[data.riskLevel]) : '待评估') + "" }, filters: this.$store.state.prevention_risk_level.map(item => { diff --git a/src/views/risk/unit/unit.component.vue b/src/views/risk/unit/unit.component.vue index 9de7736..e0cd908 100644 --- a/src/views/risk/unit/unit.component.vue +++ b/src/views/risk/unit/unit.component.vue @@ -211,6 +211,7 @@ export default class UnitManagerComponent extends BaseRecordComponent { } public doTurnOffAction(data) { + this.turnOffParams.registerTime = moment().format("YYYY-MM-DD HH:mm"); if (data && data.value === "saveStatus") { this.tableService.updateStatus(this.turnOffParams, true).then((res) => { this.$message.success(this.turnOffParams.status ? "启用成功" : "停用成功"); @@ -328,6 +329,10 @@ export default class UnitManagerComponent extends BaseRecordComponent { type: "primary" }]; this.formOptions = [{ + name: "区域名称", + key: "areaName", + type: "text" + },{ name: "单元名称", key: "name", type: "text" @@ -352,6 +357,7 @@ export default class UnitManagerComponent extends BaseRecordComponent { "单元编号": row.number, "责任人": row.chargeUserName, "责任部门": row.chargeDeptName, + "重大危险源名称": row.majorHazardName } }).then((res: any) => { this.showQrCode = true; @@ -366,7 +372,7 @@ export default class UnitManagerComponent extends BaseRecordComponent { this.tableColumn.push({ name: '责任部门', key: "chargeDeptName" }); this.tableColumn.push({ name: '责任人', key: "chargeUserName" }); this.tableColumn.push({ - name: '风险等级', key: "riskLevel", width: "150px", render: (data) => { + name: '单元风险等级', key: "riskLevel", width: "150px", render: (data) => { return "" + (data.riskLevel ? (this.$store.getters.prevention_risk_level_map[data.riskLevel]) : '待评估') + "" }, filters: this.$store.state.prevention_risk_level.map(item => { @@ -405,7 +411,7 @@ export default class UnitManagerComponent extends BaseRecordComponent { public getAreaList() { this.areaService.selectByPage({ pageSize: 1000 }).then((res: any) => { this.areaList = res.data.datas.map(item => { - this.areaNoMap[item.id] = item.number; + this.areaNoMap[item.id] = item; return { name: item.name, value: item.id @@ -452,7 +458,9 @@ export default class UnitManagerComponent extends BaseRecordComponent { } // 新增编辑选择区域 if (item && item.key === "areaId") { - this.updateParams.areaNo = this.areaNoMap[data]; + this.updateParams.areaNo = this.areaNoMap[data].number; + this.updateParams.chargeDeptId = this.areaNoMap[data].chargeDeptId; + this.updateParams.chargeDeptName = this.areaNoMap[data].chargeDeptName; this.getCreateNumber({ areaNo: this.updateParams.areaNo }) } //停用开始时间