From e8692ebf024715c922ca0e10f90dc3a1219862b0 Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期三, 07 四月 2021 22:00:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/components/panel/topicSearch/EnvRiskSearch.vue |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/panel/topicSearch/EnvRiskSearch.vue b/src/components/panel/topicSearch/EnvRiskSearch.vue
index 1df0f11..8c214dc 100644
--- a/src/components/panel/topicSearch/EnvRiskSearch.vue
+++ b/src/components/panel/topicSearch/EnvRiskSearch.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="sewers-search" v-if="gdVisible">
-    <div class="search-title">{{title}}</div>
+    <div class="panel-title">{{title}}</div>
     <div class="search-panel ">
       <el-form ref="form" :model="form" label-width="90px" class="search-form">
         <el-form-item label="鍖哄煙锛�" size="mini" class="search-panel-item">
@@ -13,7 +13,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="浼佷笟鍚嶇О" size="mini">
+        <el-form-item label="浼佷笟鍚嶇О锛�" size="mini">
           <el-select style="width: 100%"  v-model="form.enterpriseVal"  @change="enterpriseType" :popper-class="'select-down'">
             <el-option
                 v-for="item in enterpriseTypeOptions"
@@ -23,7 +23,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="浜岀骇鍗曚綅" size="mini">
+        <el-form-item label="浜岀骇鍗曚綅锛�" size="mini">
           <el-select style="width: 100%"  v-model="form.enterpriseSubunitsVal"  @change="enterpriseSubunitsType" :popper-class="'select-down'">
             <el-option
                 v-for="item in enterpriseSubunitsTypeOptions"
@@ -33,14 +33,14 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="椋庨櫓绾у埆" size="mini"></el-form-item>
+        <el-form-item label="椋庨櫓绾у埆锛�" size="mini"></el-form-item>
         <el-radio-group v-model="form.type" class="levelOfRisk">
           <el-radio  v-for="(item,index) in levelOfRisk" :label="item.value" :key="index"><span class="levelOfRisk-type">{{item.name}}<i :style="'background:'+item.color"></i></span></el-radio>
         </el-radio-group>
         <div class="rightButtonSearch">
           <el-input  v-model="form.keyword" size="mini"  placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�">
           </el-input>
-          <el-buttom class="el-icon-search" @click="handleSearch"></el-buttom>
+          <el-button class="el-icon-search" @click="handleSearch"></el-button>
         </div>
       </el-form>
     </div>
@@ -82,7 +82,7 @@
 import WfsHelper from '@components/helpers/WfsHelper'
 import AjaxUtils from '@utils/AjaxUtils'
 export default {
-  name: 'SewersSearch',
+  name: 'EnvRiskSearch',
   data () {
     return {
       gdVisible: true,
@@ -107,7 +107,8 @@
         { name: '涓�绾ч闄�', value: '2', color: 'sandybrown' },
         { name: '浜岀骇椋庨櫓', value: '3', color: 'yellow' },
         { name: '涓夌骇椋庨櫓', value: '4', color: 'green' }
-      ]
+      ],
+      areaTypeOptions: []
     }
   },
   props: ['title'],

--
Gitblit v1.8.0