From b6c363cdc1ea55dbfc1dfdb6a7c27c8fc51fa0e2 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期五, 02 四月 2021 16:13:38 +0800
Subject: [PATCH] 右侧搜索栏统一修改标题。

---
 src/components/panel/RightSearchPanel.vue                  |   64 ++++---
 src/components/panel/topicSearch/EnvRiskSearch.vue         |   56 ------
 src/components/panel/topicSearch/WaterWasteSearch.vue      |    9 
 src/conf/Topic.js                                          |   14 
 src/components/panel/topicSearch/GasWasteSearch.vue        |    4 
 src/components/panel/topicSearch/SewersSearch.vue          |    4 
 src/components/panel/topicSearch/DischargeSearch.vue       |   16 -
 src/components/LayerController/modules/LcServiceLayer.vue  |   17 +-
 src/components/panel/topicSearch/SoilGroundWaterSearch.vue |  264 +++++++++++++++++++++------------
 src/components/panel/topicSearch/SolidWasteSearch.vue      |    7 
 10 files changed, 227 insertions(+), 228 deletions(-)

diff --git a/src/components/LayerController/modules/LcServiceLayer.vue b/src/components/LayerController/modules/LcServiceLayer.vue
index 81b4278..6f43745 100644
--- a/src/components/LayerController/modules/LcServiceLayer.vue
+++ b/src/components/LayerController/modules/LcServiceLayer.vue
@@ -6,15 +6,16 @@
         <div class="wms-panel">
             <el-scrollbar class="wms-panel-scrollbar">
                 <div v-for="item in serviceLayers" :key="item.code" class="layerbox">
-                    <div><input type="checkbox" :name="'wmsLayer_'+item.code" :checked="item.checked" :value="item.code"
-                                @change="swAllLayers(item)"/>{{ item.name }}
+                    <div>
+                        <input type="checkbox" :name="'wmsLayer_'+item.code" :checked="item.checked" :value="item.code"  @change="swAllLayers(item)"/>{{ item.name }}
                     </div>
                     <div class="layerbox-item">
-                        <div class="basemap-layer-item" v-for="itm in item.layers" :key="itm.code"><input type="checkbox"
-                                                                                                          :name="'wmsSublayers_'+item.code+'_'+itm.code"
-                                                                                                          :checked="itm.checked"
-                                                                                                          :value="itm.code"
-                                                                                                          @change="swWmsLayer(itm)"/>{{ itm.name }}
+                        <div class="basemap-layer-item" v-for="itm in item.layers" :key="itm.code">
+                            <input type="checkbox"
+                                   :name="'wmsSublayers_'+item.code+'_'+itm.code"
+                                   :checked="itm.checked"
+                                   :value="itm.code"
+                                   @change="swWmsLayer(itm)"/>{{ itm.name }}
                         </div>
                     </div>
                 </div>
@@ -110,7 +111,6 @@
             cursor: pointer;
             color: #ffffff;
         }
-
         .wms-panel {
             width:  1.79167rem;
             .wms-panel-scrollbar{
@@ -119,7 +119,6 @@
             }
             .layerbox {
                 width: 100%;
-
                 .layerbox-item {
                     display: flex;
                     flex-flow: row wrap;
diff --git a/src/components/panel/RightSearchPanel.vue b/src/components/panel/RightSearchPanel.vue
index f9abbfb..dacfcbe 100644
--- a/src/components/panel/RightSearchPanel.vue
+++ b/src/components/panel/RightSearchPanel.vue
@@ -97,6 +97,7 @@
     },
     selected (val) {
       // console.log(val)
+      this.title = val.name + '锛堟绱級'
       this.topicList.forEach((itm) => {
         itm.checked = val.name === itm.name
       })
@@ -185,8 +186,8 @@
     position: relative;
     width: 1.79167rem;
     /*height: 5.6475rem;*/
-    min-height: 60vh;
-    max-height: 80vh;
+    min-height: 80vh;
+    max-height: 90vh;
     overflow: hidden;
 }
 .module-wrap{
@@ -680,38 +681,39 @@
     transform: translateX(0px);
     transition: transform 0.5s linear;
   }
-}
-/******************浠ヤ笅鍏叡閮ㄥ垎**********/
-.sewers-search{
-    position: relative;
-    overflow: hidden;
-    .search-panel{
-        background-color: transparent;
-        border: 1px solid @background-color-split;
-        padding: 10px;
-        // .el-input{width:calc(100% - 40px);position: relative}
-        /deep/ input {
-            border-radius: 0;
-            background-color: @background-color-split ;
-            border: solid 1px @color ;
-            color: @color-gray;
-            font-size: 0.01rem;
-            padding:0 15px;
-            .el-select .el-input.is-focus .el-input__inner{
-                border-color: @color;
+    /******************浠ヤ笅鍏叡閮ㄥ垎**********/
+    .sewers-search{
+        position: relative;
+        overflow: hidden;
+        .search-panel{
+            background-color: transparent;
+            border: 1px solid @background-color-split;
+            padding: 10px 0;
+            // .el-input{width:calc(100% - 40px);position: relative}
+            /deep/ input {
+                border-radius: 0;
+                background-color: @background-color-split ;
+                border: solid 1px @color ;
+                color: @color-gray;
+                font-size: 0.01rem;
+                padding:0 15px;
+                .el-select .el-input.is-focus .el-input__inner{
+                    border-color: @color;
+                }
             }
+            .el-input__inner{background: none;color:#fff;font-size: 14px;border-radius: 0; border-color: @color;background: rgba(0,16,30,.5);}
         }
-        .el-input__inner{background: none;color:#fff;font-size: 14px;border-radius: 0; border-color: @color;background: rgba(0,16,30,.5);}
-    }
-    .search-btn{
+        .search-btn{
 
-    }
-    //location-btn{
-    //
-    //}
-    .location-btn:hover,.el-input__icon:hover{
-        color: @color;
-        cursor: pointer;
+        }
+        //location-btn{
+        //
+        //}
+        .location-btn:hover,.el-input__icon:hover{
+            color: @color;
+            cursor: pointer;
+        }
     }
 }
+
 </style>
diff --git a/src/components/panel/topicSearch/DischargeSearch.vue b/src/components/panel/topicSearch/DischargeSearch.vue
index 7c5a92c..8993cb9 100644
--- a/src/components/panel/topicSearch/DischargeSearch.vue
+++ b/src/components/panel/topicSearch/DischargeSearch.vue
@@ -1,8 +1,6 @@
 <template>
   <div class="sewers-search" v-if="gdVisible">
-    <div class="search-title">
-      姹℃煋婧�
-    </div>
+    <div class="search-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">
@@ -41,19 +39,9 @@
         </el-radio-group> -->
         <!--              <el-form-item >-->
         <div class="rightButtonSearch">
-          <el-input  v-model="form.keyword" size="mini"  placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�">
-            <!-- <el-button slot="append" icon="el-icon-search" size="mini"></el-button>-->
-            <!-- <i slot="prefix" class="el-input__icon el-icon-search"></i>-->
-            <!-- <i slot="suffix" class="search-btn el-input__icon el-icon-search" @click="handleSearch"></i> -->
-          </el-input>
+          <el-input  v-model="form.keyword" size="mini"  placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
           <el-buttom class="el-icon-search" @click="handleSearch"></el-buttom>
         </div>
-
-        <!--              </el-form-item>-->
-        <!--              <el-form-item>-->
-        <!--                <input type="button" class="btn-ok" @click="handleSearch" value="鏌ヨ">-->
-        <!--                <input type="button" class="btn-reset" @click="handleSearch" value="閲嶇疆">-->
-        <!--              </el-form-item>-->
       </el-form>
     </div>
     <el-scrollbar style="height:300px">
diff --git a/src/components/panel/topicSearch/EnvRiskSearch.vue b/src/components/panel/topicSearch/EnvRiskSearch.vue
index b86c2c4..ffb2dc0 100644
--- a/src/components/panel/topicSearch/EnvRiskSearch.vue
+++ b/src/components/panel/topicSearch/EnvRiskSearch.vue
@@ -1,8 +1,6 @@
 <template>
   <div class="sewers-search" v-if="gdVisible">
-    <div class="search-title">
-      鐜椋庨櫓
-    </div>
+    <div class="search-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">
@@ -39,70 +37,20 @@
         <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>
-        <!--              <el-form-item >-->
         <div class="rightButtonSearch">
           <el-input  v-model="form.keyword" size="mini"  placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�">
-            <!-- <el-button slot="append" icon="el-icon-search" size="mini"></el-button>-->
-            <!-- <i slot="prefix" class="el-input__icon el-icon-search"></i>-->
-            <!-- <i slot="suffix" class="search-btn el-input__icon el-icon-search" @click="handleSearch"></i> -->
           </el-input>
           <el-buttom class="el-icon-search" @click="handleSearch"></el-buttom>
         </div>
-
-        <!--              </el-form-item>-->
-        <!--              <el-form-item>-->
-        <!--                <input type="button" class="btn-ok" @click="handleSearch" value="鏌ヨ">-->
-        <!--                <input type="button" class="btn-reset" @click="handleSearch" value="閲嶇疆">-->
-        <!--              </el-form-item>-->
       </el-form>
     </div>
     <el-scrollbar style="height:300px">
-      <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
+      <div class="environmental-risk-list" v-for="(item,index) in 5" :key="index" ><!-- v-for="(item,index) in list" :key="index" -->
         <i class="state"></i>
         <div>
             <h3>###鐐煎寲閮�</h3>
             <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
             <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
-        </div>
-      </div>
-      <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
-        <i class="state"></i>
-        <div>
-          <h3>###鐐煎寲閮�</h3>
-          <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
-          <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
-        </div>
-      </div>
-      <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
-        <i class="state"></i>
-        <div>
-          <h3>###鐐煎寲閮�</h3>
-          <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
-          <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
-        </div>
-      </div>
-      <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
-        <i class="state"></i>
-        <div>
-          <h3>###鐐煎寲閮�</h3>
-          <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
-          <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
-        </div>
-      </div>
-      <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
-        <i class="state"></i>
-        <div>
-          <h3>###鐐煎寲閮�</h3>
-          <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
-          <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
-        </div>
-      </div>
-      <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
-        <i class="state"></i>
-        <div>
-          <h3>###鐐煎寲閮�</h3>
-          <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
-          <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
         </div>
       </div>
     </el-scrollbar>
diff --git a/src/components/panel/topicSearch/GasWasteSearch.vue b/src/components/panel/topicSearch/GasWasteSearch.vue
index 12482b5..9cffa38 100644
--- a/src/components/panel/topicSearch/GasWasteSearch.vue
+++ b/src/components/panel/topicSearch/GasWasteSearch.vue
@@ -1,8 +1,6 @@
 <template>
   <div class="sewers-search" v-if="gdVisible">
-    <div class="search-title">
-      搴熸皵
-    </div>
+    <div class="search-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">
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index 35cbab1..f63efb1 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -1,8 +1,6 @@
 <template>
         <div class="sewers-search" v-if="gdVisible">
-          <div class="search-title">
-            姹¢洦姘�
-          </div>
+          <div class="search-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">
diff --git a/src/components/panel/topicSearch/SoilGroundWaterSearch.vue b/src/components/panel/topicSearch/SoilGroundWaterSearch.vue
index 92b1fc9..5091b91 100644
--- a/src/components/panel/topicSearch/SoilGroundWaterSearch.vue
+++ b/src/components/panel/topicSearch/SoilGroundWaterSearch.vue
@@ -1,88 +1,110 @@
 <template>
-    <div class="sewers-search">
-        <div class="search-title">
-            鍦熷¥鍙婂湴涓嬫按
-        </div>
-        <el-card class="search-panel">
+    <div class="sewers-search" v-if="gdVisible">
+        <div class="search-title">{{title}}</div>
+        <div class="search-panel ">
             <el-form ref="form" :model="form" label-width="90px" class="search-form">
-                <el-form-item label="绫诲瀷锛�">
-                    <el-select v-model="form.pipelineType" @change="handlePipelineType">
+                <el-form-item label="鍖哄煙锛�" size="mini" class="search-panel-item">
+                    <el-select style="width: 100%"  v-model="form.areaVal" @change="areaType"  :popper-class="'select-down'">
                         <el-option
-                                v-for="item in pipelineTypeOptions"
+                                v-for="item in areaTypeOptions"
                                 :key="item.value"
                                 :label="item.label"
                                 :value="item.value">
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="鏁版嵁绫诲瀷锛�">
-                    <el-select v-model="form.dataType">
-                        <el-option
-                                v-for="item in dataTypeOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                        </el-option>
-                    </el-select>
+                <!--  <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"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                  </el-select>
                 </el-form-item>
-                <el-form-item label="妯$硦鎼滅储锛�">
-                    <el-input v-model="form.key" size="mini"
-                              placeholder="鍦ㄦ杈撳叆鍏抽敭瀛�"></el-input>
-                </el-form-item>
-                <el-form-item>
-                    <input type="button" class="btn-ok" @click="handleSearch" value="鏌ヨ">
-                    <input type="button" class="btn-reset" @click="handleSearch" value="閲嶇疆">
-                </el-form-item>
+                <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"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                  </el-select>
+                </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> -->
+                <!--              <el-form-item >-->
+                <div class="rightButtonSearch">
+                    <el-input  v-model="form.keyword" size="mini"  placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�">
+                        <!-- <el-button slot="append" icon="el-icon-search" size="mini"></el-button>-->
+                        <!-- <i slot="prefix" class="el-input__icon el-icon-search"></i>-->
+                        <!-- <i slot="suffix" class="search-btn el-input__icon el-icon-search" @click="handleSearch"></i> -->
+                    </el-input>
+                    <el-buttom class="el-icon-search" @click="handleSearch"></el-buttom>
+                </div>
+
+                <!--              </el-form-item>-->
+                <!--              <el-form-item>-->
+                <!--                <input type="button" class="btn-ok" @click="handleSearch" value="鏌ヨ">-->
+                <!--                <input type="button" class="btn-reset" @click="handleSearch" value="閲嶇疆">-->
+                <!--              </el-form-item>-->
             </el-form>
-        </el-card>
-        <el-card class="search-result" style="height:271px;">
-            <div class="B-TMD-table-list" v-for="(item,index) in list" :key="index">
-                <div class="B-TMD-table-list-title">
-                    <div class="B-TMD-table-list-head">
-                        <div class="B-TMD-table-list-title-y"
-                             :class="['B-TMD-table-list-title-y-nam', { 'warning': item.vehicleStatus==='910003' }, { 'offline': item.vehicleStatus==='910001' }]">
-                            <span>杩愬崟鍙凤細</span>
-                            <span id="waybillNumber" class="B-TMD-table-list-title-y-num"
-                                  :title="item.transNo">
-                                                <span class="B-TMD-table-list-title-y-alarm">{{ item.transNo }}</span>
-                                            </span>
-                        </div>
-                        <div class="B-TMD-table-list-title-c">
-                            杞藉叿鍙凤細
-                            <span id="plateNumber_p">
-                                                <span id="plateNumber_n"><a href="#">{{ item.vehicleNo }}</a></span>
-                                            </span>
-                        </div>
-                    </div>
-                    <div class="B-TMD-table-icons" style="float:right">
-                        <ul>
-                            <li class="B-TMD-table-list-title-y-adress"
-                                @click="handleLocation(item)"></li>
-                            <li :class="[{'B-TMD-table-list-title-y-car': item.vehicleStatus ==='910002', 'B-TMD-table-list-title-y-car-offline': item.vehicleStatus ==='910001','B-TMD-table-list-title-y-car-warning': item.vehicleStatus==='910003' }]"></li>
-                        </ul>
-                    </div>
-                </div>
-                <div class="B-TMD-table-list-content">
-                    <div>
-                        <span>鍙戣揣浼佷笟锛�</span>
-                        <span id="b_twe_consignment" :title="item.outWarehouseName">{{
-                item.outWarehouseName == null ? "鏆傛棤" : item.outWarehouseName
-              }}</span>
-                    </div>
-                    <div>
-                        <span>鎵�&nbsp;&nbsp;杩�&nbsp;&nbsp;鍟嗭細</span>
-                        <span id="b_twe_loan" :title="item.carrierName">{{ item.carrierName }}</span>
-                    </div>
-                    <div><span>鏀惰揣浼佷笟锛�</span> <span
-                            id="b_twe_loan1" :title="item.recvWarehouseName">{{ item.recvWarehouseName }}</span></div>
-                </div>
-                <div class="B-TMD-table-list-bottom">
-                    <div class="B-TMD-table-list-bottom-name">
-                        璐х墿鍚嶇О锛�<span :title="item.materialName">{{ item.materialName }}</span></div>
+        </div>
+        <el-scrollbar style="height:300px">
+            <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
+                <i class="state"></i>
+                <div>
+                    <h3>###鐐煎寲閮�</h3>
+                    <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+                    <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
                 </div>
             </div>
-        </el-card>
-
+            <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
+                <i class="state"></i>
+                <div>
+                    <h3>###鐐煎寲閮�</h3>
+                    <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+                    <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+                </div>
+            </div>
+            <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
+                <i class="state"></i>
+                <div>
+                    <h3>###鐐煎寲閮�</h3>
+                    <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+                    <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+                </div>
+            </div>
+            <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
+                <i class="state"></i>
+                <div>
+                    <h3>###鐐煎寲閮�</h3>
+                    <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+                    <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+                </div>
+            </div>
+            <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
+                <i class="state"></i>
+                <div>
+                    <h3>###鐐煎寲閮�</h3>
+                    <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+                    <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+                </div>
+            </div>
+            <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
+                <i class="state"></i>
+                <div>
+                    <h3>###鐐煎寲閮�</h3>
+                    <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+                    <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+                </div>
+            </div>
+        </el-scrollbar>
+        <!--   <span class="location-btn" @click="handleLocation(item)">588</span> -->
         <el-card class="footer-page" v-if="total > 10">
             <el-pagination
                     small
@@ -96,46 +118,96 @@
             </el-pagination>
         </el-card>
     </div>
+    <!--        <div class="monitor2" v-if="hbVisible">-->
+    <!--          <env-protect-search></env-protect-search>-->
+    <!--        </div>-->
+    <!--        <div class="monitor2" v-if="pkVisible">-->
+    <!--          <discharge-search></discharge-search>-->
+    <!--        </div>-->
 </template>
 
 <script>
+import { PipelineTypeOptions } from '@/conf/layers/LayerSewers'
+
+import WfsHelper from '@components/helpers/WfsHelper'
+import AjaxUtils from '@utils/AjaxUtils'
 export default {
-  name: 'MonitorAreaTips',
-  components: {},
+  name: 'SewersSearch',
   data () {
     return {
-      isPanelVisible: false,
-      total: 0,
+      gdVisible: true,
       list: [],
+      labelList: PipelineTypeOptions[0].labelList,
+      total: 0,
+      inareaTypeOptions: [],
+      enterpriseTypeOptions: [],
+      enterpriseSubunitsTypeOptions: [],
       form: {
-        name: '',
-        region: '',
-        date1: '',
-        date2: '',
-        delivery: false,
-        type: [],
-        resource: '',
-        desc: ''
-      }
+        areaVal: '',
+        enterpriseVal: '',
+        enterpriseSubunitsVal: '',
+        type: ''
+      },
+      // pageSize: 10,
+      // current: 1,
+      isWaybillHover: true,
+      isRouteHover: false,
+      levelOfRisk: [
+        { name: '閲嶅ぇ椋庨櫓', value: '1', color: 'red' },
+        { name: '涓�绾ч闄�', value: '2', color: 'sandybrown' },
+        { name: '浜岀骇椋庨櫓', value: '3', color: 'yellow' },
+        { name: '涓夌骇椋庨櫓', value: '4', color: 'green' }
+      ]
     }
   },
+  props: ['title'],
   methods: {
-    handleClose (done) {
-      console.log(done)
-    },
-    handleClick (tab, event) {
-      console.log(tab, event)
-    },
-    handleSearch () {
+    // 鍖哄煙绛涢��
+    areaType (val) {
+      this.pipelineTypeOptions.forEach((itm) => {
+        if (val === itm.value) {
 
+        }
+      })
+    },
+    // 浼佷笟绛涢��
+    enterpriseType (val) {
+      this.dataTypeOptions.forEach((itm) => {
+        if (val === itm.value) {
+
+        }
+      })
+    },
+    // 浜岀骇鍗曚綅绛涢��
+    enterpriseSubunitsType (val) {
+
+    },
+    async handleSearch () {
+      const param = {
+        pipelineType: this.form.pipelineType,
+        dataType: this.form.dataType
+      }
+      console.log(param)
+      var wfsHelper = new WfsHelper()
+      wfsHelper.addTypeName(this.form.query.layerName)
+      wfsHelper.addLike(this.form.query.key, this.form.keyword)
+      // const _this = this
+      const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
+      if (res.data instanceof Object && Object.prototype.hasOwnProperty.call(res.data, 'features')) {
+        this.list = res.data.features
+      }
+    },
+    handleLocation (val) {
+      console.log(val)
+      const bound = this.L.geoJSON([val], {}).getBounds()
+      var layer = window.serviceLayerHelper.getByLayerId(val.id)
+      layer && layer.openPopup()
+      this.$store.state.map.map.flyToBounds(bound)
     }
-  },
-  mounted () {
-    this.handleSearch()
   }
 }
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
 
 </style>
diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index 0e5555d..fabcccc 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -1,9 +1,6 @@
 <template>
-  <div class="solidwaste-search" v-if="judgeVisible">
-    <div class="search-title">
-      <span>鍥哄簾</span>
-      <!--      <span>{{ title }}</span>-->
-    </div>
+  <div class="sewers-search" v-if="judgeVisible">
+    <div class="search-title">{{title}}</div>
     <div class="search-panel ">
       <el-form ref="form" :model="form" label-width="90px" class="search-form">
         <el-form-item v-for="(item,index) in solidWasteTypeOptions" :key="index" :label="item.label+'锛�'" size="mini"
diff --git a/src/components/panel/topicSearch/WaterWasteSearch.vue b/src/components/panel/topicSearch/WaterWasteSearch.vue
index 39bd33c..59f9330 100644
--- a/src/components/panel/topicSearch/WaterWasteSearch.vue
+++ b/src/components/panel/topicSearch/WaterWasteSearch.vue
@@ -1,9 +1,6 @@
 <template>
-    <div class="solidwaste-search" v-if="judgeVisible">
-        <div class="search-title">
-            <span>搴熸按</span>
-            <!--      <span>{{ title }}</span>-->
-        </div>
+    <div class="sewers-search" v-if="judgeVisible">
+        <div class="search-title">{{title}}</div>
         <div class="search-panel ">
             <el-form ref="form" :model="form" label-width="90px" class="search-form">
                 <el-form-item v-for="(item,index) in solidWasteTypeOptions" :key="index" :label="item.label+'锛�'" size="mini"
@@ -19,7 +16,7 @@
                     </el-select>
                 </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  v-for="(item,index) in levelOfRisk" :label="item.value" :key="index"><span class="levelOfRisk-type">{{item.name}}</span></el-radio>
                 </el-radio-group>
                 <div class="rightButtonSearch">
                     <el-input  v-model="form.keyword" size="mini"  placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
diff --git a/src/conf/Topic.js b/src/conf/Topic.js
index cf856cf..49707dd 100644
--- a/src/conf/Topic.js
+++ b/src/conf/Topic.js
@@ -16,41 +16,41 @@
   id: 1,
   check: false,
   icon: '/assets/images/menu/special.png',
-  comp: 'dischargeSearch'
+  comp: ''
 }, {
   name: '搴熸按鐩戞祴',
   id: 2,
   checked: false,
   icon: '/assets/images/menu/special.png',
-  comp: 'envProtectSearch'
+  comp: ''
 }, {
   name: '搴熸皵鐩戞祴',
   id: 3,
   checked: false,
   icon: '/assets/images/menu/special.png',
-  comp: 'dischargeSearch'
+  comp: ''
 }, {
   name: '鍥哄簾绠$悊',
   id: 4,
   checked: false,
   icon: '/assets/images/menu/special.png',
-  comp: 'envProtectSearch'
+  comp: ''
 }, {
   name: '鐜椋庨櫓',
   id: 5,
   checked: false,
   icon: '/assets/images/menu/special.png',
-  comp: 'envProtectSearch'
+  comp: ''
 }, {
   name: '鍦熷¥鍙婂湴涓嬫按',
   id: 6,
   checked: false,
   icon: '/assets/images/menu/special.png',
-  comp: 'soilGroundWaterSearch'
+  comp: ''
 }, {
   name: '姹¢洦姘寸缃�',
   id: 7,
   checked: false,
   icon: '/assets/images/menu/special.png',
-  comp: 'envProtectSearch'
+  comp: ''
 }]

--
Gitblit v1.8.0