From 2c17820e9807507c5bcf111f2bf96bf9b1e077f6 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期三, 31 三月 2021 18:05:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/assets/images/map-pages/icon/toolbox/fullscreen.png | 0
src/components/LayerController/logic/WasteGas.js | 18 +++++++--
src/components/panel/ToolBoxPanel.vue | 36 +++++++++++-------
src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue | 14 +++---
src/views/MapTemplate.vue | 14 ------
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/assets/images/map-pages/icon/toolbox/vertical.png | 0
src/components/BaseNav/PublicBounced/PublicBounced.vue | 3 +
src/assets/images/map-pages/icon/toolbox/cross.png | 0
12 files changed, 58 insertions(+), 47 deletions(-)
diff --git a/src/assets/images/map-pages/icon/toolbox/cross.png b/src/assets/images/map-pages/icon/toolbox/cross.png
index a045597..a7e8175 100644
--- a/src/assets/images/map-pages/icon/toolbox/cross.png
+++ b/src/assets/images/map-pages/icon/toolbox/cross.png
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/fullscreen.png b/src/assets/images/map-pages/icon/toolbox/fullscreen.png
index 6dc19a9..bf6d1e0 100644
--- a/src/assets/images/map-pages/icon/toolbox/fullscreen.png
+++ b/src/assets/images/map-pages/icon/toolbox/fullscreen.png
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/vertical.png b/src/assets/images/map-pages/icon/toolbox/vertical.png
index 37850c9..7eb3be5 100644
--- a/src/assets/images/map-pages/icon/toolbox/vertical.png
+++ b/src/assets/images/map-pages/icon/toolbox/vertical.png
Binary files differ
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..8f4e691 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,11 +64,12 @@
.main {
width: 100%;
height: 100%;
-
+ //padding: 10px 6px;
+ //border: 1px solid #396d83;
.main-video {
//border: 1px solid #396d83;
width: 100%;
- height: 100%;
+ min-height: 165px;
video {
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/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/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index 36b950d..1e47999 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -17,11 +17,11 @@
v-model="isShow[index]"
>
<el-button slot="reference" class="el-button"
- :class="active === index && checked? 'tools-panel-choose':''"
+ :class="active === index? 'tools-panel-choose':''"
@click.native="changeChoose(index)">
- <img :src="item.iconSelecd" alt="" v-if="active === index && checked"/>
+ <img :src="item.iconSelecd" alt="" v-if="active === index"/>
<img :src="item.icon" alt="" v-else/>
- <span v-if="active === index && checked">{{ item.label }}</span>
+ <span v-if="active === index">{{ item.label }}</span>
<span v-else class="default-span">{{ item.label }}</span>
</el-button>
<el-button v-for="(itemT,indexT) in item.items" :key="indexT" @click="choiceItem(itemT,indexT)"
@@ -297,18 +297,25 @@
this.drawLayer = this.L.layerGroup().addTo(this.map)
}
this.active = index
- this.isShow[index] = !this.isShow[index]
- if (this.checkbutton === index) {
- this.checked = !this.checked
- this.Selecd = -1
- } else {
- if (this.checkbutton === -1) {
- this.checked = !this.checked
- } else {
- this.checked = true
- }
+ // this.isShow[index] = !this.isShow[index]
+ // this.isShow[index - 1] = !this.isShow[index - 1]
+ // if (this.checkbutton === index) {
+ // this.checked = !this.checked
+ // this.Selecd = -1
+ // } else {
+ // if (this.checkbutton === -1) {
+ // this.checked = !this.checked
+ // } else {
+ // this.checked = true
+ // }
+ // }
+ // this.checkbutton = index
+ // console.log(this.isShow[index - 1])
+ console.log(this.basemapList)
+ for (let i = 0; i < this.isShow.length; i++) {
+ this.isShow[i] = false
}
- this.checkbutton = index
+ this.isShow[index] = true
},
choiceItem (itemT, indexT) {
this.Selecd = indexT
@@ -414,6 +421,7 @@
},
changeSelectMouse () {
this.selectGroup = true
+ this.isShow = []
}
}
}
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index e3e491d..c3a06ce 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -39,7 +39,7 @@
import LegendPanel from '@components/panel/LegendPanel'
import Enterprise from '../components/table/enterprise'
// 搴曞浘涓氬姟js閫昏緫
-import AddSolidWasteHelper from '@components/BaseNav/SolidWaste/SolidWaste'
+
import AddWasteWaterHelper from '@components/BaseNav/WasteWater/WasteWater'
import AddGasHelper from '@components/BaseNav/flueGas/flueGas'
// // 鍏叡灞曠ず鏁版嵁
@@ -82,18 +82,6 @@
})
},
methods: {
- ChangeState () {
- const data = {
- companyId: 3900100145,
- userCode: 'wenchun.deng',
- name: '',
- marginWarr: '',
- longDayWarr: ''
- }
- const AddSolidWaste = new AddSolidWasteHelper({ map: this.map })
- AddSolidWaste.requestData(data)
- AddSolidWaste.SetSolidWasteContent(this.config, this.$refs.PublicBounced)
- },
AddGasHelper () {
const data = {
companyId: 3900100145,
--
Gitblit v1.8.0