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/device/index.vue | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/views/doublePrevent/riskLevel/device/index.vue b/src/views/doublePrevent/riskLevel/device/index.vue
index 22507af..00ef584 100644
--- a/src/views/doublePrevent/riskLevel/device/index.vue
+++ b/src/views/doublePrevent/riskLevel/device/index.vue
@@ -3,6 +3,10 @@
<el-card shadow="hover">
<div class="system-user-search mb15">
<div class="basic-line">
+ <span>生产装置名称:</span>
+ <el-input v-model="productionDeviceData.params.produceDeviceName" class="input-box"> </el-input>
+ </div>
+ <div class="basic-line">
<span>风险等级：</span>
<el-select v-model="productionDeviceData.params.riskLevel" clearable filterable class="input-box" placeholder="请选择风险等级">
<el-option v-for="item in levelList" :key="item.id" :label="item.name" :value="item.id"></el-option>
@@ -90,9 +94,9 @@
params: {
pageIndex: number;
pageSize: number;
- riskLevel: number | null;
+ riskLevel: number | null | '';
status: number;
- depId: number | null;
+ depId: number | null | '';
location: string | null;
produceDeviceName: string | null;
};
@@ -141,6 +145,8 @@
});
// 初始化表格数据
const initProductionDeviceTableData = async () => {
+ state.productionDeviceData.params.riskLevel = state.productionDeviceData.params.riskLevel === '' ? null : state.productionDeviceData.params.riskLevel;
+ state.productionDeviceData.params.depId = state.productionDeviceData.params.depId === '' ? null : state.productionDeviceData.params.depId;
let res = await productionDeviceApi().getProductionDeviceList(state.productionDeviceData.params);
if (res.data.code === '200') {
state.productionDeviceData.data = res.data.data;
@@ -241,4 +247,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