From 0e11714f01de9fe1756d6896f67bcd07ff50a148 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 10 八月 2022 18:34:52 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqt
---
src/views/doublePrevent/riskLevel/device/index.vue | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/views/doublePrevent/riskLevel/device/index.vue b/src/views/doublePrevent/riskLevel/device/index.vue
index 2bdd69e..a8208fe 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>
@@ -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;
--
Gitblit v1.9.2