From d5888d8fabfd9b5033e8b1d57f3cb6d5e9de86fb Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 01 四月 2021 17:50:43 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/components/panel/RightSearchPanel.vue                         |    2 
 src/components/panel/topicSearch/GasWasteSearch.vue               |  244 ++++++++++++++++
 src/api/mapApi.js                                                 |    4 
 src/api/mapUrl.js                                                 |    1 
 src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue |    2 
 src/components/panel/topicSearch/SolidWasteSearch.vue             |  253 ++++++++++------
 src/conf/layers/LayerSolidWaste.js                                |  341 ----------------------
 7 files changed, 404 insertions(+), 443 deletions(-)

diff --git a/src/api/mapApi.js b/src/api/mapApi.js
index cf79e51..e43f988 100644
--- a/src/api/mapApi.js
+++ b/src/api/mapApi.js
@@ -24,6 +24,10 @@
   getSolidWasteDetail (data) {
     return axios.get(mapUrl.getSolidWasteDetail, data)
   },
+  // 鍥哄簾 鏁版嵁鎼滅储 鏆傛椂
+  getSolidWasteSurveyDetail (data) {
+    return axios.get(mapUrl.getSolidWasteSurveyDetail, data)
+  },
   getWasteGas (data) {
     return axios.get(mapUrl.getWasteGas, data)
   },
diff --git a/src/api/mapUrl.js b/src/api/mapUrl.js
index 4bd6f56..03933ac 100644
--- a/src/api/mapUrl.js
+++ b/src/api/mapUrl.js
@@ -8,6 +8,7 @@
 export const getSolidWaste = $HOST + '/wasteSolid/getSolidWaste'
 export const getSolidWasteBaseInfo = $HOST + '/wasteSolid/getSolidWasteBaseInfo'
 export const getSolidWasteDetail = $HOST + '/wasteSolid/getSolidWasteDetail'
+export const getSolidWasteSurveyDetail = $HOST + '/wasteSolid/getSolidWasteSurveyDetail'
 
 export const getWasteGas = $HOST + '/wasteGas/getWasteGas'
 
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
index b47fc3a..b8ea76b 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
@@ -11,7 +11,7 @@
         <div v-if="value === 'feiqi'">
           <el-row type="flex" class="row-bg row-item-one" justify="space-around">
             <el-col :span="8">鐩戞祴鐐瑰悕绉�:{{ setWasteGasdata.Name }}</el-col>
-            <el-col :span="8">鐢熶骇鍗曚綅:{{ setWasteGasdata.DeptSname }}</el-col>
+            <el-col :span="8">鐢熶骇鍗曚綅:{{ setWasteGasdata.porltName }}</el-col>
             <el-col :span="8">鎺掓斁绫诲瀷鍚嶇О:{{ setWasteGasdata.MonTypeName }}</el-col>
           </el-row>
           <el-row type="flex" class="row-bg" justify="space-around">
diff --git a/src/components/panel/RightSearchPanel.vue b/src/components/panel/RightSearchPanel.vue
index cbce13b..f3c049f 100644
--- a/src/components/panel/RightSearchPanel.vue
+++ b/src/components/panel/RightSearchPanel.vue
@@ -96,7 +96,7 @@
       console.log(done)
     },
     selected (val) {
-      console.log(val)
+      // console.log(val)
       this.topicList.forEach((itm) => {
         itm.checked = val.name === itm.name
       })
diff --git a/src/components/panel/topicSearch/GasWasteSearch.vue b/src/components/panel/topicSearch/GasWasteSearch.vue
index e69de29..245b226 100644
--- a/src/components/panel/topicSearch/GasWasteSearch.vue
+++ b/src/components/panel/topicSearch/GasWasteSearch.vue
@@ -0,0 +1,244 @@
+<template>
+  <div class="solidwaste-search" v-if="judgeVisible">
+    <div class="search-title">
+      <span>搴熸皵</span>
+      <!--      <span>{{ title }}</span>-->
+    </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"
+                      class="search-panel-item">
+          <el-select style="width: 100%" v-model="form.pipelineType" @change="handlePipelineType"
+                     :popper-class="'select-down'">
+            <el-option
+                v-for="item in solidWasteTypeOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�">
+          <i slot="suffix" class="search-btn el-input__icon el-icon-search" @click="handleSearch"></i>
+        </el-input>
+        <div class="search-radio">
+          <el-radio v-model="radio" label="1">鍏ㄩ儴</el-radio>
+          <el-radio v-model="radio" label="2">姝e父</el-radio>
+          <el-radio v-model="radio" label="3">瓒呮爣</el-radio>
+          <el-radio v-model="radio" label="4">寮傚父</el-radio>
+          <el-radio v-model="radio" label="5">鍋滀骇</el-radio>
+        </div>
+      </el-form>
+      <div>
+        <el-card class="box-card" v-for="(item,index) in searchDataDisplay" :key="index">
+          <div v-if="total > 3">
+            {{ item.CompanyName }}
+          </div>
+        </el-card>
+<!--        <el-pagination-->
+<!--            small-->
+<!--            layout="prev, pager, next"-->
+<!--            :total=total-->
+<!--            :current-page=1-->
+<!--            class="warnPagination"-->
+<!--        >-->
+<!--        </el-pagination>-->
+      </div>
+      <!--      <el-scrollbar style="height:100%">-->
+      <!--      <el-card class="footer-page">-->
+      <!--        <ul>-->
+      <!--          {{ searchDataDisplay }}-->
+      <!--          <li v-for="(item,index) in searchDataDisplay" :key="index">-->
+      <!--            {{ item.CompanyName }}-->
+      <!--          </li>-->
+      <!--        </ul>-->
+      <!--      </el-card>-->
+      <!--          <el-pagination-->
+      <!--              small-->
+      <!--              @current-change="handlePage"-->
+      <!--              :page-size=pageSize-->
+      <!--              layout="prev, pager, next"-->
+      <!--              :total=total-->
+      <!--              :current-page=current-->
+      <!--              class="warnPagination"-->
+      <!--          >-->
+      <!--          </el-pagination>-->
+      <!--      </el-card>-->
+      <!--      </el-scrollbar>-->
+    </div>
+  </div>
+</template>
+
+<script>
+
+import mapApi from '@/api/mapApi'
+
+export default {
+  name: 'SolidWasteSearch',
+  props: ['title'],
+  data () {
+    return {
+      judgeVisible: true,
+      solidWasteTypeOptions: [{
+        value: '1',
+        label: '鍖哄煙',
+        options: [{
+          value: '1',
+          layerName: '鍥哄簾',
+          key: 'pipename',
+          label: '鍏ㄩ儴鍥哄簾'
+        }],
+        labelList: [{
+          label: '杈撻�佷粙璐�',
+          key: 'mediumtype'
+        }, {
+          label: '闀垮害(m)',
+          key: 'length'
+        }]
+      }, {
+        value: '2',
+        label: '浼佷笟鍚嶇О',
+        options: [{
+          value: '1',
+          layerName: '鍥哄簾',
+          key: 'pipename',
+          label: '鍏ㄩ儴鍥哄簾'
+        }],
+        labelList: [{
+          label: '杈撻�佷粙璐�',
+          key: 'mediumtype'
+        }, {
+          label: '闀垮害(m)',
+          key: 'length'
+        }]
+      }, {
+        value: '3',
+        label: '浜岀骇鍗曚綅',
+        options: [{
+          value: '1',
+          layerName: '鍥哄簾',
+          key: 'pipename',
+          label: '鍏ㄩ儴鍥哄簾'
+        }],
+        labelList: [{
+          label: '杈撻�佷粙璐�',
+          key: 'mediumtype'
+        }, {
+          label: '闀垮害(m)',
+          key: 'length'
+        }]
+      }, {
+        value: '4',
+        label: '浼佷笟鍚嶇О',
+        options: [{
+          value: '1',
+          layerName: '鍥哄簾',
+          key: 'pipename',
+          label: '鍏ㄩ儴鍥哄簾'
+        }],
+        labelList: [{
+          label: '杈撻�佷粙璐�',
+          key: 'mediumtype'
+        }, {
+          label: '闀垮害(m)',
+          key: 'length'
+        }]
+      }],
+      radio: '1',
+      form: {
+        keyword: '杈撳叆鍏抽敭瀛�'
+      },
+      searchDataDisplay: [],
+      total: 0
+    }
+  },
+  methods: {
+    handlePipelineType (val) {
+      this.solidWasteTypeOptions.forEach((itm) => {
+        if (val === itm.value) {
+          this.dataTypeOptions = itm.options
+          this.form.pipelineType = itm.label
+          this.form.labelList = itm.labelList
+        }
+      })
+      this.form.dataType = this.dataTypeOptions[0].label
+      this.form.key = this.dataTypeOptions[0].key
+    },
+    // 鐐瑰嚮鎼滅储瀹炵幇鏁版嵁鐨勬悳绱㈠睍绀�
+    async handleSearch () {
+      // console.log(this.form.keyword)
+      const result = await mapApi.getWasteGas()
+      console.log(result)
+      this.searchDataDisplay = result.Result.DataInfo
+      this.total = result.Result.DataInfo.length
+    },
+    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)
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+
+.solidwaste-search {
+  position: relative;
+  overflow: hidden;
+  background-color: #365e60;
+
+  .search-panel {
+    background-color: transparent;
+    border: 1px solid @background-color-split;
+    padding: 10px;
+
+    /deep/ input {
+      border-radius: 0;
+      background-color: @background-color-split;
+      border: solid 1px @color;
+      color: @color-gray;
+      font-size: 0.01rem;
+
+      .el-select .el-input.is-focus .el-input__inner {
+        border-color: @color;
+        margin-top: 13px;
+      }
+    }
+
+    /deep/ input:focus {
+      border-color: @color;
+    }
+  }
+
+  .search-btn {
+
+  }
+
+  /deep/.search-radio {
+    margin: 6px 0;
+    display: flex;
+    flex-wrap: wrap;
+    //justify-content: flex-end;
+    //align-content: space-between;
+    .el-radio {
+      color: #ffffff!important;
+      line-height: 2;
+      .el-radio__label{
+        padding-left: 0px;
+      }
+    }
+  }
+
+  .location-btn:hover, .el-input__icon:hover {
+    color: @color;
+    cursor: pointer;
+  }
+
+  .box-card {
+    margin: 15px auto;
+  }
+}
+</style>
diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index 31267fe..87b3911 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -1,140 +1,178 @@
 <template>
-  <div class="sewers-search" v-if="judgeVisible">
+  <div class="solidwaste-search" v-if="judgeVisible">
     <div class="search-title">
       <span>鍥哄簾</span>
+      <!--      <span>{{ title }}</span>-->
     </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">
+        <el-form-item v-for="(item,index) in solidWasteTypeOptions" :key="index" :label="item.label+'锛�'" size="mini"
+                      class="search-panel-item">
           <el-select style="width: 100%" v-model="form.pipelineType" @change="handlePipelineType"
                      :popper-class="'select-down'">
             <el-option
-                v-for="item in SolidWasteTypeOptions"
+                v-for="item in solidWasteTypeOptions"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="form.pipelineType+'锛�'" size="mini">
-          <el-select style="width: 100%" v-model="form.dataType" @change="handleDataType" :popper-class="'select-down'">
-            <el-option
-                v-for="item in dataTypeOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-input v-model="form.keyword" size="mini"
-                  placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�">
+        <div class="search-radio">
+          <el-radio v-model="radio" label="1">鍏ㄩ儴</el-radio>
+          <el-radio v-model="radio" label="2">姝e父</el-radio>
+          <el-radio v-model="radio" label="3">棰勮</el-radio>
+        </div>
+        <el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�">
           <i slot="suffix" class="search-btn el-input__icon el-icon-search" @click="handleSearch"></i>
         </el-input>
       </el-form>
-    </div>
-    <el-scrollbar style="height:100%">
-      <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 id="waybillNumber" class="" :title="item.properties.pipename">
-                <span class="location-btn" @click="handleLocation(item)">{{ item.properties.pipename }}</span>
-               </span>
-            </div>
-          </div>
+      <el-card class="box-card"
+               v-for="(item,index) in searchDataDisplay.slice((currentPage-1)*PageSize,currentPage*PageSize)"
+               :key="index">
+        <div v-if="totalCount > 0">
+          {{ item.CompanyName }}
         </div>
-        <div class="B-TMD-table-list-content">
-
-          <div v-for="itm in labelList" :key="itm.label">
-            <span>{{ itm.label }}锛�</span>
-            <span id="b_twe_loan" :title="item.properties[itm.key] ">{{ item.properties[itm.key] }}</span>
-          </div>
-        </div>
+      </el-card>
+      <div class="search-pagination">
+        <el-pagination
+            small
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-sizes="[1, 2, 3]"
+            :page-size="1"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total='totalCount'>
+        </el-pagination>
       </div>
-    </el-scrollbar>
-    <el-card class="footer-page" v-if="total > 10">
-      <el-pagination
-          small
-          @current-change="handlePage"
-          :page-size=pageSize
-          layout="prev, pager, next"
-          :total=total
-          :current-page=current
-          class="warnPagination"
-      >
-      </el-pagination>
-    </el-card>
+    </div>
+    <!--      <el-scrollbar style="height:100%">-->
+    <!--      </el-scrollbar>-->
   </div>
 </template>
 
 <script>
-// 寮曞叆鍙�夋嫨鏁版嵁
-import { SolidWasteTypeOptions } from '@/conf/layers/LayerSolidWaste'
 
-import WfsHelper from '@components/helpers/WfsHelper'
-import AjaxUtils from '@utils/AjaxUtils'
+import mapApi from '@/api/mapApi'
 
 export default {
   name: 'SolidWasteSearch',
+  props: ['title'],
   data () {
     return {
       judgeVisible: true,
-      list: [],
-      labelList: SolidWasteTypeOptions[0].labelList,
-      total: 0,
-      SolidWasteTypeOptions: SolidWasteTypeOptions,
-      dataTypeOptions: SolidWasteTypeOptions[0].options,
+      solidWasteTypeOptions: [{
+        value: '1',
+        label: '鍖哄煙',
+        options: [{
+          value: '1',
+          layerName: '鍥哄簾',
+          key: 'pipename',
+          label: '鍏ㄩ儴鍥哄簾'
+        }],
+        labelList: [{
+          label: '杈撻�佷粙璐�',
+          key: 'mediumtype'
+        }, {
+          label: '闀垮害(m)',
+          key: 'length'
+        }]
+      }, {
+        value: '2',
+        label: '浼佷笟鍚嶇О',
+        options: [{
+          value: '1',
+          layerName: '鍥哄簾',
+          key: 'pipename',
+          label: '鍏ㄩ儴鍥哄簾'
+        }],
+        labelList: [{
+          label: '杈撻�佷粙璐�',
+          key: 'mediumtype'
+        }, {
+          label: '闀垮害(m)',
+          key: 'length'
+        }]
+      }, {
+        value: '3',
+        label: '浜岀骇鍗曚綅',
+        options: [{
+          value: '1',
+          layerName: '鍥哄簾',
+          key: 'pipename',
+          label: '鍏ㄩ儴鍥哄簾'
+        }],
+        labelList: [{
+          label: '杈撻�佷粙璐�',
+          key: 'mediumtype'
+        }, {
+          label: '闀垮害(m)',
+          key: 'length'
+        }]
+      }, {
+        value: '4',
+        label: '浼佷笟鍚嶇О',
+        options: [{
+          value: '1',
+          layerName: '鍥哄簾',
+          key: 'pipename',
+          label: '鍏ㄩ儴鍥哄簾'
+        }],
+        labelList: [{
+          label: '杈撻�佷粙璐�',
+          key: 'mediumtype'
+        }, {
+          label: '闀垮害(m)',
+          key: 'length'
+        }]
+      }],
+      radio: '1',
       form: {
-        pipelineType: SolidWasteTypeOptions[0].label,
-        dataType: SolidWasteTypeOptions[0].options[0].label,
-        query: SolidWasteTypeOptions[0].options[0],
-        keyword: '鍥哄簾闈㈡澘鏁版嵁鏌ヨ'
+        keyword: '鍥哄簾闈㈡澘鏁版嵁鏌ヨ',
+        // 鏁版嵁鐨勪紶閫�
+        transferData: ''
       },
-      isWaybillHover: true,
-      isRouteHover: false
+      searchDataDisplay: [],
+      // 榛樿鏄剧ず绗嚑椤�
+      currentPage: 1,
+      // 鎬绘潯鏁帮紝鏍规嵁鎺ュ彛鑾峰彇鏁版嵁闀垮害(娉ㄦ剰锛氳繖閲屼笉鑳戒负绌�)
+      totalCount: 1,
+      // 涓暟閫夋嫨鍣紙鍙慨鏀癸級
+      pageSizes: [1, 2, 3, 4],
+      // 榛樿姣忛〉鏄剧ず鐨勬潯鏁帮紙鍙慨鏀癸級
+      PageSize: 1
     }
   },
-  props: ['title'],
   methods: {
+    // 姣忛〉鏄剧ず鐨勬潯鏁�
+    handleSizeChange (val) {
+      this.PageSize = val
+      this.currentPage = 1
+    },
+    // 鏄剧ず绗嚑椤�
+    handleCurrentChange (val) {
+      this.currentPage = val
+    },
     handlePipelineType (val) {
-      this.SolidWasteTypeOptions.forEach((itm) => {
-        if (val === itm.value) {
-          this.dataTypeOptions = itm.options
-          this.form.pipelineType = itm.label
-          this.form.labelList = itm.labelList
-        }
-      })
-      this.form.dataType = this.dataTypeOptions[0].label
-      this.form.key = this.dataTypeOptions[0].key
-    },
-    handleDataType (val) {
-      this.dataTypeOptions.forEach((itm) => {
-        if (val === itm.value) {
-          this.form.query = itm
+      // console.log(val)
+      this.solidWasteTypeOptions.forEach(item => {
+        // console.log(item.value)
+        if (val === item.value) {
+          // console.log('鏁版嵁閫夋嫨鐩稿悓')
+          // 鎺ユ敹鏁版嵁 鐢ㄤ簬涔嬪悗鎺ュ彛鏁版嵁鐨勮皟鐢�
+          // this.form.transferData = item.value
+          this.handleSearch(item.value)
         }
       })
     },
-    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 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)
+    // 鐐瑰嚮鎼滅储瀹炵幇鏁版嵁鐨勬悳绱㈠睍绀�
+    async handleSearch (data) {
+      // console.log(this.form.keyword)
+      const result = await mapApi.getSolidWasteSurveyDetail(data)
+      // console.log(result)
+      this.searchDataDisplay = result.Result.DataInfo
+      this.totalCount = result.Result.DataInfo.length
     }
   }
 }
@@ -142,7 +180,7 @@
 
 <style lang="less" scoped>
 
-.sewers-search {
+.solidwaste-search {
   position: relative;
   overflow: hidden;
 
@@ -172,12 +210,25 @@
 
   }
 
-  //location-btn{
-  //
-  //}
+  .search-radio {
+    margin: 15px auto;
+    display: flex;
+    align-items: center;
+    justify-content: space-around;
+  }
+
   .location-btn:hover, .el-input__icon:hover {
     color: @color;
     cursor: pointer;
   }
+
+  .box-card {
+    margin: 15px auto;
+  }
+
+  .search-pagination {
+    padding: 0;
+    margin: 15px auto;
+  }
 }
 </style>
diff --git a/src/conf/layers/LayerSolidWaste.js b/src/conf/layers/LayerSolidWaste.js
index e1f3733..fb49c33 100644
--- a/src/conf/layers/LayerSolidWaste.js
+++ b/src/conf/layers/LayerSolidWaste.js
@@ -2,8 +2,7 @@
  * 鍥哄簾鍥惧眰
  * @type {string}
  */
-const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
-// const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
+
 export const LayerSolidWaste = {
   code: 'solidWaste',
   name: '鍥哄簾',
@@ -27,341 +26,3 @@
     }
   ]
 }
-
-// 鍥哄簾璁炬柦绫诲瀷
-export const LayerSolisWastePoint = [
-  {
-    code: 'fsss',
-    name: '闄勫睘璁炬柦',
-    checked: false, // 榛樿閫変腑鐘舵��
-    type: 'geojson',
-    url: APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs?version=1.0.0&TYPENAME={sname}&REQUEST=getfeature&OUTPUTFORMAT=json&maxFeatures=20000',
-    layers: [
-      {
-        code: 'fourlink',
-        name: '鍥涢��',
-        sname: '鍥涢��',
-        checked: true,
-        minZoom: 10,
-        icon: 'sewers/鍥涢��.png'
-      },
-      {
-        code: 'tee',
-        name: '涓夐��',
-        sname: '涓夐��',
-        checked: false,
-        minZoom: 10,
-        icon: 'sewers/涓夐��.png'
-      },
-      {
-        code: 'piperack',
-        name: '绠℃灦(澧�)',
-        sname: 'PipeRack',
-        minZoom: 10,
-        checked: false
-      },
-      {
-        code: 'pipegallery',
-        name: '绠″粖(甯�)',
-        sname: 'PipeGallery',
-        minZoom: 10,
-        checked: false
-      },
-      {
-        code: 'pipesegment',
-        name: '娴佸悜',
-        sname: 'ywslx',
-        checked: false
-      },
-      {
-        code: 'pipeline',
-        name: '绠$綉',
-        minZoom: 10,
-        sname: 'pipeline',
-        checked: false
-      },
-      {
-        code: 'valve',
-        name: '闃�闂�',
-        minZoom: 10,
-        sname: 'valve',
-        checked: false,
-        icon: 'sewers/闃�闂�.png'
-      },
-      {
-        code: 'elbow',
-        name: '寮ご',
-        sname: 'Elbow',
-        minZoom: 10,
-        checked: false,
-        icon: 'sewers/寮ご.png'
-      }
-    ]
-  },
-  {
-    code: 'hbss',
-    name: '鐜繚璁炬柦',
-    checked: false, // 榛樿閫変腑鐘舵��
-    type: 'geojson',
-    url: APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs?version=1.0.0&TYPENAME={sname}&REQUEST=getfeature&OUTPUTFORMAT=json&maxFeatures=20000',
-    layers: [
-      {
-        code: 'manhole',
-        name: '绐ㄤ簳',
-        minZoom: 10,
-        sname: '绐ㄤ簳',
-        checked: false,
-        icon: 'sewers/绐ㄤ簳.png'
-      },
-      {
-        code: 'firedike',
-        name: '闃茬伀鍫�',
-        sname: '闃茬伀鍫�',
-        minZoom: 10,
-        checked: false
-      },
-      {
-        code: 'raingate',
-        name: '闆ㄧ瀛�',
-        sname: '闆ㄧ瀛�',
-        checked: false,
-        minZoom: 10,
-        icon: 'sewers/闆ㄧ瀛�.png'
-      },
-      {
-        code: 'overflowweir',
-        name: '婧㈡祦鍫�',
-        sname: '婧㈡祦鍫�',
-        minZoom: 10,
-        checked: false
-      },
-      {
-        code: 'chokevalve',
-        name: '鎴祦闂�',
-        sname: '鎴祦闂�',
-        minZoom: 10,
-        checked: false
-      },
-      {
-        code: 'collectingbasin',
-        name: '闆嗘按姹�(缃�)',
-        sname: '闆嗘按姹�',
-        minZoom: 10,
-        checked: false,
-        icon: 'sewers/闆嗘按姹�.png'
-      },
-      {
-        code: 'oilseparator',
-        name: '闅旀补姹�',
-        sname: '闅旀补姹�',
-        minZoom: 10,
-        checked: false,
-        icon: 'sewers/闅旀补姹�.png'
-      }
-    ]
-  },
-  {
-    code: 'pk',
-    name: '鎺掑彛',
-    checked: false, // 榛樿閫変腑鐘舵��
-    type: 'geojson',
-    url: APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs?version=1.0.0&TYPENAME={sname}&REQUEST=getfeature&OUTPUTFORMAT=json&maxFeatures=20000',
-    layers: [
-      {
-        code: 'dischargeport',
-        name: '鎺掓斁鍙�',
-        minZoom: 10,
-        sname: '鎺掓斁鍙�',
-        checked: false
-      }
-    ]
-  },
-  {
-    code: 'qyxx',
-    name: '鍖哄煙淇℃伅',
-    checked: false, // 榛樿閫変腑鐘舵��
-    type: 'geojson',
-    url: APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs?version=1.0.0&TYPENAME={sname}&REQUEST=getfeature&OUTPUTFORMAT=json&maxFeatures=20000',
-    layers: [
-      {
-        code: 'thirdpartypipe',
-        name: '绗笁鏂圭閬�',
-        minZoom: 10,
-        sname: '绗笁鏂圭閬�',
-        checked: false
-      },
-      {
-        code: 'firefightingunit',
-        name: '娑堥槻鍗曚綅',
-        sname: '娑堥槻鍗曚綅',
-        minZoom: 10,
-        checked: false,
-        icon: 'sewers/娑堥槻鍗曚綅.png'
-      },
-      {
-        code: 'emergencyesources',
-        name: '搴旀�ョ墿璧�',
-        sname: '搴旀�ョ墿璧�',
-        minZoom: 10,
-        checked: false
-      },
-      {
-        code: 'emergencyres',
-        name: '绀句細涓撲笟搴旀�ユ晳鎻撮槦浼�',
-        sname: '涓撲笟搴旀�ユ晳鎻�',
-        checked: false,
-        minZoom: 10,
-        icon: 'sewers/绀句細涓撲笟搴旀�ユ晳鎻�.png'
-      },
-      {
-        code: 'maintenanceteam',
-        name: '缁存姠淇槦浼�',
-        sname: '缁存姠淇槦浼�',
-        checked: false,
-        minZoom: 10,
-        icon: 'sewers/绀句細涓撲笟搴旀�ユ晳鎻�.png'
-      },
-      {
-        code: 'hospital',
-        name: '鍖婚櫌',
-        sname: '鍖婚櫌',
-        checked: false,
-        minZoom: 10,
-        icon: 'sewers/鍖婚櫌.png'
-      },
-      {
-        code: 'pointpreservationzone',
-        name: '鑷劧淇濇姢鍖�',
-        sname: '鑷劧淇濇姢鍖�',
-        checked: false,
-        minZoom: 10,
-        icon: 'sewers/鑷劧淇濇姢鍖�.png'
-      },
-      {
-        code: 'pointhydrology',
-        name: '姘翠綋',
-        sname: '姘翠綋',
-        checked: false,
-        minZoom: 10,
-        icon: 'sewers/姘翠綋.png'
-      },
-      {
-        code: 'sensitivetarget',
-        name: '鏁忔劅鐩爣',
-        sname: '鏁忔劅鐩爣',
-        checked: false,
-        minZoom: 10,
-        icon: 'sewers/鏁忔劅鐩爣.png'
-      },
-      {
-        code: 'envmonunit',
-        name: '鐜鐩戞祴鍗曚綅',
-        sname: '鐜鐩戞祴鍗曚綅',
-        checked: false,
-        minZoom: 10,
-        icon: 'sewers/鐜鐩戞祴鍗曚綅.png'
-      },
-      {
-        code: 'pointcontaminants',
-        name: '鐩戞祴鐐规薄鏌撶墿鎸囨爣淇℃伅',
-        sname: '姹℃煋鐗╂寚鏍�',
-        minZoom: 10,
-        checked: false
-      },
-      {
-        code: 'dischargeportaround',
-        name: '鎺掓斁鍙e懆杈圭幆澧冩晱鎰熶俊鎭�',
-        sname: '鎺掓斁鍙e懆杈圭幆澧�',
-        minZoom: 10,
-        checked: false,
-        iconN: 'sewers/鎺掓斁鍙e懆杈规晱鎰熶俊鎭�.png'
-      },
-      {
-        code: 'pump',
-        name: '娉�',
-        sname: '娉�',
-        minZoom: 10,
-        checked: false,
-        icon: 'sewers/娉�.png'
-      },
-      {
-        code: 'liquidlevelmeter',
-        name: '娑蹭綅璁�',
-        sname: '娑蹭綅璁�',
-        checked: false,
-        minZoom: 10,
-        icon: 'sewers/娑蹭綅璁�.png'
-      },
-      {
-        code: 'flowmeter',
-        name: '娴侀噺璁�',
-        sname: '娴侀噺璁�',
-        minZoom: 10,
-        checked: false,
-        icon: 'sewers/娴侀噺璁�.png'
-      },
-      {
-        code: 'video',
-        name: '瑙嗛鐩戞帶閰嶇疆',
-        sname: '瑙嗛鐩戞帶',
-        minZoom: 10,
-        checked: false
-      },
-      {
-        code: 'onlinemonitoring',
-        name: '鍦ㄧ嚎鐩戞祴璁惧閰嶇疆',
-        sname: '鍦ㄧ嚎鐩戞祴',
-        minZoom: 10,
-        checked: false
-      },
-      {
-        code: 'combustiblegas',
-        name: '鍙噧姘斾綋鎶ヨ璁惧閰嶇疆',
-        sname: '鍙噧姘斾綋鎶ヨ',
-        minZoom: 10,
-        checked: false
-      },
-      {
-        code: 'hydrogensulfide',
-        name: 'H2S娴撳害鎶ヨ璁惧閰嶇疆',
-        sname: 'H2S娴撳害鎶ヨ',
-        minZoom: 10,
-        checked: false
-      },
-      {
-        code: 'controlpoint',
-        name: '绠$嚎鐐�',
-        sname: '绠$嚎鐐�',
-        minZoom: 10,
-        checked: false,
-        icon: 'sewers/绠$嚎鐐�.png'
-      },
-      {
-        code: 'pipesegment',
-        name: '绠℃',
-        sname: '绠℃',
-        minZoom: 10,
-        checked: false
-      }
-    ]
-  }
-]
-
-// 鍥哄簾鏈綋
-export const SolidWasteTypeOptions = [{
-  value: '1',
-  label: '鍥哄簾鏈綋',
-  options: [{
-    value: '1',
-    layerName: '鍥哄簾',
-    key: 'pipename',
-    label: '鍏ㄩ儴鍥哄簾'
-  }],
-  labelList: [{
-    label: '杈撻�佷粙璐�',
-    key: 'mediumtype'
-  }, {
-    label: '闀垮害(m)',
-    key: 'length'
-  }]
-}]

--
Gitblit v1.8.0