From b9befd5f6bbafb7de11865cbbaa31ecdf19ed37f Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 31 三月 2021 16:53:27 +0800
Subject: [PATCH] 弹窗tab组件和video组件样式
---
src/components/LayerController/logic/WasteGas.js | 18 +++++++--
src/views/MapTemplate.vue | 61 ++++++++++--------------------
src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue | 8 ++--
src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue | 1
src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue | 5 ++
src/components/BaseNav/PublicBounced/PublicBounced.vue | 2
6 files changed, 45 insertions(+), 50 deletions(-)
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 3d868a1..ff75f41 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue
@@ -10,8 +10,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 93776b0..534c17a 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue
@@ -28,16 +28,16 @@
background-color: rgba(33, 41, 69,0.9);
}
.main {
- width: 100%;
- height: 100%;
+ border: 1px solid #396d83;
+ padding: 6px;
.main-video {
- //border: 1px solid #396d83;
width: 100%;
height: 100%;
video {
width: 100%;
height: 100%;
- outline: none;
+ //outline: none;
+ //margin: 6px;
}
}
}
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index ff6bfb2..1a63928 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -10,7 +10,7 @@
<PublicTable v-if="value === 'gufei'" :requestSolidWasteData="displayContent.StoragePlaceId"></PublicTable>
<GasECharts v-else></GasECharts>
<!-- <PublicTable></PublicTable>-->
- <!-- <GasECharts></GasECharts>-->
+<!-- <GasECharts></GasECharts>-->
</div>
<div class="public-bounced-content-right">
<GasVideo></GasVideo>
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/views/MapTemplate.vue b/src/views/MapTemplate.vue
index da61947..9a2be67 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -40,10 +40,10 @@
import Enterprise from '../components/table/enterprise'
// 搴曞浘涓氬姟js閫昏緫
// import AddWasteWaterHelper from '@components/BaseNav/WasteWater/WasteWater'
-import AddGasHelper from '@components/BaseNav/flueGas/flueGas'
+// import AddGasHelper from '@components/BaseNav/flueGas/flueGas'
import AddSolidWasteHelper from '@components/BaseNav/SolidWaste/SolidWaste'
import AddWasteWaterHelper from '@components/BaseNav/WasteWater/WasteWater'
-import AddGasHelper from '@components/BaseNav/flueGas/flueGas'
+// import AddGasHelper from '@components/BaseNav/flueGas/flueGas'
// // 鍏叡灞曠ず鏁版嵁
import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
import LayerFactory from '@components/LayerController/service/LayerFactory'
@@ -85,25 +85,6 @@
})
},
methods: {
- AddGasHelper () {
- const data = {
- companyId: 3900100145,
- id: '',
- monType: 2,
- userCode: 'wenchun.deng',
- monDuration: '',
- epName: '',
- secdDeptId: '',
- contrLevel: '',
- dataStatus: '',
- dataFlag: '',
- runStatus: '',
- emissTypeId: ''
- }
- const AddGas = new AddGasHelper({ map: this.map })
- AddGas.requestData(data)
- AddGas.SetPlueGasContent(this.config, this.$refs.PublicBounced)
- },
ChangeState () {
const data = {
companyId: 3900100145,
@@ -116,25 +97,25 @@
AddSolidWaste.requestData(data)
AddSolidWaste.SetSolidWasteContent(this.config, this.$refs.PublicBounced)
},
- AddGasHelper () {
- const data = {
- companyId: 3900100145,
- id: '',
- monType: 2,
- userCode: 'wenchun.deng',
- monDuration: '',
- epName: '',
- secdDeptId: '',
- contrLevel: '',
- dataStatus: '',
- dataFlag: '',
- runStatus: '',
- emissTypeId: ''
- }
- const AddGas = new AddGasHelper({ map: this.map })
- AddGas.requestData(data)
- AddGas.SetPlueGasContent(this.config, this.$refs.PublicBounced)
- },
+ // AddGasHelper () {
+ // const data = {
+ // companyId: 3900100145,
+ // id: '',
+ // monType: 2,
+ // userCode: 'wenchun.deng',
+ // monDuration: '',
+ // epName: '',
+ // secdDeptId: '',
+ // contrLevel: '',
+ // dataStatus: '',
+ // dataFlag: '',
+ // runStatus: '',
+ // emissTypeId: ''
+ // }
+ // const AddGas = new AddGasHelper({ map: this.map })
+ // AddGas.requestData(data)
+ // AddGas.SetPlueGasContent(this.config, this.$refs.PublicBounced)
+ // },
ChangeWaterState () {
const data = {
companyId: 3900100145,
--
Gitblit v1.8.0