From 58fe00c41f4c499b604d2c504542dbb1272382f2 Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期二, 18 五月 2021 20:35:47 +0800
Subject: [PATCH] 管线问题修改
---
src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue | 3
src/components/layer/src/layer.vue | 1
src/conf/layers/LayerHbss.js | 2
public/assets/images/map/sewers/管架(墩).png | 0
src/components/panel/topicSearch/SewersSearch.vue | 194 ++++++++++++++++++++++++++----------------------
public/assets/images/map/sewers/防火堤.png | 0
6 files changed, 107 insertions(+), 93 deletions(-)
diff --git "a/public/assets/images/map/sewers/\347\256\241\346\236\266\050\345\242\251\051.png" "b/public/assets/images/map/sewers/\347\256\241\346\236\266\050\345\242\251\051.png"
index d9932c8..84b5db4 100644
--- "a/public/assets/images/map/sewers/\347\256\241\346\236\266\050\345\242\251\051.png"
+++ "b/public/assets/images/map/sewers/\347\256\241\346\236\266\050\345\242\251\051.png"
Binary files differ
diff --git "a/public/assets/images/map/sewers/\351\230\262\347\201\253\345\240\244.png" "b/public/assets/images/map/sewers/\351\230\262\347\201\253\345\240\244.png"
new file mode 100644
index 0000000..b26cf57
--- /dev/null
+++ "b/public/assets/images/map/sewers/\351\230\262\347\201\253\345\240\244.png"
Binary files differ
diff --git a/src/components/layer/src/layer.vue b/src/components/layer/src/layer.vue
index 7877f0f..64f7411 100644
--- a/src/components/layer/src/layer.vue
+++ b/src/components/layer/src/layer.vue
@@ -10,6 +10,7 @@
<script>
import helper from './helper/helper.js'
+import '../../../utils/dragBoxes'
export default {
data () {
diff --git a/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue b/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue
index 5df7689..a0f5f65 100644
--- a/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue
+++ b/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue
@@ -58,9 +58,8 @@
import { LayerEmergencySource } from '../../../../conf/layers/LayerEmergencySource'
import { LayerSurroundings } from '../../../../conf/layers/LayerSurroundings'
// import { pulseEffect } from '../../../../utils/utils'
-// import { locate, openPropsPopup } from '../../../helpers/LocateHelper'
import { locate } from '../../../helpers/LocateHelper'
-// import { fitBounds, highlight, locate } from '../../../helpers/LocateHelper'
+// import { fitBounds, highlight, locate, openPropsPopup } from '../../../helpers/LocateHelper'
export default {
name: 'ResourcesQuery',
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index bc9772d..698c1d5 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -1,95 +1,102 @@
<template>
- <div class="sewers-search" v-if="gdVisible">
- <div class="panel-title">{{ title }}</div>
- <el-tabs v-model="activeName" @tab-click="handleClick">
- <el-tab-pane label="鏌ヨ" name="first">
- <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-select style="width: 100%" v-model="form.pipelineType" @change="handlePipelineType"
- :popper-class="'select-down'">
- <el-option
- v-for="item in items"
- :key="item.code"
- :label="item.name"
- :value="item.name">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item :label="form.pipelineType+'锛�'" size="mini">
- <el-select style="width: 100%" v-model="form.dataType" value-key="code" :popper-class="'select-down'" @change="handleDataType" >
- <el-option
- v-for="item in subItems"
- :key="item.code"
- :label="item.name"
- :value="item">
- </el-option>
- </el-select>
- </el-form-item>
- <div class="rightButtonSearch">
- <el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
- <el-button class="el-icon-search" @click="handleSearch"></el-button>
- </div>
- </el-form>
- </div>
- <el-scrollbar style="height:413px;">
- <div class="environmental-risk-list" v-for="(item,index) in list" :key="index" :class="activeNum===index?'hover':''">
- <img class="state" :src="getImgSrc()" style="background: none" />
- <div>
- <h3 @click="handleLocation(item,index)">{{ item.properties.pipename }}</h3>
- <p>鎵�灞炰紒涓氾細<span>{{ item.properties.orgname }}</span>
- <p>璁炬柦绫诲瀷锛�<span>{{ item.properties.linenumtype }}{{ item.properties.fourtype }}{{ item.properties.teetype }}</span>
- <el-button v-if="fuShuSheShiShow" class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;"
- @click="btnAffiliatedFacilities(item,index)" >
- 闄勫睘璁炬柦
- </el-button>
- </p>
- </div>
- </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
- class="warnPagination"
- >
- </el-pagination>
- </el-card>
- </el-tab-pane>
- <el-tab-pane label="鍒嗘瀽" name="second">
- <SewersAnalysis></SewersAnalysis>
- </el-tab-pane>
- <el-tab-pane label="鍘嗗彶" name="third">
- <SewersHistory></SewersHistory>
- </el-tab-pane>
- </el-tabs>
- <!-- 闄勫睘璁炬柦闈㈡澘 -->
- <affiliated-facilities :facilitiesParameter="facilitiesParameter" v-if="fuShuSheShiShow" ></affiliated-facilities>
- </div>
+ <div class="sewers-search" v-if="gdVisible">
+ <div class="panel-title">{{ title }}</div>
+ <el-tabs v-model="activeName" @tab-click="handleClick">
+ <el-tab-pane label="鏌ヨ" name="first">
+ <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-select style="width: 100%" v-model="form.pipelineType" @change="handlePipelineType"
+ :popper-class="'select-down'">
+ <el-option
+ v-for="item in items"
+ :key="item.code"
+ :label="item.name"
+ :value="item.name">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item :label="form.pipelineType+'锛�'" size="mini">
+ <el-select style="width: 100%" v-model="form.dataType" value-key="code"
+ :popper-class="'select-down'" @change="handleDataType">
+ <el-option
+ v-for="item in subItems"
+ :key="item.code"
+ :label="item.name"
+ :value="item">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <div class="rightButtonSearch">
+ <el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
+ <el-button class="el-icon-search" @click="handleSearch"></el-button>
+ </div>
+ </el-form>
+ </div>
+ <el-scrollbar style="height:413px;">
+ <div class="environmental-risk-list" v-for="(item,index) in list" :key="index"
+ :class="activeNum===index?'hover':''">
+ <img class="state" :src="getImgSrc()" style="background: none"/>
+ <div>
+ <h3 @click="handleLocation(item,index)">{{ item.properties.pipename }}
+ {{item.properties.companyname }}</h3>
+ <p>鎵�灞炰紒涓氾細<span>{{ item.properties.orgname }}</span>
+ <p>璁炬柦绫诲瀷锛�<span>{{form.pipelineType}}</span>
+ <el-button v-if="fuShuSheShiShow" class="rt btn00fff6" size="mini"
+ style="margin-right: 0.04rem;"
+ @click="btnAffiliatedFacilities(item,index)">
+ 闄勫睘璁炬柦
+ </el-button>
+ </p>
+ </div>
+ </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
+ class="warnPagination"
+ >
+ </el-pagination>
+ </el-card>
+ </el-tab-pane>
+ <el-tab-pane label="鍒嗘瀽" name="second">
+ <SewersAnalysis></SewersAnalysis>
+ </el-tab-pane>
+ <el-tab-pane label="鍘嗗彶" name="third">
+ <SewersHistory></SewersHistory>
+ </el-tab-pane>
+ </el-tabs>
+ <!-- 闄勫睘璁炬柦闈㈡澘 -->
+ <affiliated-facilities :facilitiesParameter="facilitiesParameter"
+ v-if="fuShuSheShiShow"></affiliated-facilities>
+ </div>
</template>
<script>
+// 寮曞叆缁勪欢鍐呭 =銆� 闄勫睘璁炬柦
+import AffiliatedFacilities from '@components/BaseNav/pipeline/AffiliatedFacilities'
+// 绠＄嚎鍒嗘瀽鍔熻兘
+import SewersAnalysis from '@components/panel/topicSearch/SewersSelect/SewersAnalysis'
+// 绠＄嚎鏌ヨ鍘嗗彶鍔熻兘
+import SewersHistory from '@components/panel/topicSearch/SewersSelect/SewersHistory'
+// form绫诲瀷鍙�夋嫨鏁版嵁 鍥惧眰鎺у埗
import { LayerPipeLines } from '@src/conf/layers/LayerPipeLines'
import { LayerFsss } from '@src/conf/layers/LayerFsss'
import { LayerHbss } from '@src/conf/layers/LayerHbss'
import { LayerPk } from '@src/conf/layers/LayerPk'
import { LayerArea } from '@src/conf/layers/LayerArea'
-
+// 鏂规硶
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
-
-import AffiliatedFacilities from '@components/BaseNav/pipeline/AffiliatedFacilities'
-
-// 寮曞叆缁勪欢鍐呭
-import SewersAnalysis from '@components/panel/topicSearch/SewersSelect/SewersAnalysis'
-import SewersHistory from '@components/panel/topicSearch/SewersSelect/SewersHistory'
import { fitBounds, highlight, locate } from '../../helpers/LocateHelper'
export default {
name: 'SewersSearch',
+ props: ['title'],
components: {
SewersAnalysis,
SewersHistory,
@@ -97,38 +104,44 @@
},
data () {
return {
- activeName: 'first',
+ // 鍒ゆ柇鏄剧ず/闅愯棌
gdVisible: true,
+ // tab鍒囨崲 缁戝畾褰撳墠鍊�
+ activeName: 'first',
+ // 鎼滅储鏁版嵁 鐢ㄤ簬灞曠ず鏁版嵁瀛樺偍
list: [],
+ // 鍥惧眰鎺у埗
items: [LayerPipeLines, LayerFsss, LayerHbss, LayerPk, LayerArea],
subItems: LayerPipeLines.layers,
+ // 鍒嗛〉
pageSize: 10,
total: 0,
+ // form琛ㄥ崟缁戝畾鏁版嵁
form: {
pipelineType: '绠＄嚎',
dataType: '',
keyword: ''
},
- // pageSize: 10,
- // current: 1,
- isWaybillHover: true,
- isRouteHover: false,
facilitiesParameter: null,
fuShuSheShiShow: true,
- fuShuSheShiPanelShow: true,
activeNum: -1,
wfsHelper: null
}
},
- props: ['title'],
+ mounted () {
+ this.wfsHelper = new WfsHelper()
+ },
methods: {
+ // tab鍒囨崲
+ handleClick (tab, event) {
+ console.log(tab, event)
+ },
+ // 鏍规嵁杩斿洖鏁版嵁 纭灞曠ず鍥剧墖
getImgSrc () {
const icon = this.form.dataType.icon
return icon ? 'assets/images/map/' + icon : ''
},
- handleClick (tab, event) {
- console.log(tab, event)
- },
+ // 椤甸潰鍒囨崲 鍒嗛〉鍔熻兘
handlePage (page) {
this.wfsHelper.setPage(page)
this.handleSearch()
@@ -144,9 +157,11 @@
}
}
},
+ // 浜岀骇form琛ㄥ崟鍒囨崲閫夋嫨娓呯┖宸查�夋嫨鏁版嵁
handleDataType () {
this.list = []
},
+ // 鎼滅储鍔熻兘
async handleSearch () {
// console.log(this.form.dataType.sname, this.form.keyword)
this.list = []
@@ -164,6 +179,7 @@
this.list = res.features
}
},
+ // 鐐瑰嚮鎼滅储鍒扮殑鏁版嵁 瀹炵幇鍔熻兘 = 瀹氫綅 楂樹寒 寮规
handleLocation (val, index) {
// console.log(val)
this.activeNum = index
@@ -171,6 +187,7 @@
const config = this.form.dataType
locate(val, config)
},
+ // 闄勫睘璁炬柦鍔熻兘缁勪欢
btnAffiliatedFacilities (val, index) {
this.activeNum = index
this.facilitiesParameter = val
@@ -183,9 +200,6 @@
fitBounds(val, this.form.dataType.code)
highlight(val)
}
- },
- mounted () {
- this.wfsHelper = new WfsHelper()
}
}
</script>
diff --git a/src/conf/layers/LayerHbss.js b/src/conf/layers/LayerHbss.js
index 4fca6f8..c60eced 100644
--- a/src/conf/layers/LayerHbss.js
+++ b/src/conf/layers/LayerHbss.js
@@ -35,7 +35,7 @@
minZoom: 16,
type: SERVICE_TYPE.WMS,
typeName: 'sewer:firedike',
- icon: 'sewers/.png',
+ icon: 'sewers/闃茬伀鍫�.png',
checked: false
},
{
--
Gitblit v1.8.0