From cefcb88c6cd0690052e503d5f1c943cb7f8a03cb Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 30 十一月 2022 09:18:32 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqt
---
src/views/doublePrevent/riskLevel/device/index.vue | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/src/views/doublePrevent/riskLevel/device/index.vue b/src/views/doublePrevent/riskLevel/device/index.vue
index 2bdd69e..048fbf5 100644
--- a/src/views/doublePrevent/riskLevel/device/index.vue
+++ b/src/views/doublePrevent/riskLevel/device/index.vue
@@ -3,13 +3,17 @@
<el-card shadow="hover">
<div class="system-user-search mb15">
<div class="basic-line">
- <span>风险等级：</span>
+ <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>
</el-select>
</div>
<div class="basic-line">
- <span>部门：</span>
+ <span>部门： </span>
<el-cascader :options="departmentList" :props="{ emitPath: false, checkStrictly: true, value: 'depId', label: 'depName' }" placeholder="请选择部门" clearable filterable class="input-box" v-model="productionDeviceData.params.depId"> </el-cascader>
</div>
<el-button size="default" type="primary" class="ml10" v-throttle @click="handleSearch">
@@ -70,7 +74,7 @@
import { ElMessageBox, ElMessage } from 'element-plus';
import productionDeviceDialog from './components/productionDeviceDialog.vue';
import { productionDeviceApi } from '/@/api/doublePreventSystem/productionDevice/index.ts';
-import { departmentApi } from '/@/api/department';
+import { departmentApi } from '/@/api/systemManage/department';
import { Edit, Delete, View } from '@element-plus/icons-vue';
// 定义接口来定义对象的类型
@@ -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