From 17600f41d7c3f6c28cc5393dbb4d3d7e82eccad6 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 25 八月 2022 09:54:47 +0800
Subject: [PATCH] conflict
---
src/views/doublePrevent/riskLevel/event/index.vue | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/views/doublePrevent/riskLevel/event/index.vue b/src/views/doublePrevent/riskLevel/event/index.vue
index 9f442c0..65cf780 100644
--- a/src/views/doublePrevent/riskLevel/event/index.vue
+++ b/src/views/doublePrevent/riskLevel/event/index.vue
@@ -4,7 +4,7 @@
<div class="system-user-search mb15">
<div class="basic-line">
<span>安全风险单元名称：</span>
- <el-select v-model="safetyRiskEventData.params.riskUnitId" class="input-box" placeholder="安全风险单元名称">
+ <el-select v-model="safetyRiskEventData.params.riskUnitId" class="input-box" placeholder="安全风险单元名称" clearable filterable>
<el-option v-for="item in allSafetyRiskEventData" :key="item.id" :label="item.riskUnitName" :value="item.id"></el-option>
</el-select>
</div>
@@ -27,6 +27,7 @@
<el-table-column type="index" label="序号" width="60" />
<el-table-column prop="riskUnitName" label="安全风险分析单元名称" width="180" show-overflow-tooltip></el-table-column>
<el-table-column prop="riskEventName" label="安全风险事件名称" width="180" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="eventResult" label="可能造成的后果" width="180" show-overflow-tooltip></el-table-column>
<el-table-column prop="createByUserName" label="创建人" show-overflow-tooltip></el-table-column>
<el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip></el-table-column>
<el-table-column prop="lastEditUserName" label="最后修改人" show-overflow-tooltip></el-table-column>
@@ -53,7 +54,7 @@
import { ElMessageBox, ElMessage } from 'element-plus';
import safetyRiskEventDialog from './components/safetyRiskEventDialog.vue';
import { safetyRiskEventApi } from '/@/api/doublePreventSystem/safetyRiskEvent/index.ts';
-import { departmentApi } from '/@/api/department';
+import { departmentApi } from '/@/api/systemManage/department';
import { safetyRiskAnalyseUnitApi } from '/@/api/doublePreventSystem/safetyRiskAnalyseUnit';
import { Edit, Delete, View } from '@element-plus/icons-vue';
@@ -117,7 +118,7 @@
const getAllSafetyRiskEventData = async () => {
let res = await safetyRiskAnalyseUnitApi().getAllSafetyRiskAnalyseUnitList();
if (res.data.code === '200') {
- state.allSafetyRiskEventData = res.data.data;
+ state.allSafetyRiskEventData = JSON.parse(JSON.stringify(res.data.data));
} else {
ElMessage({
type: 'warning',
@@ -197,4 +198,15 @@
};
</script>
-<style scoped></style>
+<style scoped>
+:deep(.el-textarea.is-disabled .el-textarea__inner) {
+ background-color: var(--el-card-bg-color);
+ color: var(--el-input-text-color, var(--el-text-color-regular));
+}
+:deep(.el-input.is-disabled .el-input__inner) {
+ color: var(--el-input-text-color, var(--el-text-color-regular));
+}
+:deep(.el-input.is-disabled .el-input__wrapper) {
+ background-color: var(--el-card-bg-color);
+}
+</style>
--
Gitblit v1.9.2