From 8f560e479082084987d3d7521a7f42df7da72eba Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 31 三月 2021 18:01:15 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/LayerController/logic/WasteGas.js | 18 +++++++--
src/conf/Constants.js | 2
src/conf/layers/LayerArea.js | 2
src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue | 12 +++---
src/components/LayerController/logic/Company.js | 12 +----
src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue | 6 +--
src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue | 1
src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue | 5 ++
src/components/BaseNav/PublicBounced/GasComponents/EchartsTab.vue | 8 ++--
src/components/BaseNav/PublicBounced/PublicBounced.vue | 3 +
10 files changed, 39 insertions(+), 30 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EchartsTab.vue b/src/components/BaseNav/PublicBounced/GasComponents/EchartsTab.vue
index 697d24d..1016531 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EchartsTab.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EchartsTab.vue
@@ -4,10 +4,10 @@
<div class="main">
<div class="main-matter">
<el-row type="flex" class="row-bg row-item-one" justify="space-around">
- <el-col :span="12">姘哀鍖栫墿:{{ displayContent.Name }} 鏍囧噯: 100</el-col>
- <el-col :span="12">浜屾哀鍖栫～:{{ displayContent.DeptSname }} 鏍囧噯: 50</el-col>
- <el-col :span="12">鐑熷皹:{{ displayContent.EmissTypeName }} 鏍囧噯: 30</el-col>
- <el-col :span="12">搴熸皵娴侀噺:{{ displayContent.EmissTypeName }}</el-col>
+ <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>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue b/src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue
index ebf7ddd..a4c6dbd 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue
@@ -46,6 +46,7 @@
.main-matter{
font-size: 13px;
font-weight: normal;
+ padding: 10px 6px;
border: 1px solid #396d83;
.row-item-one{
margin-bottom: 7px;
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue b/src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue
index 54b47c0..cb65c0c 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue
@@ -12,8 +12,11 @@
</template>
<script>
+// import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
export default {
- name: 'GasTabs'
+ name: 'GasTabs',
+ components: {}
+ // GasECharts
}
</script>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue b/src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue
index edc6aaa..9519388 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue
@@ -28,11 +28,9 @@
background-color: rgba(33, 41, 69,0.9);
}
.main {
- width: 100%;
- height: 100%;
- padding: 5px;
+ border: 1px solid #396d83;
+ padding: 6px;
.main-video {
- //border: 1px solid #396d83;
width: 100%;
height: 100%;
video {
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
index b60d7b7..3d7c83d 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
@@ -6,9 +6,8 @@
<div class="border_corner border_corner_left_bottom"></div>
<div class="border_corner border_corner_right_bottom"></div>
<div class="main">
- <el-col class="main-video">
+ <div class="main-video">
<el-table
- border
tooltip-effect="dark"
:data="data"
>
@@ -20,7 +19,7 @@
<el-table-column prop="name" label="鍌ㄥ瓨閲�"></el-table-column>
<el-table-column prop="date" label="浜х敓瑁呯疆"></el-table-column>
</el-table>
- </el-col>
+ </div>
</div>
</div>
</template>
@@ -34,11 +33,11 @@
data: [{
date: '2016-05-03',
name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌�518鍖洪噾娌欐睙璺�'
+ address: '涓婃捣甯傛櫘闄�鍖�'
}, {
date: '2016-05-02',
name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙鍖洪噾娌�'
+ address: '涓婃捣甯傛櫘闄�鍖�'
}]
}
},
@@ -65,7 +64,8 @@
.main {
width: 100%;
height: 100%;
-
+ //padding: 10px 6px;
+ //border: 1px solid #396d83;
.main-video {
//border: 1px solid #396d83;
width: 100%;
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 1e15ccf..e0df2bb 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -26,6 +26,7 @@
import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'
+// import GasTabs from './GasComponents/GasTabs'
export default {
name: 'PublicBounced',
@@ -95,6 +96,7 @@
.public-bounced-content {
margin: 15px auto;
display: flex;
+ //align-items: center;
justify-content: space-around;
padding: 10px;
@@ -106,6 +108,7 @@
.public-bounced-content-right {
flex: 2;
+ //width: 48%;
height: 100%;
}
}
diff --git a/src/components/LayerController/logic/Company.js b/src/components/LayerController/logic/Company.js
index f4ff3f0..7ccce20 100644
--- a/src/components/LayerController/logic/Company.js
+++ b/src/components/LayerController/logic/Company.js
@@ -22,6 +22,7 @@
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
@@ -44,16 +45,9 @@
return '浼佷笟'
}
- this.clickListener = (layer) => {
- /* this.animalService.pulseEffect(e.latlng)
+ this.clickListener = (e) => {
+ this.animalService.pulseEffect(e.latlng)
console.log(e)
return this.PublicBounced.$el
- */
- console.log(layer)
}
-
- // 鍥哄簾鐐瑰嚮杩涜鐨� 鍐呭鐨勮缃�
- // SetSolidWasteContent (config, containerPopup) {
- // this.SolidWastePopup = containerPopup
- // }
}
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index bf0a41c..e120cfa 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -11,6 +11,7 @@
const ImagBright = '/assets/images/map/exhaust/fq_bright_green.png'
const mapApi = require('../../../api/mapApi').default
+const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
module.exports = function () {
/**
* 杩斿洖marker瀵硅薄鏁扮粍
@@ -43,14 +44,23 @@
this.bindTooltip = (layer) => {
console.log(layer)
- return '娴嬭瘯搴熸皵'
+ return '搴熸皵鐐�'
}
- this.clickListener = (e) => {
- console.log(e)
+ this.clickListener = async (e) => {
+ // console.log(e)
this.animalService.pulseEffect(e.latlng)
+ const dataValue = {
+ StoragePlaceId: e.layer.options.test.StoragePlaceId
+ }
+ const result = await mapApi.GetWasteGas(dataValue)
+ const PublicBounced = window.Vue.extend(publicBounced)
+ const instance = new PublicBounced()
+ instance.setData(result)
+ instance.$mount()
+ document.body.appendChild(instance.$el)
}
- // 涓嶅悓绫诲瀷鍥剧墖灏佽
+ // 涓嶅悓绫诲瀷鍥剧墖鍔犺浇
this.differentTypes = (ContrLevel) => {
var effectOfChange
if (ContrLevel === 1) {
diff --git a/src/conf/Constants.js b/src/conf/Constants.js
index ef780e6..455d6e2 100644
--- a/src/conf/Constants.js
+++ b/src/conf/Constants.js
@@ -8,7 +8,7 @@
wasteGasJcd: 'WasteGas.js',
wasteWaterJcd: 'WasteWater.js',
solidWasteJcd: 'SolidWaste.js',
- fsqy: 'Company.js'
+ sewersAreaGs: 'Company.js'
}
export const props = {
diff --git a/src/conf/layers/LayerArea.js b/src/conf/layers/LayerArea.js
index f3b9da5..4365756 100644
--- a/src/conf/layers/LayerArea.js
+++ b/src/conf/layers/LayerArea.js
@@ -13,7 +13,7 @@
name: '鍏徃',
sname: '鍏徃', // 琛ㄥ悕
checked: true, // 榛樿閫変腑鐘舵��
- wfs: WFS_URL + '?TYPENAME=鍏徃',
+ url: WFS_URL + '?TYPENAME=鍏徃',
minZoom: 10, // 鍦ㄦ寚瀹氱骇鍒樉绀�
childLayer: 'fsss,hbss' // 鍏宠仈PointLayers
},
--
Gitblit v1.8.0