From 2475c65a3c091cee4fe48f49e0f53697403750df Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 17 八月 2022 19:55:34 +0800
Subject: [PATCH] 冲突
---
src/views/doublePrevent/riskLevel/event/components/safetyRiskEventDialog.vue | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/src/views/doublePrevent/riskLevel/event/components/safetyRiskEventDialog.vue b/src/views/doublePrevent/riskLevel/event/components/safetyRiskEventDialog.vue
index 80d88b3..48314ea 100644
--- a/src/views/doublePrevent/riskLevel/event/components/safetyRiskEventDialog.vue
+++ b/src/views/doublePrevent/riskLevel/event/components/safetyRiskEventDialog.vue
@@ -5,14 +5,39 @@
<el-row :gutter="35">
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="安全风险分析单元名称" prop="riskUnitId">
- <el-select class="input-length" v-model="safetyRiskEventForm.riskUnitId" placeholder="请输入安全风险分析单元名称">
+ <el-select class="input-add" :disabled="!disabled" v-model="safetyRiskEventForm.riskUnitId" placeholder="请输入安全风险分析单元名称">
<el-option v-for="item in allSafetyRiskEventData" :key="item.id" :label="item.riskUnitName" :value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="安全风险事件名称" prop="riskEventName">
- <el-input class="input-length" v-model.trim="safetyRiskEventForm.riskEventName" placeholder="请输入生产装置名称" clearable></el-input>
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="safetyRiskEventForm.riskEventName" placeholder="请输入请输入安全风险事件名称" clearable></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
+ <el-form-item label="可能造成得后果" prop="eventResult">
+ <el-input class="input-add" type="textarea" :rows="2" :disabled="!disabled" v-model.trim="safetyRiskEventForm.eventResult" placeholder="请输入请输入安全风险事件名称" clearable></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
+ <el-form-item label="创建人" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="safetyRiskEventForm.createByUserName" placeholder="请输入区域位置"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
+ <el-form-item label="创建时间" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="safetyRiskEventForm.gmtCreate" placeholder="请输入区域位置"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
+ <el-form-item label="最后修改人" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="safetyRiskEventForm.lastEditUserName" placeholder="请输入区域位置"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-show="personTime">
+ <el-form-item label="最后修改时间" prop="location">
+ <el-input class="input-add" :disabled="!disabled" v-model.trim="safetyRiskEventForm.gmtModitify" placeholder="请输入区域位置"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -31,8 +56,10 @@
interface stateType {
isSafetyRiskEventDialog: Boolean;
disabled: Boolean;
+ personTime: Boolean;
safetyRiskEventForm: {
riskEventName: string | null;
+ eventResult: string | null;
riskUnitId: number | null;
};
title: string;
@@ -50,16 +77,19 @@
const state = reactive<stateType>({
title: '',
disabled: false,
+ personTime: false,
departmentList: [],
allSafetyRiskEventData: [],
isSafetyRiskEventDialog: false,
safetyRiskEventForm: {
riskEventName: null,
+ eventResult: null,
riskUnitId: null
},
safetyRiskEventFormRules: {
riskEventName: [{ required: true, message: '请填写安全风险分析对象编码', trigger: 'blur' }],
- riskUnitId: [{ required: true, message: '请填写安全风险分析单元名称', trigger: 'blur' }]
+ eventResult: [{ required: true, message: '请填写可能造成的后果', trigger: 'blur' }],
+ riskUnitId: [{ required: true, message: '请选择安全风险分析单元名称', trigger: 'change' }]
}
});
@@ -72,6 +102,7 @@
});
if (type === '新增') {
state.disabled = true;
+ state.personTime = false;
state.title = '新增风险事件';
state.safetyRiskEventForm = {
riskEventName: null,
@@ -79,10 +110,12 @@
};
} else if (type === '查看') {
state.disabled = false;
+ state.personTime = true;
state.title = '查看风险事件';
state.safetyRiskEventForm = JSON.parse(JSON.stringify(value));
} else {
state.disabled = true;
+ state.personTime = false;
state.title = '修改风险事件';
state.safetyRiskEventForm = JSON.parse(JSON.stringify(value));
}
--
Gitblit v1.9.2