From 3e269ea8cd6ad7bdc1bc33a1d881ca150a107f37 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 19 Nov 2021 14:58:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B1=BB=E5=88=AB=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workSys/resiCate.vue | 80 ++++++++++++++++----------
 1 file changed, 50 insertions(+), 30 deletions(-)

diff --git a/src/views/modules/workSys/resiCate.vue b/src/views/modules/workSys/resiCate.vue
index 4eb670df..ca2b8292 100644
--- a/src/views/modules/workSys/resiCate.vue
+++ b/src/views/modules/workSys/resiCate.vue
@@ -2,35 +2,43 @@
   <div v-if="pageLoading" class="resi-container">
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
-        <el-select
-        v-model="value"
-          placeholder="请选择"
-          size="small"
-          clearable
-        >
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-        <el-select
-        v-model="value"
-          placeholder="请选择"
-          size="small"
-          clearable
-        >
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-        <el-button type="primary" size="mini" @click="handleSearch">查询</el-button>
+        <el-form :inline="true" :model="form" class="demo-form-inline">
+          <el-form-item label="是否预警">
+            <el-select
+              v-model="isWarn"
+              placeholder="请选择"
+              size="small"
+              clearable
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+                </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="预警类型">
+            <el-select
+              v-model="level"
+              placeholder="请选择"
+              size="small"
+              clearable
+            >
+              <el-option
+                v-for="item in optionsType"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+                </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="handleSearch">查询</el-button>
+          </el-form-item>
+        </el-form>
       </div>
       <el-table
         :data="tableData"
@@ -188,13 +196,23 @@ export default {
       total: null,
       conditions: [],
       tableData: [],
-      value: '',
+      isWarn: null,
+      level: null,
       options: [
         {
           label: '是',
           value: 1
         },{
           label: '否',
+          value: 0
+        }
+      ],
+      optionsType: [
+        {
+          label: '黄色预警',
+          value: 1
+        },{
+          label: '红色预警',
           value: 2
         }
       ],
@@ -458,6 +476,8 @@ export default {
       this.tableLoading = true
       let params = {
         // formCode: 'resi_base_info',
+        isWarn: this.isWarn,
+        level: this.level,
         pageNo: this.currentPage,
         pageSize: this.pageSize
       }