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/riskCheckUnit/index.vue | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/views/doublePrevent/riskLevel/riskCheckUnit/index.vue b/src/views/doublePrevent/riskLevel/riskCheckUnit/index.vue
index 5957cd3..ad9a72f 100644
--- a/src/views/doublePrevent/riskLevel/riskCheckUnit/index.vue
+++ b/src/views/doublePrevent/riskLevel/riskCheckUnit/index.vue
@@ -12,6 +12,10 @@
<!-- <span>部门：</span>-->
<!-- <el-cascader :options="departmentList" :props="{ emitPath: false, checkStrictly: true, value: 'depId', label: 'depName' }" placeholder="请选择部门" clearable filterable class="input-box" v-model="checkUnitData.params.depId"> </el-cascader>-->
<!-- </div>-->
+ <div class="basic-line">
+ <span>任务单元名称：</span>
+ <el-input class="input-box" v-model="checkUnitData.params.taskUnitName" placeholder="任务单元名称" clearable> </el-input>
+ </div>
<el-button size="default" type="primary" class="ml10" v-throttle @click="handleSearch">
<el-icon>
<ele-Search />
@@ -22,7 +26,7 @@
<el-icon>
<ele-FolderAdd />
</el-icon>
- 新增排查任务
+ 新增排查单元
</el-button>
</div>
<el-table :data="checkUnitData.data" style="width: 100%">
@@ -74,7 +78,7 @@
params: {
pageIndex: number;
pageSize: number;
- taskUnitId: number | null;
+ taskUnitName: number | null;
};
};
}
@@ -112,7 +116,7 @@
// 打开生产装置弹窗
const onOpenDialogRef = (type: string, value: any) => {
- checkUnitDialogRef.value.openCheckUnitDialog(type, value, state.departmentList);
+ checkUnitDialogRef.value.openCheckUnitDialog(type, value);
};
// 删除角色
const onDelCheckUnit = (row: any) => {
@@ -176,4 +180,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