From 7d3d36128ecd599c7294191fe7ddeddd9de7cec4 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 31 三月 2021 21:15:24 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/logic/WasteGas.js | 2
src/assets/css/map/map-panel-style.less | 11 ++
src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue | 54 +++++++---
src/components/panel/ToolBoxPanel.vue | 21 +--
src/components/BaseNav/WasteWater/WasteWater.js | 1
src/components/LayerController/logic/Company.js | 21 ++-
src/views/MapTemplate.vue | 6
src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue | 85 ++++++++++++++--
src/components/BaseNav/PublicBounced/GasComponents/EchartsTab.vue | 63 +++---------
9 files changed, 163 insertions(+), 101 deletions(-)
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index 0f1628e..2a9b8ee 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -191,3 +191,14 @@
.popper__arrow {
display: none !important;
}
+
+.el-tabs--card>.el-tabs__header .el-tabs__nav{
+ border: none;
+}
+
+.el-tabs--card>.el-tabs__header .el-tabs__item{
+ border: none;
+ margin-left: 10px;
+}
+
+
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EchartsTab.vue b/src/components/BaseNav/PublicBounced/GasComponents/EchartsTab.vue
index 1016531..1ab150f 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EchartsTab.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EchartsTab.vue
@@ -1,17 +1,10 @@
<template>
- <!-- 妗� -->
- <div class="win">
- <div class="main">
- <div class="main-matter">
- <el-row type="flex" class="row-bg row-item-one" justify="space-around">
- <el-col :span="6">姘哀鍖栫墿:{{ displayContent.Name }} 鏍囧噯: 100</el-col>
- <el-col :span="6">浜屾哀鍖栫～:{{ displayContent.DeptSname }} 鏍囧噯: 50</el-col>
- <el-col :span="6">鐑熷皹:{{ displayContent.EmissTypeName }} 鏍囧噯: 30</el-col>
- <el-col :span="6">搴熸皵娴侀噺:{{ displayContent.EmissTypeName }}</el-col>
- </el-row>
- </div>
- </div>
- </div>
+ <div class="Infomation">
+ <el-tag>姘哀鍖栫墿: 29.93 鏍囧噯: 100</el-tag>
+ <el-tag>浜屾哀鍖栫～: 17.34鏍囧噯: 50</el-tag>
+ <el-tag>鐑熷皹: 6.93鏍囧噯: 30</el-tag>
+ <el-tag>搴熸皵娴侀噺: 120343.18</el-tag>
+ </div>
</template>
<script>
@@ -25,40 +18,16 @@
</script>
<style scoped lang="less">
-
-.win {
- position: relative;
- margin-bottom: 13px;
- background-color: rgba(33, 41, 69,0.9);
-}
-.main {
- width: 100%;
- height: 100%;
- .main-matter{
- font-size: 13px;
- font-weight: normal;
- border: 1px solid #396d83;
- .row-item-one{
- margin-bottom: 7px;
+ .Infomation{
+ margin-left: 10px;
}
- .el-row {
- width: 100%;
- color: #00d0f9;
- display: flex;
- font-size: 12px !important;
- .el-col{
- flex: 1;
- width: 100%;
- background-color: #243a55;;
- text-align: center;
- line-height: 28px;
- margin-left: 6px;
- border-radius: 4px;
- &:nth-child(1){
- margin-left:0;
- }
- }
+ .el-tag{
+ height: 25px;
+ line-height: 25px;
+ margin-right: 10px;
+ font-size: 10px;
+ background-color: rgba(0, 255, 246, 0.14);
+ color: #00d0f9;
+ border: none;
}
- }
-}
</style>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue b/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue
index bd1e845..dd4da05 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue
@@ -1,7 +1,5 @@
<template>
- <div class="main">
- <div id="echarts" ref="main"></div>
- </div>
+ <div style="width:670px;height:260px;" id="echarts" ref="main"></div>
</template>
<script>
@@ -25,7 +23,32 @@
}
},
legend: {
- data: ['姘哀鍖栫墿', '浜屾哀鍖栫～', '鐑熷皹', '搴熸皵娴侀噺']
+ x: '200px',
+ y: '30px',
+ data: [{
+ name: '姘哀鍖栫墿',
+ textStyle: {
+ color: '#00d0f9'
+ }
+ },
+ {
+ name: '浜屾哀鍖栫～',
+ textStyle: {
+ color: '#00d0f9'
+ }
+ },
+ {
+ name: '鐑熷皹',
+ textStyle: {
+ color: '#00d0f9'
+ }
+ },
+ {
+ name: '搴熸皵娴侀噺',
+ textStyle: {
+ color: '#00d0f9'
+ }
+ }]
// pageTextStyle: {
// color: '#fff'
// }
@@ -34,7 +57,7 @@
left: '3%',
right: '1%',
bottom: '3%',
- top: '10%',
+ // top: '1%',
containLabel: true
},
toolbox: {
@@ -92,6 +115,7 @@
// Y 杞寸殑璁剧疆
yAxis: [{
type: 'value',
+ // position: 'left', // 澶� Y 杞翠娇鐢�
// name: yname, // 鍚庢湡鍥炬爣Y杞存樉绀哄崟浣�
name: '娴撳害(mg/m鲁)',
axisLabel: {
@@ -150,14 +174,14 @@
</script>
<style scoped lang="less">
- .main{
- background: rgba(255, 255, 255, 0.1);
- }
- #echarts{
- width: 600px;
- height: 260px;
- position: relative;
- margin: 0;
- padding: 0;
- }
+ #echarts{
+ width: 670px!important;
+ height: 260px!important;
+ //position: relative;
+ margin: 0;
+ padding: 0;
+ /*background-color: rgba(0, 0, 0, 0.6);*/
+ border: 1px solid #396d83;
+ margin: 10px 10px 10px 10px;
+ }
</style>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue b/src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue
index cb65c0c..44f8842 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue
@@ -1,25 +1,82 @@
<template>
-<div>
- <el-tabs v-model="activeName">
- <el-tab-pane label="瀹炶瘯鏁版嵁" name="first">瀹炶瘯鏁版嵁</el-tab-pane>
- <el-tab-pane label="鏃ユ暟鎹�" name="second">鏃ユ暟鎹�</el-tab-pane>
- <el-tab-pane label="鏈堟暟鎹�" name="third">鏈堟暟鎹�</el-tab-pane>
- <el-tab-pane label="浜哄伐鏁版嵁" name="fourth">浜哄伐鏁版嵁</el-tab-pane>
- </el-tabs>
-<!-- <EchartsTab></EchartsTab>-->
-<!-- <GasECharts></GasECharts>>-->
-</div>
+ <div class="win">
+ <div class="border_corner border_corner_left_top"></div>
+ <div class="border_corner border_corner_right_top"></div>
+ <div class="border_corner border_corner_left_bottom"></div>
+ <div class="border_corner border_corner_right_bottom"></div>
+ <el-tabs type="card" v-model="activeName">
+ <el-tab-pane label="瀹炶瘯鏁版嵁" name="first">
+ <EchartsTab></EchartsTab>
+ <GasECharts></GasECharts>
+ </el-tab-pane>
+ <el-tab-pane label="鏃ユ暟鎹�" name="second"><EchartsTab></EchartsTab><GasECharts></GasECharts></el-tab-pane>
+ <el-tab-pane label="鏈堟暟鎹�" name="third"><EchartsTab></EchartsTab><GasECharts></GasECharts></el-tab-pane>
+ <el-tab-pane label="浜哄伐鏁版嵁" name="fourth"><EchartsTab></EchartsTab><GasECharts></GasECharts></el-tab-pane>
+ </el-tabs>
+ </div>
</template>
<script>
-// import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
+import GasECharts from './GasECharts'
+import EchartsTab from './EchartsTab'
+
export default {
name: 'GasTabs',
- components: {}
- // GasECharts
+ components: {
+ GasECharts,
+ EchartsTab
+ },
+ data () {
+ return {
+ activeName: 'first'
+ }
+ },
+ methods: {
+ handleClick (tab, event) {
+ console.log(tab, event)
+ }
+ }
}
+
</script>
<style scoped>
-
+ .win {
+ position: relative;
+ margin-bottom: 13px;
+ background-color: rgba(33, 41, 69,0.9);
+ border: 0.8px solid #396d83;
+ }
+ .border_corner{
+ z-index: 999;
+ position: absolute;
+ width: 10px;
+ height: 10px;
+ background: rgba(0,0,0,0);
+ border: 1.5px solid #47d5ea;
+ }
+ .border_corner_left_top{
+ top: 0;
+ left: 0;
+ border-right: none;
+ border-bottom: none;
+ }
+ .border_corner_right_top{
+ top: 0;
+ right: 0;
+ border-left: none;
+ border-bottom: none;
+ }
+ .border_corner_left_bottom{
+ bottom: 0;
+ left: 0;
+ border-right: none;
+ border-top: none;
+ }
+ .border_corner_right_bottom{
+ bottom: 0;
+ right: 0;
+ border-left: none;
+ border-top: none;
+ }
</style>
diff --git a/src/components/BaseNav/WasteWater/WasteWater.js b/src/components/BaseNav/WasteWater/WasteWater.js
index 05f7b50..1847391 100644
--- a/src/components/BaseNav/WasteWater/WasteWater.js
+++ b/src/components/BaseNav/WasteWater/WasteWater.js
@@ -30,7 +30,6 @@
DrawWasteWaterContent (data) {
// 鍥炬爣鏍峰紡鎵╁睍
const WasteWaterIcon = this.WasteWaterIcon()
-
// //鍔犺浇鏁版嵁鍓嶅鏋滃瓨鍦ㄥ浘灞傜粍 閭ｄ箞娓呴櫎鎺�
if (this.WasteWaterLayerGroup) {
this.WasteWaterLayerGroup.clearLayers()
diff --git a/src/components/LayerController/logic/Company.js b/src/components/LayerController/logic/Company.js
index 7ccce20..a9a51c9 100644
--- a/src/components/LayerController/logic/Company.js
+++ b/src/components/LayerController/logic/Company.js
@@ -19,10 +19,10 @@
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])
+ // console.log(data[i])
// 缁忕含搴� 浣嶇疆
const positionX = data[i].Latitude
const positionY = data[i].Longitude
@@ -33,7 +33,14 @@
iconUrl: iconUrl,
iconSize: [50, 50],
iconAnchor: [25, 25]
- })
+ }),
+ test: data[i]
+ })
+ marker.bindTooltip(data[i].name, {
+ permanent: true,
+ offset: [0, -16],
+ direction: 'top',
+ className: ''
})
layer.addLayer(marker)
@@ -41,13 +48,13 @@
}
this.bindTooltip = (layer) => {
- console.log(layer)
- return '浼佷笟'
+ // console.log(layer)
+ // return layer.options.test.name
}
this.clickListener = (e) => {
- this.animalService.pulseEffect(e.latlng)
+ // this.animalService.pulseEffect(e.latlng)
console.log(e)
- return this.PublicBounced.$el
+ // return this.PublicBounced.$el
}
}
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index 9f99756..1d34a3b 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -37,7 +37,7 @@
test: data[i],
icon: L.icon({
iconUrl: iconUrl,
- iconSize: [20, 20],
+ iconSize: [50, 50],
iconAnchor: [25, 25]
})
})
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index 2a9bf26..79b4693 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -30,7 +30,7 @@
<img :src="itemT.icon" :title="itemT.title" alt="" v-else/>
</el-button>
<div class="base-map-inner-panel" v-show="item.index==='2'">
- <div v-for="item in basemapList" :key="item.code" class="basemap-layer-item">
+ <div v-for="item in basemapHelper.basemapList" :key="item.code" class="basemap-layer-item">
<img class="base-map-img" width="50" height="50" :src="item.conf.icon_actived" :title="item.name"
@click="changeBasemap(item)" alt=""/>
<el-checkbox class="base-map-anno" name="basemap" v-model="item.conf.annotationCheck"
@@ -262,23 +262,16 @@
return this.$store.state.map.basemapHelper
}
},
- watch: {
- basemapHelper (newVal) {
- if (newVal != null) {
- this.updateBasemapList()
- }
- }
- },
methods: {
- updateBasemapList () {
- this.basemapList = this.basemapHelper.getBasemapList()
+ init (map) {
+ this.map = map
+ this.toolBoxPanelVisible = true
},
changeBasemap (itm) {
this.active = -1
const code = itm.code
- this.basemapList.forEach((item) => {
+ this.basemapHelper.basemapList.forEach((item) => {
if (item.code === code) {
- console.log(this.currentBaseMapCode)
if (this.currentBaseMapCode == null || this.currentBaseMapCode !== code) {
this.currentBaseMapCode = code
this.basemapHelper.showBasemap(item.code, item.conf.annotationCheck, true)
@@ -286,7 +279,7 @@
this.basemapHelper.showBasemap(item.code, item.conf.annotationCheck, false)
}
- this.basemapHelper.getBasemapList().forEach((item) => {
+ this.basemapHelper.basemapList.forEach((item) => {
item.layer.bringToBack()
})
}
@@ -297,6 +290,7 @@
this.drawLayer = this.L.layerGroup().addTo(this.map)
}
this.active = index
+ console.log(this.basemapList)
for (let i = 0; i < this.isShow.length; i++) {
if (i !== index) {
this.isShow[i] = false
@@ -304,6 +298,7 @@
}
// debugger
this.isShow[index] = !this.isShow[index]
+ this.isShow[index] ? (this.active = index) : (this.active = '')
},
choiceItem (itemT, indexT) {
this.Selecd = indexT
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 50d509b..2da8ce0 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -68,7 +68,8 @@
lcServiceLayerVisible: false,
basemapHelper: {},
serviceLayerHelper: {},
- vectorLayerHelper: {}
+ vectorLayerHelper: {},
+ toolBoxVisible: false
}
},
computed: {
@@ -132,7 +133,6 @@
init () {
const mapcontainer = this.$refs.rootmap
this.map = Sgis.initMap(mapcontainer)
- this.$refs.toolBox.map = this.map
window.popupComp = this.$refs.popup
var layerFactory = new LayerFactory({
@@ -154,7 +154,7 @@
// this.AddGasHelper()
// this.ChangeWaterState()
-
+ this.$refs.toolBox.init(this.map)
this.saveMapStatus()
// this.setMapObj(this.mapObj)
// this.setBasemapHelper(this.basemapHelper)
--
Gitblit v1.8.0