From 2b2263521e954131d69174788fd90874dbc21436 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期二, 20 四月 2021 17:53:55 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/table/summarySheets.vue | 4 +-
src/assets/css/map/map-panel-style.less | 19 ++++++---
src/utils/dialogDrag.js | 2
src/conf/layers/LayerEnvRisk.js | 12 ++++-
src/components/LayerController/logic/Company.js | 11 ++++-
src/components/LayerController/service/BusiLayerService.js | 3 +
src/conf/layers/LayerSoilGroundWater.js | 9 +++-
src/components/LayerController/service/LayerFactory.js | 3 +
src/views/popup/Popup.vue | 3 +
src/components/LayerController/modules/LcServiceLayer.vue | 3 +
10 files changed, 47 insertions(+), 22 deletions(-)
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index 751ab6a..0a4a136 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -268,18 +268,18 @@
/***************Company 鍥惧眰 鎮诞妗嗘牱寮忋��*********************************/
.company-bindTooltip {
position: absolute;
- top: 0;
- left: 0;
+ top: 10px;
+ left: 8px;
display: flex;
justify-content: center;
justify-items: center;
img {
display: block;
- width: 30px;
- height: 30px;
- margin-left: -15px;
- margin-top: -15px
+ width: 35px;
+ height: 35px;
+ margin-left: -16px;
+ margin-top: -16px
}
ul {
@@ -647,3 +647,10 @@
.fixed-table {
background: rgba(0, 16, 30, 1) !important;
}
+/****************************绉佹湁***/
+.baoBiao{
+ .el-dialog.el-dialog--center{
+ top:100px;
+ left: 100px;
+ }
+}
diff --git a/src/components/LayerController/logic/Company.js b/src/components/LayerController/logic/Company.js
index f88c2e9..8c4bd07 100644
--- a/src/components/LayerController/logic/Company.js
+++ b/src/components/LayerController/logic/Company.js
@@ -3,6 +3,7 @@
*/
// 鍖哄垎涓嶅悓绫诲瀷 浣跨敤涓嶅悓img
const companyImg = '/assets/images/map/company_refining.png'
+const companyOil = '/assets/images/map/company_oil.png'
const mapApi = require('../../../api/mapApi').default
const AnimalService = require('../service/AnimalService').default
@@ -19,15 +20,19 @@
layer: layer
})
const res = await mapApi.getCompany()
- console.log(res)
+ // console.log(res)
const data = res.Result.DataInfo || {}
for (let i = 0; i < data.length; i++) {
// console.log(data[i])
// 缁忕含搴� 浣嶇疆
const positionX = data[i].Latitude
const positionY = data[i].Longitude
-
var iconUrl = companyImg
+ if (data[i].type) {
+ if (data[i].type === 2) {
+ iconUrl = companyOil
+ }
+ }
const htmls = '<div><img src="' + iconUrl + '"><ul><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li></ul></div>'
var myIcon = L.divIcon({
html: htmls,
@@ -58,7 +63,7 @@
* 鐐逛綅榧犳爣绉诲叆寮规
* */
this.bindTooltip = (layer) => {
- console.log(layer)
+ // console.log(layer)
return '<div class="company-bindTooltip-hover"><h3>姹℃煋鐗╀骇鐢熺粺璁�</h3><ul>' +
'<li>鐢熶骇璁炬柦锛�30锛堜釜锛�</li>' +
'<li>娌荤悊璁炬柦锛�30锛堜釜锛�</li>' +
diff --git a/src/components/LayerController/modules/LcServiceLayer.vue b/src/components/LayerController/modules/LcServiceLayer.vue
index 3f3c2b3..323d75a 100644
--- a/src/components/LayerController/modules/LcServiceLayer.vue
+++ b/src/components/LayerController/modules/LcServiceLayer.vue
@@ -95,7 +95,8 @@
.wms-panel-scrollbar{
height: 457px;
- width: 2.5rem;
+ width: 285px;
+ //width: 2.5rem;
font-size: 14px;
}
.layerbox {
diff --git a/src/components/LayerController/service/BusiLayerService.js b/src/components/LayerController/service/BusiLayerService.js
index 0a8f958..65166db 100644
--- a/src/components/LayerController/service/BusiLayerService.js
+++ b/src/components/LayerController/service/BusiLayerService.js
@@ -22,7 +22,8 @@
var busiLayer = new BusiLayer()
busiLayer.init(layer, this.L)
if (busiLayer.bindTooltip) {
- layer.bindTooltip(busiLayer.bindTooltip)
+ // 鍏ㄥ眬tips浣嶇疆
+ layer.bindTooltip(busiLayer.bindTooltip, { direction: 'top', offset: [0, -15], sticky: false })
}
// 璋冪敤click浜嬩欢
if (busiLayer.clickListener) {
diff --git a/src/components/LayerController/service/LayerFactory.js b/src/components/LayerController/service/LayerFactory.js
index adb3d9f..5aedc79 100644
--- a/src/components/LayerController/service/LayerFactory.js
+++ b/src/components/LayerController/service/LayerFactory.js
@@ -55,7 +55,8 @@
var layer = (logic && logic.initLayer && logic.initLayer((this.L))) || this.L.featureGroup({})
if (logic.bindTooltip) {
- layer.bindTooltip(logic.bindTooltip)
+ // 鍏ㄥ眬tips浣嶇疆
+ layer.bindTooltip(logic.bindTooltip, { direction: 'top', offset: [0, -15], sticky: false })
}
// 璋冪敤click浜嬩欢
if (logic.clickListener) {
diff --git a/src/components/table/summarySheets.vue b/src/components/table/summarySheets.vue
index ad700e3..a5d73eb 100644
--- a/src/components/table/summarySheets.vue
+++ b/src/components/table/summarySheets.vue
@@ -1,6 +1,6 @@
<template>
<div class="summary-sheets">
- <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="鎶ヨ〃" placement="left">
+ <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="" placement="left">
<div :class='["iconBtn",subtopic ? "active-button" : ""]' @click="subtopicBtn" >
<i class="el-icon-tickets icon"></i>
</div>
@@ -28,7 +28,7 @@
</el-tooltip>
</div>
</transition>
- <Dialog ref="summarySheets" title="鎶ヨ〃" >
+ <Dialog ref="summarySheets" title="鎶ヨ〃" class="baoBiao" >
<tab-handover></tab-handover>
</Dialog>
<Dialog ref="warnDialog" title="棰勬姤璀�" >
diff --git a/src/conf/layers/LayerEnvRisk.js b/src/conf/layers/LayerEnvRisk.js
index def8c62..51ea802 100644
--- a/src/conf/layers/LayerEnvRisk.js
+++ b/src/conf/layers/LayerEnvRisk.js
@@ -38,7 +38,6 @@
name: '涓�绾ч闄�',
sname: '涓�绾ч闄�',
checked: false, // 榛樿閫変腑鐘舵��
- wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�',
minZoom: 10,
color: 'sandybrown'
},
@@ -46,10 +45,17 @@
code: 'envRiskSecond',
name: '浜岀骇椋庨櫓',
sname: '浜岀骇椋庨櫓',
- checked: false, // 榛樿閫変腑鐘舵��
- wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�',
+ checked: false,
minZoom: 10,
color: 'yellow'
+ },
+ {
+ code: 'envRiskThird',
+ name: '涓夌骇椋庨櫓',
+ sname: '涓夌骇椋庨櫓',
+ checked: false,
+ minZoom: 10,
+ color: 'green'
}
]
}
diff --git a/src/conf/layers/LayerSoilGroundWater.js b/src/conf/layers/LayerSoilGroundWater.js
index b042c48..b7d1e28 100644
--- a/src/conf/layers/LayerSoilGroundWater.js
+++ b/src/conf/layers/LayerSoilGroundWater.js
@@ -27,21 +27,24 @@
name: '涓�绾ч闄╁湴鍧�',
sname: '涓�绾ч闄╁湴鍧�',
checked: false, // 榛樿閫変腑鐘舵��
- wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�'
+ wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�',
+ color: 'red'
},
{
code: 'secondRiskBlock',
name: '浜岀骇椋庨櫓鍦板潡',
sname: '浜岀骇椋庨櫓鍦板潡',
checked: false, // 榛樿閫変腑鐘舵��
- wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�'
+ wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�',
+ color: 'yellow'
},
{
code: 'threeRiskBlock',
name: '涓夌骇椋庨櫓鍦板潡',
sname: '涓夌骇椋庨櫓鍦板潡',
checked: false, // 榛樿閫変腑鐘舵��
- wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�'
+ wfs: WFS_URL + '?TYPENAME=瑁呯疆鍖�',
+ color: 'green'
}
]
}
diff --git a/src/utils/dialogDrag.js b/src/utils/dialogDrag.js
index a797fe8..3c7b596 100644
--- a/src/utils/dialogDrag.js
+++ b/src/utils/dialogDrag.js
@@ -10,7 +10,7 @@
dialogHeaderEl.style.cssText += ';cursor:move;'
//console.log(dragDom.style.cssText)
//dragDom.style.cssText += ';top:0px;'
- dragDom.style.cssText = 'bottom:15px;'
+ // dragDom.style.cssText = 'bottom:15px;'
// 鑾峰彇鍘熸湁灞炴�� ie dom鍏冪礌.currentStyle 鐏嫄璋锋瓕 window.getComputedStyle(dom鍏冪礌, null);
const sty = (function () {
diff --git a/src/views/popup/Popup.vue b/src/views/popup/Popup.vue
index eece635..b2fe8db 100644
--- a/src/views/popup/Popup.vue
+++ b/src/views/popup/Popup.vue
@@ -73,8 +73,9 @@
}
},
setDatas (layer) {
+ console.log(layer)
this.tabs = [{
- title: layer.feature.id,
+ title: layer.feature.properties.pipename || layer.feature.id,
name: '1'
}]
this.properties = layer.feature.properties
--
Gitblit v1.8.0