guangyin
/
hbt-prevention-ui
forked from xxhjsb/hbt-prevention-ui
1
0
Fork 0
Code Pull Requests Activity

fix：风险问题修复

dev
zhushengzhe 2023-09-20 15:50:33 +08:00
parent fb146e0eac
commit f33a2aa54c
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/hiddenDanger/common.component.html
View File

@ -42,7 +42,7 @@
@click="showUpdateModel(scope.row,true)">查看</el-button> @click="showUpdateModel(scope.row,true)">查看</el-button>
<el-button type="text" v-if="isBase && !(isClap && scope.row.status)" <el-button type="text" v-if="isBase && !(isClap && scope.row.status)"
@click="showUpdateModel(scope.row)">修改</el-button> @click="showUpdateModel(scope.row)">修改</el-button>
<el-button type="text" v-if="isBase && !(isClap && scope.row.status)" <el-button type="text" v-if="(isBase || (isManager && scope.row.status === 0)) && !(isClap && scope.row.status)"
@click="deleteData([scope.row.id])">删除</el-button> @click="deleteData([scope.row.id])">删除</el-button>
<!-- <el-button type="text" v-if="isManager" @click="showUpdateModel(0)">抄送</el-button> <!-- <el-button type="text" v-if="isManager" @click="showUpdateModel(0)">抄送</el-button>
<el-button type="text" v-if="isManager" @click="showUpdateModel(0)">移交</el-button> --> <el-button type="text" v-if="isManager" @click="showUpdateModel(0)">移交</el-button> -->

8
src/views/hiddenDanger/manager.component.vue
View File

@ -702,7 +702,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
this.tableColumn.push({ name: '发起人', width: "100", key: "startUser", render: (data) => data.taskInfo.startUser || "--" }); this.tableColumn.push({ name: '发起人', width: "100", key: "startUser", render: (data) => 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: "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: "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({ this.tableColumn.push({
name: '隐患标题', width: "150", render: (data) => { name: '隐患标题', width: "150", render: (data) => {
if (this.params.type === 1) { if (this.params.type === 1) {
@ -714,7 +714,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
}); });
this.tableColumn.push({ name: '隐患描述', key: "description", width: "300" }); this.tableColumn.push({ name: '隐患描述', key: "description", width: "300" });
this.tableColumn.push({ name: '隐患等级', render: (data) => this.levelMap[data.level] }); this.tableColumn.push({ name: '隐患等级', render: (data) => 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: '整改方式', render: (data) => this.reformModeMap[data.reformMode] });
this.tableColumn.push({ name: '隐患位置', width: "150", key: "locationName" }); this.tableColumn.push({ name: '隐患位置', width: "150", key: "locationName" });
this.tableColumn.push({ name: '治理责任人', width: "100", key: "executeUserName" }); this.tableColumn.push({ name: '治理责任人', width: "100", key: "executeUserName" });
@ -792,7 +792,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
if (item && item.key === "executeDeadline") { if (item && item.key === "executeDeadline") {
const now = this.updateParams.createTime; const now = this.updateParams.createTime;
if (now > data) { if (now > data) {
this.$message.error("治理时限不能早于创建时间") this.$message.error("治理时限不能早于上报时间")
this.updateParams.executeDeadline = null; this.updateParams.executeDeadline = null;
return return
} }
@ -807,7 +807,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
if (item && item.key === "realConfirmTime") { if (item && item.key === "realConfirmTime") {
const now = this.updateParams.createTime; const now = this.updateParams.createTime;
if (now > data) { if (now > data) {
this.$message.error("确认时间不能早于创建时间") this.$message.error("确认时间不能早于上报时间")
this.updateParams.realConfirmTime = null; this.updateParams.realConfirmTime = null;
return return
} }

2
src/views/risk/area/area.component.vue
View File

@ -291,7 +291,7 @@ export default class AreaManagerComponent extends BaseRecordComponent<any> {
} }
}); });
this.tableColumn.push({ this.tableColumn.push({
name: '风险等级', key: "riskLevel", width: "150px", render: (data) => { name: '区域风险等级', key: "riskLevel", width: "150px", render: (data) => {
return "<span class='color_level_" + data.riskLevel + "'>" + (data.riskLevel ? (this.$store.getters.prevention_risk_level_map[data.riskLevel]) : '待评估') + "</span>" return "<span class='color_level_" + data.riskLevel + "'>" + (data.riskLevel ? (this.$store.getters.prevention_risk_level_map[data.riskLevel]) : '待评估') + "</span>"
}, },
filters: this.$store.state.prevention_risk_level.map(item => { filters: this.$store.state.prevention_risk_level.map(item => {

14
src/views/risk/unit/unit.component.vue
View File

@ -211,6 +211,7 @@ export default class UnitManagerComponent extends BaseRecordComponent<any> {
} }
public doTurnOffAction(data) { public doTurnOffAction(data) {
this.turnOffParams.registerTime = moment().format("YYYY-MM-DD HH:mm");
if (data && data.value === "saveStatus") { if (data && data.value === "saveStatus") {
this.tableService.updateStatus(this.turnOffParams, true).then((res) => { this.tableService.updateStatus(this.turnOffParams, true).then((res) => {
this.$message.success(this.turnOffParams.status ? "启用成功" : "停用成功"); this.$message.success(this.turnOffParams.status ? "启用成功" : "停用成功");
@ -328,6 +329,10 @@ export default class UnitManagerComponent extends BaseRecordComponent<any> {
type: "primary" type: "primary"
}]; }];
this.formOptions = [{ this.formOptions = [{
name: "区域名称",
key: "areaName",
type: "text"
},{
name: "单元名称", name: "单元名称",
key: "name", key: "name",
type: "text" type: "text"
@ -352,6 +357,7 @@ export default class UnitManagerComponent extends BaseRecordComponent<any> {
"单元编号": row.number, "单元编号": row.number,
"责任人": row.chargeUserName, "责任人": row.chargeUserName,
"责任部门": row.chargeDeptName, "责任部门": row.chargeDeptName,
"重大危险源名称": row.majorHazardName
} }
}).then((res: any) => { }).then((res: any) => {
this.showQrCode = true; this.showQrCode = true;
@ -366,7 +372,7 @@ export default class UnitManagerComponent extends BaseRecordComponent<any> {
this.tableColumn.push({ name: '责任部门', key: "chargeDeptName" }); this.tableColumn.push({ name: '责任部门', key: "chargeDeptName" });
this.tableColumn.push({ name: '责任人', key: "chargeUserName" }); this.tableColumn.push({ name: '责任人', key: "chargeUserName" });
this.tableColumn.push({ this.tableColumn.push({
name: '风险等级', key: "riskLevel", width: "150px", render: (data) => { name: '单元风险等级', key: "riskLevel", width: "150px", render: (data) => {
return "<span class='color_level_" + data.riskLevel + "'>" + (data.riskLevel ? (this.$store.getters.prevention_risk_level_map[data.riskLevel]) : '待评估') + "</span>" return "<span class='color_level_" + data.riskLevel + "'>" + (data.riskLevel ? (this.$store.getters.prevention_risk_level_map[data.riskLevel]) : '待评估') + "</span>"
}, },
filters: this.$store.state.prevention_risk_level.map(item => { filters: this.$store.state.prevention_risk_level.map(item => {
@ -405,7 +411,7 @@ export default class UnitManagerComponent extends BaseRecordComponent<any> {
public getAreaList() { public getAreaList() {
this.areaService.selectByPage({ pageSize: 1000 }).then((res: any) => { this.areaService.selectByPage({ pageSize: 1000 }).then((res: any) => {
this.areaList = res.data.datas.map(item => { this.areaList = res.data.datas.map(item => {
this.areaNoMap[item.id] = item.number; this.areaNoMap[item.id] = item;
return { return {
name: item.name, name: item.name,
value: item.id value: item.id
@ -452,7 +458,9 @@ export default class UnitManagerComponent extends BaseRecordComponent<any> {
} }
// 新增编辑选择区域 // 新增编辑选择区域
if (item && item.key === "areaId") { 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 }) this.getCreateNumber({ areaNo: this.updateParams.areaNo })
} }
//停用开始时间 //停用开始时间