From e46c7f58112c13ed09b325bf164f0d2a440f1012 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 13 五月 2021 16:13:17 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
/dev/null | 41 --------------------
src/conf/Topic.js | 2
src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/EventQuery.vue | 12 +++--
src/conf/LayerTopic.js | 3 -
src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue | 24 +++++++----
src/components/LayerController/modules/LcServiceLayer.vue | 18 ++++++--
6 files changed, 37 insertions(+), 63 deletions(-)
diff --git a/src/components/LayerController/modules/LcServiceLayer.vue b/src/components/LayerController/modules/LcServiceLayer.vue
index ad6142f..7ec8aa9 100644
--- a/src/components/LayerController/modules/LcServiceLayer.vue
+++ b/src/components/LayerController/modules/LcServiceLayer.vue
@@ -9,12 +9,12 @@
<div style="padding-left:25px;padding-top:10px;color:#fff;font-size: 16px;">
<input type="checkbox" :class="item.type==1?'active':''" :name="'wmsLayer_'+item.code" :checked="item.checked" :value="item.code" @change="swAllLayers(item)"/>{{ item.name }}
</div>
- <div class="layerbox-item" v-show="item.isShow">
+ <div class="layerbox-item" v-show="item.isShow" >
<!-- 浜岀骇鍥惧眰閬嶅巻 -->
- <div class="basemap-layer-item" v-for="(itm,index2) in item.layers" :key="index2">
+ <div class="basemap-layer-item" v-for="(itm,index2) in item.layers" :key="index2" :class="!itm.layers?'felxs':''" >
<input type="checkbox" :class="itm.type==1?'active':''" :name="'wmsSublayers_'+item.code+'_'+itm.code" :checked="itm.checked" :value="itm.code" @change="swAllLayers(itm)"/>{{ itm.name }}
<!-- 涓夌骇鍥惧眰閬嶅巻 -->
- <div class="layerbox-item-3">
+ <div class="layerbox-item-3" v-show="itm.layers">
<div class="basemap-layer-item" v-for="(layer,index3) in itm.layers" :key="index3">
<input type="checkbox"
:class="layer.type==1?'active':''"
@@ -93,7 +93,7 @@
// console.log(item1.layers.length, item1.istrue, item1.isfalse, item1.type)
}
})
- // console.log(this.serviceLayers)
+ console.log(this.serviceLayers)
},
swLayers (layers, checked) {
if (layers) {
@@ -124,6 +124,11 @@
.btn-filter {
cursor: pointer;
color: #ffffff;
+ }
+ .felxs{
+ display: flex;
+ flex-wrap:wrap;
+ width: 50% !important;
}
.wms-panel {
@@ -156,9 +161,12 @@
}
.downUp:hover{font-size: 26px;font-weight: 900}
.layerbox-item {
- padding-left: 0.1rem;
+ padding-left: 25px;
padding-top: 5px;
+ display: flex;
+ flex-wrap:wrap;
.basemap-layer-item {margin-bottom: 5px;
+ width: 100%;
input[type="checkbox"]{width:10px;height:10px;display: inline-block;text-align: center;vertical-align: middle; line-height: 10px;position: relative;}
input[type="checkbox"]::before{content: "";position: absolute;top: 0;left: 0;background: #fff;width: 100%;height: 100%;border: 1px solid #d9d9d9}
input[type="checkbox"]:checked::before{content: "\2713";background-color: @color-highlight;position: absolute;top: 0;left: 0;width:100%;border: 1px solid #fff700;
diff --git a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/EventQuery.vue b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/EventQuery.vue
index f020f79..873db6e 100644
--- a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/EventQuery.vue
+++ b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/EventQuery.vue
@@ -62,9 +62,9 @@
</template>
<script>
-import { LayerEntEmer } from '../../../../../conf/layers/LayerEntEmer'
-import { LayerEvent } from '../../../../../conf/layers/LayerEvent'
-import { LayerResources } from '../../../../../conf/layers/LayerResources'
+// import { LayerEntEmer } from '../../../../../conf/layers/LayerEntEmer'
+// import { LayerEvent } from '../../../../../conf/layers/LayerEvent'
+// import { LayerResources } from '../../../../../conf/layers/LayerResources'
import ReportPopup from './ReportPopup'
@@ -79,8 +79,10 @@
activeNum: -1,
LayerEvent: {},
LayerResources: {},
- items: [LayerEvent, LayerResources],
- subItems: LayerEntEmer.layers,
+ // items: [LayerEvent, LayerResources],
+ items: [],
+ // subItems: LayerEntEmer.layers,
+ subItems: [],
form: {
pipelineType: '',
dataType: '',
diff --git a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
index fd06274..f8df59b 100644
--- a/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
+++ b/src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ResourcesQuery.vue
@@ -30,7 +30,7 @@
v-for="item in subItems"
:key="item.code"
:label="item.name"
- :value="item">
+ :value="item.name">
</el-option>
</el-select>
</el-form-item>
@@ -42,12 +42,11 @@
<el-scrollbar style="height:286.22px">
<div class="environmental-risk-list" v-for="(item,index) in list" :key="index"
:class="activeNum===index?'hover':''" @click="handleLocation(item,index)">
- <!-- <i class="state"></i>-->
<img class="state" :src="getImgSrc()" style="background: none"/>
- <h3>浜嬩欢鍚嶇О:XXX浜嬩欢</h3>
- <h5>浜嬩欢浜嬩欢:2021骞�3鏈�21鏃�</h5>
- <p>浜嬩欢鐘舵�侊細<span>瀹℃壒闃舵</span></p>
- <p>浜嬩欢绫诲瀷锛�<span>鐪熷疄浜嬩欢</span></p>
+ <h3>璧勬簮绫诲瀷:{{item.properties.adminzonename}}</h3>
+ <h5>璧勬簮鍚嶇О:{{item.properties.type}}</h5>
+ <p>璐熻矗浜�:<span>{{item.properties.resperson}}</span></p>
+ <p>鐢佃瘽:<span>{{item.properties.telephone}}</span></p>
</div>
</el-scrollbar>
</div>
@@ -75,9 +74,10 @@
activeNum: -1,
list: [],
// items: [LayerEntEmer],
- items: [],
+ items: [{ name: '搴旀�ヨ祫婧�' }, { name: '鍛ㄨ竟鐜' }],
// subItems: LayerEntEmer.layers,
- subItems: [],
+ subItems: [{ name: '鍏ㄩ儴璧勬簮' }, { name: '搴旀�ョ墿璧�' }, { name: '搴旀�ヨ溅杈�(鑸�)' }, { name: '搴旀�ラ槦浼�(鍚秷闃插崟浣�)' }],
+ subItemsT: [{ name: '鍏ㄩ儴鐜' }, { name: '鍖婚櫌' }, { name: '瀛︽牎' }, { name: '姘翠綋' }, { name: '鑷劧淇濇姢鍖�' }, { name: '鏁忔劅鐩爣' }],
WfsHelper: null
}
},
@@ -90,7 +90,13 @@
return icon ? 'assets/images/map/' + icon : ''
},
handlePipelineType () {
- console.log('item')
+ // console.log('item')
+ if (this.form.pipelineType === '搴旀�ヨ祫婧�') {
+ this.form.pipelineType = '璧勬簮绫诲瀷'
+ }
+ if (this.form.pipelineType === '鍛ㄨ竟鐜') {
+ this.subItems = this.subItemsT
+ }
},
handleDataType () {
console.log('item')
diff --git a/src/conf/LayerTopic.js b/src/conf/LayerTopic.js
index ef7ca3d..e27ab87 100644
--- a/src/conf/LayerTopic.js
+++ b/src/conf/LayerTopic.js
@@ -12,7 +12,6 @@
import { LayerArea } from './layers/LayerArea'
import { LayerVideo } from './layers/LayerVideo'
import { LayerPk } from './layers/LayerPk'
-import { LayerEntEmer } from './layers/LayerEntEmer'
export const LayerTopic = {
code: 'sewersTopic',
@@ -20,5 +19,5 @@
checked: false,
isShow: true,
type: 0,
- layers: [LayerPollutionSources, LayerWasteWater, LayerWasteGas, LayerWasteSolid, LayerAirQuality, LayerEnvRisk, LayerSoilGroundWater, LayerPipeLines, LayerPk, LayerVideo, LayerArea, LayerEntEmer]
+ layers: [LayerPollutionSources, LayerWasteWater, LayerWasteGas, LayerWasteSolid, LayerAirQuality, LayerEnvRisk, LayerSoilGroundWater, LayerPipeLines, LayerPk, LayerVideo, LayerArea]
}
diff --git a/src/conf/Topic.js b/src/conf/Topic.js
index f0d22ff..31db08c 100644
--- a/src/conf/Topic.js
+++ b/src/conf/Topic.js
@@ -66,7 +66,7 @@
id: 8,
checked: false,
isShow: false,
- icon: 'iconguanxianyanghu',
+ icon: 'iconqiye',
comp: ''
}/* {
name: '绠￠亾鍙樻洿',
diff --git a/src/conf/layers/LayerEntEmer.js b/src/conf/layers/LayerEntEmer.js
deleted file mode 100644
index 18fa844..0000000
--- a/src/conf/layers/LayerEntEmer.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * 浼佷笟搴旀��
- */
-// import { LayerHbss } from './LayerHbss'
-// import { LayerFsss } from './LayerFsss'
-
-import { LayerEvent } from './LayerEvent'
-import { LayerResources } from './LayerResources'
-
-import { SERVICE_TYPE } from '../Constants'
-
-export const LayerEntEmer = {
- code: 'EnterpriseEmergency',
- name: '浼佷笟搴旀��',
- checked: false,
- type: 0,
- childLayer: [LayerEvent, LayerResources],
- layers: [
- {
- code: 'rainline',
- name: '鍩虹鍥惧眰',
- sname: '鍩虹鍥惧眰',
- checked: false,
- type: SERVICE_TYPE.WMS,
- layerGroup: 'sewer:pipeline_group',
- typeName: 'sewer:pipeline',
- icon: 'sewers/闆ㄦ按绾�.png',
- color: '#0070ff',
- minZoom: 13,
- styles: {
- COLOR: '#0070ff',
- FILL_COLOR: '#0070ff'
- },
- filter: 'mediumtype = \'鍩虹鍥惧眰\'',
- index: 1
- },
- {
- code: 'accidentline',
- name: '鍦ㄧ嚎鐩戞祴',
- sname: '鍦ㄧ嚎鐩戞祴',
- checked: false,
- type: SERVICE_TYPE.WMS,
- layerGroup: 'sewer:pipeline_group',
- typeName: 'sewer:pipeline',
- minZoom: 13,
- filter: 'mediumtype = \'鍦ㄧ嚎鐩戞祴\'',
- index: 1
- },
- {
- code: 'oilline',
- name: '搴旀�ヨ祫婧�',
- sname: '搴旀�ヨ祫婧�',
- checked: false,
- type: SERVICE_TYPE.WMS,
- layerGroup: 'sewer:pipeline_group',
- typeName: 'sewer:pipeline',
- minZoom: 13,
- color: '#ffaa00',
- filter: 'mediumtype = \'搴旀�ヨ祫婧怽'',
- styles: {
- COLOR: '#ffaa00',
- FILL_COLOR: '#ffaa00'
- },
- index: 1
- },
- {
- code: 'saltline',
- name: '鍛ㄨ竟鐜',
- sname: '鍛ㄨ竟鐜',
- checked: false,
- type: SERVICE_TYPE.WMS,
- layerGroup: 'sewer:pipeline_group',
- typeName: 'sewer:pipeline',
- minZoom: 13,
- filter: 'mediumtype = \'鍛ㄨ竟鐜\'',
- index: 1
- },
- {
- code: 'alkaliline',
- name: '姹℃按绠＄嚎',
- sname: '姹℃按绠＄嚎',
- checked: false,
- type: SERVICE_TYPE.WMS,
- layerGroup: 'sewer:pipeline_group',
- typeName: 'sewer:pipeline',
- filter: 'mediumtype = \'姹℃按绠＄嚎\'',
- minZoom: 10,
- index: 1
- }
- ]
-}
diff --git a/src/conf/layers/LayerEvent.js b/src/conf/layers/LayerEvent.js
deleted file mode 100644
index 11352ed..0000000
--- a/src/conf/layers/LayerEvent.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * 浼佷笟搴旀�� event
- */
-import { SERVICE_TYPE } from '../Constants'
-export const LayerEvent = {
- code: 'njhx',
- name: '鍗椾含鍖栧',
- checked: false, // 榛樿閫変腑鐘舵��
- layers: [
- {
- code: 'sqjd',
- name: '鍗椾含鍖栧浜嬪墠闃舵',
- sname: '浜嬪墠闃舵',
- checked: false,
- minZoom: 16,
- type: SERVICE_TYPE.WMS,
- wmsLayers: 'sewer:Aemergency',
- icon: 'sewers/绐ㄤ簳.png'
- },
- {
- code: 'spjd',
- name: '鍗椾含鍖栧瀹℃壒闃舵',
- sname: '瀹℃壒闃舵',
- checked: false,
- minZoom: 16,
- type: '鍖婚櫌',
- typeName: 'sewer:emergency',
- // wfs: WFS_URL + '?TYPENAME=闆ㄧ瀛�',
- icon: 'sewers/闆ㄧ瀛�.png'
- },
- {
- code: 'sjwj',
- name: '鍗椾含鍖栧浜嬩欢瀹岀粨',
- sname: '浜嬩欢瀹岀粨',
- minZoom: 16,
- type: SERVICE_TYPE.WMS,
- typeName: 'sewer:firedike',
- checked: false
- }
- ]
-}
diff --git a/src/conf/layers/LayerResources.js b/src/conf/layers/LayerResources.js
deleted file mode 100644
index 927ea23..0000000
--- a/src/conf/layers/LayerResources.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * 浼佷笟搴旀�� event
- */
-import { SERVICE_TYPE } from '../Constants'
-export const LayerResources = {
- code: 'jlsh',
- name: '閲戦櫟鐭冲寲',
- checked: false, // 榛樿閫変腑鐘舵��
- layers: [
- {
- code: 'yj',
- name: '浜嬪墠闃舵',
- sname: '浜嬪墠闃舵',
- checked: false,
- minZoom: 16,
- type: SERVICE_TYPE.WMS,
- wmsLayers: 'sewer:Aemergency',
- icon: 'sewers/绐ㄤ簳.png'
- },
- {
- code: 'ybz',
- name: '瀹℃壒闃舵',
- sname: '瀹℃壒闃舵',
- checked: false,
- minZoom: 16,
- type: SERVICE_TYPE.WMS,
- typeName: 'sewer:Aemergency',
- // wfs: WFS_URL + '?TYPENAME=闆ㄧ瀛�',
- icon: 'sewers/闆ㄧ瀛�.png'
- },
- {
- code: 'fht',
- name: '浜嬩欢瀹岀粨',
- sname: '浜嬩欢瀹岀粨',
- minZoom: 16,
- type: SERVICE_TYPE.WMS,
- typeName: 'sewer:firedike',
- checked: false
- }
- ]
-}
--
Gitblit v1.8.0