From 3b1b5623e44135a8e693698cb7a30adf66d86964 Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期二, 18 五月 2021 15:42:33 +0800
Subject: [PATCH] 管线问题修改
---
src/components/panel/topicSearch/EnterpriseEmergency/EventQuery.vue | 2
src/conf/layers/LayerPipeLines.js | 36 ++++++++++++++++++
public/assets/images/map/sewers/含碱污水.png | 0
src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue | 7 ++-
src/conf/layers/LayerFsss.js | 7 +++
src/conf/layers/LayerArea.js | 2
src/components/panel/topicSearch/ReportSearch.vue | 7 +++
src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue | 2
public/assets/images/map/sewers/流向.png | 0
public/assets/images/map/sewers/管廊.png | 0
public/assets/images/map/sewers/事故水.png | 0
public/assets/images/map/sewers/循环水.png | 0
public/assets/images/map/sewers/含硫污水.png | 0
/dev/null | 29 --------------
src/conf/layers/LayerHbss.js | 4 +-
public/assets/images/map/sewers/管架(墩).png | 0
public/assets/images/map/sewers/生活污水.png | 0
src/components/panel/topicSearch/SewersSearch.vue | 15 ++++---
public/assets/images/map/sewers/含盐污水.png | 0
public/assets/images/map/sewers/净化水.png | 0
20 files changed, 67 insertions(+), 44 deletions(-)
diff --git "a/public/assets/images/map/sewers/\344\272\213\346\225\205\346\260\264.png" "b/public/assets/images/map/sewers/\344\272\213\346\225\205\346\260\264.png"
index a633444..65aa66c 100644
--- "a/public/assets/images/map/sewers/\344\272\213\346\225\205\346\260\264.png"
+++ "b/public/assets/images/map/sewers/\344\272\213\346\225\205\346\260\264.png"
Binary files differ
diff --git "a/public/assets/images/map/sewers/\345\207\200\345\214\226\346\260\264.png" "b/public/assets/images/map/sewers/\345\207\200\345\214\226\346\260\264.png"
index d5359a1..d61fe2f 100644
--- "a/public/assets/images/map/sewers/\345\207\200\345\214\226\346\260\264.png"
+++ "b/public/assets/images/map/sewers/\345\207\200\345\214\226\346\260\264.png"
Binary files differ
diff --git "a/public/assets/images/map/sewers/\345\220\253\347\233\220\346\261\241\346\260\264.png" "b/public/assets/images/map/sewers/\345\220\253\347\233\220\346\261\241\346\260\264.png"
index 5c93042..8ef0c73 100644
--- "a/public/assets/images/map/sewers/\345\220\253\347\233\220\346\261\241\346\260\264.png"
+++ "b/public/assets/images/map/sewers/\345\220\253\347\233\220\346\261\241\346\260\264.png"
Binary files differ
diff --git "a/public/assets/images/map/sewers/\345\220\253\347\241\253\346\261\241\346\260\264.png" "b/public/assets/images/map/sewers/\345\220\253\347\241\253\346\261\241\346\260\264.png"
index 10705fb..a49a459 100644
--- "a/public/assets/images/map/sewers/\345\220\253\347\241\253\346\261\241\346\260\264.png"
+++ "b/public/assets/images/map/sewers/\345\220\253\347\241\253\346\261\241\346\260\264.png"
Binary files differ
diff --git "a/public/assets/images/map/sewers/\345\220\253\347\242\261\346\261\241\346\260\264.png" "b/public/assets/images/map/sewers/\345\220\253\347\242\261\346\261\241\346\260\264.png"
index 676138b..316a2bc 100644
--- "a/public/assets/images/map/sewers/\345\220\253\347\242\261\346\261\241\346\260\264.png"
+++ "b/public/assets/images/map/sewers/\345\220\253\347\242\261\346\261\241\346\260\264.png"
Binary files differ
diff --git "a/public/assets/images/map/sewers/\345\276\252\347\216\257\346\260\264.png" "b/public/assets/images/map/sewers/\345\276\252\347\216\257\346\260\264.png"
index d3569e2..a9fe895 100644
--- "a/public/assets/images/map/sewers/\345\276\252\347\216\257\346\260\264.png"
+++ "b/public/assets/images/map/sewers/\345\276\252\347\216\257\346\260\264.png"
Binary files differ
diff --git "a/public/assets/images/map/sewers/\346\210\252\346\265\201\351\227\270.png" "b/public/assets/images/map/sewers/\346\210\252\346\265\201\351\227\270.png"
deleted file mode 100644
index 6790e49..0000000
--- "a/public/assets/images/map/sewers/\346\210\252\346\265\201\351\227\270.png"
+++ /dev/null
Binary files differ
diff --git "a/public/assets/images/map/sewers/\346\265\201\345\220\221.png" "b/public/assets/images/map/sewers/\346\265\201\345\220\221.png"
index b87b23d..d4966ce 100644
--- "a/public/assets/images/map/sewers/\346\265\201\345\220\221.png"
+++ "b/public/assets/images/map/sewers/\346\265\201\345\220\221.png"
Binary files differ
diff --git "a/public/assets/images/map/sewers/\347\224\237\346\264\273\346\261\241\346\260\264.png" "b/public/assets/images/map/sewers/\347\224\237\346\264\273\346\261\241\346\260\264.png"
index 5165e20..1e565df 100644
--- "a/public/assets/images/map/sewers/\347\224\237\346\264\273\346\261\241\346\260\264.png"
+++ "b/public/assets/images/map/sewers/\347\224\237\346\264\273\346\261\241\346\260\264.png"
Binary files differ
diff --git "a/public/assets/images/map/sewers/\347\256\241\345\273\212.png" "b/public/assets/images/map/sewers/\347\256\241\345\273\212.png"
index e07d50f..4e37704 100644
--- "a/public/assets/images/map/sewers/\347\256\241\345\273\212.png"
+++ "b/public/assets/images/map/sewers/\347\256\241\345\273\212.png"
Binary files differ
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"
new file mode 100644
index 0000000..d9932c8
--- /dev/null
+++ "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/\347\256\241\346\236\266.png" "b/public/assets/images/map/sewers/\347\256\241\346\236\266.png"
deleted file mode 100644
index 0ade675..0000000
--- "a/public/assets/images/map/sewers/\347\256\241\346\236\266.png"
+++ /dev/null
Binary files differ
diff --git "a/public/assets/images/map/sewers/\350\243\205\347\275\256\345\214\272.png" "b/public/assets/images/map/sewers/\350\243\205\347\275\256\345\214\272.png"
deleted file mode 100644
index 525d157..0000000
--- "a/public/assets/images/map/sewers/\350\243\205\347\275\256\345\214\272.png"
+++ /dev/null
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"
deleted file mode 100644
index 33076a5..0000000
--- "a/public/assets/images/map/sewers/\351\230\262\347\201\253\345\240\244.png"
+++ /dev/null
Binary files differ
diff --git a/src/components/LayerController/logic/EnterpriseEmergency.js b/src/components/LayerController/logic/EnterpriseEmergency.js
deleted file mode 100644
index ab7cc6c..0000000
--- a/src/components/LayerController/logic/EnterpriseEmergency.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * 浼佷笟搴旀��
- */
-
-// 浣跨敤灏佽鏂规硶
-const AnimalService = require('../service/AnimalService').default
-
-module.exports = function () {
- this.init = async (layer, L) => {
- this.animalService = new AnimalService({
- L: L,
- layer: layer
- })
- }
- this.bindTooltip = (layer) => {
- return 'layer'
- }
- this.click = () => {
- window.$layer.open({
- content: {
- content: 'Popup', // 缁勪欢
- data: { // 浼犻�掔殑鍙傛暟
- datas: 'popupDatas'
- }
- },
- title: ''
- })
- }
-}
diff --git a/src/components/panel/topicSearch/EnterpriseEmergency/EventQuery.vue b/src/components/panel/topicSearch/EnterpriseEmergency/EventQuery.vue
index fb1eb41..a3215b4 100644
--- a/src/components/panel/topicSearch/EnterpriseEmergency/EventQuery.vue
+++ b/src/components/panel/topicSearch/EnterpriseEmergency/EventQuery.vue
@@ -130,7 +130,7 @@
console.log('item')
window.$layer.open({
content: {
- content: ReportPopup, // 缁勪欢
+ comp: ReportPopup, // 缁勪欢
parent: this, // 鐖剁粍浠�
data: { // 浼犻�掔殑鍙傛暟
// storagePlaceId: e.layer.options.totransferData.StoragePlaceId
diff --git a/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue b/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue
index 5c2f333..0d18d91 100644
--- a/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue
+++ b/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue
@@ -55,12 +55,11 @@
<script>
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
-// import { LayerEmergency } from '../../../../../conf/LayerEmergency'
import { LayerEmergencySource } from '../../../../conf/layers/LayerEmergencySource'
import { LayerSurroundings } from '../../../../conf/layers/LayerSurroundings'
import { pulseEffect } from '../../../../utils/utils'
import { openPopup } from '../../../helpers/LocateHelper'
-// import { fitBounds, highlight, openPopup } from '../../helpers/LocateHelper'
+// import { fitBounds, highlight } from '../../../helpers/LocateHelper'
export default {
name: 'ResourcesQuery',
@@ -140,9 +139,11 @@
// console.log(val)
this.activeNum = index
const positionArea = [val.properties.y, val.properties.x]
- window.map.setView(positionArea, 16)
+ window.map.setView(positionArea, 17)
pulseEffect(positionArea)
openPopup(positionArea, val.id)
+ // fitBounds(val, this.form.dataType.code)
+ // highlight(val, this.form.dataType)
}
}
}
diff --git a/src/components/panel/topicSearch/ReportSearch.vue b/src/components/panel/topicSearch/ReportSearch.vue
index 60bcfdd..d7b4b4d 100644
--- a/src/components/panel/topicSearch/ReportSearch.vue
+++ b/src/components/panel/topicSearch/ReportSearch.vue
@@ -35,6 +35,13 @@
methods: {
handleClick (tab) {
console.log(tab)
+ if (tab.label === '鍒嗘瀽') {
+ // 鍏抽棴寮圭獥
+ window.layerFactory.clickSwitch = false
+ } else {
+ // 鎵撳紑寮圭獥
+ window.layerFactory.clickSwitch = true
+ }
}
}
}
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index 03c28d5..8c40d1c 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -33,13 +33,16 @@
</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 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.orgcode }}</span>
- <p>璁炬柦绫诲瀷锛�<span>{{ 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>鎵�灞炰紒涓氾細<span>{{ item.properties.orgname }}</span>
+ <p>璁炬柦绫诲瀷锛�<span>{{ item.properties.linenumtype }}</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>
@@ -133,7 +136,6 @@
// 璁炬柦绫诲瀷绛涢��
handlePipelineType (val) {
this.list = []
- // debugger
for (let i = 0; i < this.items.length; i++) {
const item = this.items[i]
if (val === item.name) {
@@ -156,6 +158,7 @@
}
// const _this = this
const res = await AjaxUtils.GetDataAsynByUrl(this.wfsHelper.getUrl(), {})
+ console.log(res)
if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
this.total = res.totalFeatures
this.list = res.features
diff --git a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
index c637d81..ad9b07f 100644
--- a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
+++ b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
@@ -150,7 +150,7 @@
// 鍦板浘涓婄偣鍑�
selectPipeLine () {
window.map.on('click', this.selectClick)
- // // 鍏抽棴寮圭獥
+ // 鍏抽棴寮圭獥
window.layerFactory.clickSwitch = false
},
// 鍦板浘涓婄偣鍑诲洖璋�
diff --git a/src/conf/layers/LayerArea.js b/src/conf/layers/LayerArea.js
index c4d82db..6315538 100644
--- a/src/conf/layers/LayerArea.js
+++ b/src/conf/layers/LayerArea.js
@@ -30,7 +30,7 @@
name: '瑁呯疆鍖�',
sname: '瑁呯疆鍖�',
checked: false, // 榛樿閫変腑鐘舵��
- icon: 'sewers/瑁呯疆鍖�.png',
+ icon: 'sewers/.png',
typeName: 'sewer:unitareaboundary'
}
]
diff --git a/src/conf/layers/LayerFsss.js b/src/conf/layers/LayerFsss.js
index 9ab0a79..e1a6600 100644
--- a/src/conf/layers/LayerFsss.js
+++ b/src/conf/layers/LayerFsss.js
@@ -47,7 +47,7 @@
minZoom: 16,
type: SERVICE_TYPE.WMS,
typeName: 'sewer:piperack',
- icon: 'sewers/绠℃灦.png',
+ icon: 'sewers/绠℃灦(澧�).png',
checked: false
},
{
@@ -58,6 +58,11 @@
type: SERVICE_TYPE.WMS,
typeName: 'sewer:pipegallery',
icon: 'sewers/绠″粖.png',
+ color: '#828282',
+ styles: {
+ COLOR: '#828282',
+ FILL_COLOR: '#828282'
+ },
checked: false
},
{
diff --git a/src/conf/layers/LayerHbss.js b/src/conf/layers/LayerHbss.js
index 54f61f7..657d994 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
},
{
@@ -54,7 +54,7 @@
sname: '鎴祦闂�',
type: SERVICE_TYPE.WMS,
typeName: 'sewer:collectingbasin',
- icon: 'sewers/鎴祦闂�.png',
+ icon: 'sewers/.png',
checked: false
},
{
diff --git a/src/conf/layers/LayerPipeLines.js b/src/conf/layers/LayerPipeLines.js
index 476db82..113d1a0 100644
--- a/src/conf/layers/LayerPipeLines.js
+++ b/src/conf/layers/LayerPipeLines.js
@@ -42,6 +42,12 @@
typeName: 'sewer:pipeline',
icon: 'sewers/浜嬫晠姘�.png',
minZoom: 13,
+ // color: 'rgb(230, 76, 0)',
+ color: '#E64C00',
+ styles: {
+ COLOR: '#E64C00',
+ FILL_COLOR: '#E64C00'
+ },
filter: 'mediumtype = \'浜嬫晠姘碶'',
index: 1
},
@@ -73,7 +79,12 @@
typeName: 'sewer:pipeline',
icon: 'sewers/鍚洂姹℃按.png',
minZoom: 13,
+ color: '#FF7F7F',
filter: 'mediumtype = \'鍚洂姹℃按\'',
+ styles: {
+ COLOR: '#FF7F7F',
+ FILL_COLOR: '#FF7F7F'
+ },
index: 1
},
{
@@ -87,6 +98,11 @@
icon: 'sewers/鍚⒈姹℃按.png',
filter: 'mediumtype = \'鍚⒈姹℃按\'',
minZoom: 10,
+ color: '#E8BEFF',
+ styles: {
+ COLOR: '#E8BEFF',
+ FILL_COLOR: '#E8BEFF'
+ },
index: 1
},
{
@@ -100,6 +116,11 @@
icon: 'sewers/鍚～姹℃按.png',
filter: 'mediumtype = \'鍚～姹℃按\'',
minZoom: 10,
+ color: '',
+ styles: {
+ COLOR: '',
+ FILL_COLOR: ''
+ },
index: 1
},
{
@@ -113,6 +134,11 @@
icon: 'sewers/鐢熸椿姹℃按.png',
filter: 'mediumtype = \'鐢熸椿姹℃按\'',
minZoom: 13,
+ color: '#A8A800',
+ styles: {
+ COLOR: '#A8A800',
+ FILL_COLOR: '#A8A800'
+ },
index: 1
},
{
@@ -126,6 +152,11 @@
icon: 'sewers/鍑�鍖栨按.png',
filter: 'mediumtype = \'鍑�鍖栨按\'',
minZoom: 13,
+ color: '#55FF00',
+ styles: {
+ COLOR: '#55FF00',
+ FILL_COLOR: '#55FF00'
+ },
index: 1
},
{
@@ -139,6 +170,11 @@
filter: 'mediumtype = \'寰幆姘碶'',
checked: false,
minZoom: 13,
+ color: '#73FFDF',
+ styles: {
+ COLOR: '#73FFDF',
+ FILL_COLOR: '#73FFDF'
+ },
index: 1
},
{
--
Gitblit v1.8.0