Merge branch 'dev-shuju' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-shuju

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
+        <el-form :inline="true" :model="form" class="demo-form-inline">
-        v-model="value"
+          <el-form-item label="是否预警">
-          placeholder="请选择"
+            <el-select
-          size="small"
+              v-model="isWarn"
-          clearable
+              placeholder="请选择"
-        >
+              size="small"
-          <el-option
+              clearable
-            v-for="item in options"
+            >
-            :key="item.value"
+              <el-option
-            :label="item.label"
+                v-for="item in options"
-            :value="item.value"
+                :key="item.value"
-          >
+                :label="item.label"
-          </el-option>
+                :value="item.value"
-        </el-select>
+              >
-        <el-select
+                </el-option>
-        v-model="value"
+            </el-select>
-          placeholder="请选择"
+          </el-form-item>
-          size="small"
+          <el-form-item label="预警类型">
-          clearable
+            <el-select
-        >
+              v-model="level"
-          <el-option
+              placeholder="请选择"
-            v-for="item in options"
+              size="small"
-            :key="item.value"
+              clearable
-            :label="item.label"
+            >
-            :value="item.value"
+              <el-option
-          >
+                v-for="item in optionsType"
-          </el-option>
+                :key="item.value"
-        </el-select>
+                :label="item.label"
-        <el-button type="primary" size="mini" @click="handleSearch">查询</el-button>
+                :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
       }