From 2596ad89b4a57d2129f0a58cbc77d364eeaf412d Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期三, 31 三月 2021 16:57:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/assets/images/map-pages/icon/toolbox/fullscreen.png | 0
src/api/request.js | 2
src/components/panel/ToolBoxPanel.vue | 23 +++++--
src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue | 106 +++++++++++++++++++++++++++++------
src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue | 1
src/assets/images/map-pages/icon/toolbox/vertical.png | 0
src/components/BaseNav/PublicBounced/PublicBounced.vue | 19 ++----
src/assets/images/map-pages/icon/toolbox/cross.png | 0
src/components/LayerController/logic/SolidWaste.js | 13 ++++
9 files changed, 124 insertions(+), 40 deletions(-)
diff --git a/src/api/request.js b/src/api/request.js
index 5db8fa9..acdca70 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -9,7 +9,7 @@
})
}
export const FlueGas = (data = {}) => {
- return $http.post('/EPInterface/DataService/EPMapService.asmx/ObtainningConInfo', Qs.stringify(data), {
+ return $http.post('http://10.246.162.140:8080/EPInterface/DataService/EPMapService.asmx/ObtainningConInfo', Qs.stringify(data), {
headers: {
'Content-Type': 'application/json'
}
diff --git a/src/assets/images/map-pages/icon/toolbox/cross.png b/src/assets/images/map-pages/icon/toolbox/cross.png
new file mode 100644
index 0000000..a045597
--- /dev/null
+++ 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
new file mode 100644
index 0000000..6dc19a9
--- /dev/null
+++ 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
new file mode 100644
index 0000000..37850c9
--- /dev/null
+++ b/src/assets/images/map-pages/icon/toolbox/vertical.png
Binary files differ
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue b/src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue
index 93776b0..edc6aaa 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue
@@ -30,6 +30,7 @@
.main {
width: 100%;
height: 100%;
+ padding: 5px;
.main-video {
//border: 1px solid #396d83;
width: 100%;
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
index b9fae10..b60d7b7 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
@@ -1,20 +1,27 @@
<template>
- <div class="public-table">
- <el-col class="el-col">
- <el-table
- border
- tooltip-effect="dark"
- :data="data"
- >
- <el-table-column prop="name" label="搴忓彿"></el-table-column>
- <el-table-column prop="name" label="绫诲埆"></el-table-column>
- <el-table-column prop="date" label="鍥哄簾鍚嶇О"></el-table-column>
- <el-table-column prop="address" label="浠ｇ爜"></el-table-column>
- <el-table-column prop="address" label="浜х敓閲�"></el-table-column>
- <el-table-column prop="name" label="鍌ㄥ瓨閲�"></el-table-column>
- <el-table-column prop="date" label="浜х敓瑁呯疆"></el-table-column>
- </el-table>
- </el-col>
+ <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>
+ <div class="main">
+ <el-col class="main-video">
+ <el-table
+ border
+ tooltip-effect="dark"
+ :data="data"
+ >
+ <el-table-column prop="name" label="搴忓彿"></el-table-column>
+ <el-table-column prop="name" label="绫诲埆"></el-table-column>
+ <el-table-column prop="date" label="鍥哄簾鍚嶇О"></el-table-column>
+ <el-table-column prop="address" label="浠ｇ爜"></el-table-column>
+ <el-table-column prop="address" label="浜х敓閲�"></el-table-column>
+ <el-table-column prop="name" label="鍌ㄥ瓨閲�"></el-table-column>
+ <el-table-column prop="date" label="浜х敓瑁呯疆"></el-table-column>
+ </el-table>
+ </el-col>
+ </div>
</div>
</template>
@@ -24,7 +31,15 @@
props: ['requestSolidWasteData'],
data () {
return {
- data: []
+ data: [{
+ date: '2016-05-03',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌�518鍖洪噾娌欐睙璺�'
+ }, {
+ date: '2016-05-02',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙鍖洪噾娌�'
+ }]
}
},
mounted () {
@@ -42,7 +57,62 @@
</script>
<style lang="less" scoped>
-.public-table {
+.win {
+ position: relative;
+ background-color: rgba(33, 41, 69, 0.9);
+}
+.main {
+ width: 100%;
+ height: 100%;
+
+ .main-video {
+ //border: 1px solid #396d83;
+ width: 100%;
+ height: 100%;
+
+ video {
+ width: 100%;
+ height: 100%;
+ outline: none;
+ }
+ }
+}
+
+.border_corner {
+ z-index: 999;
+ position: absolute;
+ width: 14px;
+ height: 14px;
+ 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/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index cafd56b..1e15ccf 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,5 +1,5 @@
<template>
- <div class="public-bounced" v-if="flag">
+ <div class="public-bounced" v-draw v-if="flag">
<div class="public-bounced-title">
<span>{{ displayContent.Name }}</span>
<i class="el-icon-circle-close" @click="closePopup"></i>
@@ -7,11 +7,10 @@
<div class="public-bounced-content">
<div class="public-bounced-content-left">
<GasTab :displayContent="displayContent"></GasTab>
-<!-- <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>-->
- <GasECharts></GasECharts>
-<!-- <GasTabs></GasTabs>-->
- <!-- <PublicTable></PublicTable>-->
- <!-- <GasECharts></GasECharts>-->
+ <div class="public-bounced-content-left-bottom">
+ <PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>
+ <GasECharts v-else></GasECharts>
+ </div>
</div>
<div class="public-bounced-content-right">
<GasVideo></GasVideo>
@@ -24,17 +23,15 @@
import '@/components/BaseNav/SolidWaste/directive/dir'
import GasTab from '@components/BaseNav/PublicBounced/GasComponents/GasTab'
-// import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
+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',
components: {
- // GasTabs,
GasTab,
- // PublicTable,
+ PublicTable,
GasECharts,
GasVideo
},
@@ -98,7 +95,6 @@
.public-bounced-content {
margin: 15px auto;
display: flex;
- //align-items: center;
justify-content: space-around;
padding: 10px;
@@ -110,7 +106,6 @@
.public-bounced-content-right {
flex: 2;
- //width: 48%;
height: 100%;
}
}
diff --git a/src/components/LayerController/logic/SolidWaste.js b/src/components/LayerController/logic/SolidWaste.js
index dd48fcc..e12ae43 100644
--- a/src/components/LayerController/logic/SolidWaste.js
+++ b/src/components/LayerController/logic/SolidWaste.js
@@ -52,6 +52,8 @@
this.clickListener = async (e) => {
this.animalService.pulseEffect(e.latlng)
+ // this.setPanTo(e.latlng, 200)
+ console.log(e)
const dataValue = {
StoragePlaceId: e.layer.options.test.StoragePlaceId
}
@@ -59,11 +61,20 @@
// console.log(result)
const PublicBounced = window.Vue.extend(publicBounced)
const instance = new PublicBounced()
- instance.setData(result, 'gufei')
instance.$mount()
document.body.appendChild(instance.$el)
+ instance.setData(result, 'gufei')
}
+ // panTo
+ // this.setPanTo = (pos, value) => {
+ // var position = pos
+ // position = this.map.latLngToLayerPoint(position)
+ // position.y += value
+ // position = this.map.layerPointToLatLng(position)
+ // this.map.flyTo(position)
+ // }
+
// 涓嶅悓绫诲瀷鍥剧墖灏佽
this.differentTypes = (judgeValue) => {
var effectOfChange
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index 0e88c14..36b950d 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -9,14 +9,16 @@
<transition name="animationChange">
<el-row v-show="selectGroup" class="specific-tools-group">
<el-popover
+ trigger="manual"
placement="bottom"
- trigger="click"
:popper-class="'tools-panel-content'"
v-for="(item,index) in menuList" :key="index"
:width="item.index === '2'?230 : 150"
+ v-model="isShow[index]"
>
- <el-button slot="reference" class="el-button" :class="active === index && checked? 'tools-panel-choose':''"
- @click="changeChoose(index)">
+ <el-button slot="reference" class="el-button"
+ :class="active === index && checked? 'tools-panel-choose':''"
+ @click.native="changeChoose(index)">
<img :src="item.iconSelecd" alt="" v-if="active === index && checked"/>
<img :src="item.icon" alt="" v-else/>
<span v-if="active === index && checked">{{ item.label }}</span>
@@ -83,6 +85,11 @@
import distance from '@assets/images/map-pages/icon/toolbox/juli.png'
import mm from '@assets/images/map-pages/icon/toolbox/M2.png'
+// 涓嬭浇
+import FullScreen from '@assets/images/map-pages/icon/toolbox/fullscreen.png'
+import cross from '@assets/images/map-pages/icon/toolbox/cross.png'
+import vertical from '@assets/images/map-pages/icon/toolbox/vertical.png'
+
// 娴嬮噺鐨勬柟娉�
import Measure from '@/components/plugin/MeaSure'
@@ -90,7 +97,7 @@
name: 'ToolBoxPanel',
data () {
return {
- isShow: false,
+ isShow: [],
currentBaseMapCode: 'tianditu_img',
basemapList: [],
selectGroup: false,
@@ -230,19 +237,19 @@
{
index: '4-1',
label: '鍏ㄥ睆',
- icon: '',
+ icon: FullScreen,
title: '鍏ㄥ睆'
},
{
index: '4-2',
label: 'A4妯悜',
- icon: '',
+ icon: cross,
title: 'A4妯悜'
},
{
index: '4-3',
label: 'A4绾靛悜',
- icon: '',
+ icon: vertical,
title: 'A4绾靛悜'
}
]
@@ -265,7 +272,6 @@
methods: {
updateBasemapList () {
this.basemapList = this.basemapHelper.getBasemapList()
- console.log()
},
changeBasemap (itm) {
this.active = -1
@@ -291,6 +297,7 @@
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
--
Gitblit v1.8.0