From 097581b136c5889c71c07fb6f17d2f2885ce5a78 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期四, 13 五月 2021 16:02:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/components/BaseNav/pipeline/AffiliatedFacilities.vue |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/BaseNav/pipeline/AffiliatedFacilities.vue b/src/components/BaseNav/pipeline/AffiliatedFacilities.vue
index 050491f..c2e2514 100644
--- a/src/components/BaseNav/pipeline/AffiliatedFacilities.vue
+++ b/src/components/BaseNav/pipeline/AffiliatedFacilities.vue
@@ -7,16 +7,16 @@
                 :visible.sync="dialogVisible"
                 :append-to-body="true"
                 :modal="false"
-                 v-dialogDrag
+                 v-dialogDragBottom
                 >
-            <div class="search-panel ">
+            <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">
                        <div class="el-select el-select--mini">8888</div>
                     </el-form-item> -->
                     <el-form-item label="璁炬柦绫诲瀷锛�" size="mini" class="search-panel-item">
-                        <el-select style="width: 100%"  v-model="form.dataType" @change="handleDataType"  :popper-class="'select-down'">
-                            <el-option v-for="(item,index) in classification" :key="index" :label="item.name" :value="item"></el-option>
+                        <el-select style="width: 100%"  v-model="dataType" @change="handleDataType"  :popper-class="'select-down'">
+                            <el-option v-for="(item,index) in classification" :key="index" :label="item.name" :value="item.name"></el-option>
                         </el-select>
                     </el-form-item>
                     <div class="rightButtonSearch">
@@ -62,6 +62,7 @@
         areaVal: '',
         keyword: ''
       },
+      dataType: '',
       classification: LayerFsss.layers,
       list: [],
       activeNum: -1
@@ -94,17 +95,17 @@
       window.layerFactory.flyByFeature(val1, val.code)
     },
     handleDataType () {
-
+      console.log(this.dataType)
     },
     async handleSearch () {
       var wfsHelper = new WfsHelper()
       // todo 鐜板湪绠$綉杩樻病鍖哄垎寮�绫诲瀷锛屽悗闈㈡敼
-      wfsHelper.addTypeName(this.form.dataType.sname)
+      wfsHelper.addTypeName(this.dataType)
       wfsHelper.addLike('name', this.form.keyword)
       // const _this = this
 
       const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
-      console.log(res)
+      // console.log(res)
 
       if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
         const datas = res.features

--
Gitblit v1.8.0