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/action/index.vue | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/views/doublePrevent/riskLevel/action/index.vue b/src/views/doublePrevent/riskLevel/action/index.vue
index 79efcfe..0629615 100644
--- a/src/views/doublePrevent/riskLevel/action/index.vue
+++ b/src/views/doublePrevent/riskLevel/action/index.vue
@@ -114,7 +114,7 @@
}
interface classifyOneType {
id: number;
- classifyOneType: string;
+ riskMeasureName: string;
}
interface SafetyRiskEventDataState {}
@@ -232,7 +232,7 @@
// 删除角色
const onDelRiskControlMeasure = (row: any) => {
- ElMessageBox.confirm(`此操作将永久删除该条风险管控措施：“${row.produceDeviceName}”，是否继续?`, '提示', {
+ ElMessageBox.confirm(`此操作将永久删除该条风险管控措施：“${row.checkContent}”，是否继续?`, '提示', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning'
@@ -309,4 +309,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