From 9d0f25c1fbbab74ee9d94a48817a4546f6edf176 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期一, 29 三月 2021 16:06:44 +0800
Subject: [PATCH] 弹出框所有内容修改
---
/dev/null | 54 ---------------------------
src/assets/images/map-pages/basenav/flugas/green_airquality_2.png | 0
src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue | 0
src/views/MapTemplate.vue | 2
src/assets/images/map-pages/basenav/flugas/green_airquality_3.png | 0
src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue | 0
src/components/BaseNav/PublicBounced/GasComponents/GasTable.vue | 0
src/components/BaseNav/PublicBounced/PublicBounced.vue | 29 +++++++++-----
src/components/BaseNav/flueGas/flueGas.js | 4 +-
9 files changed, 21 insertions(+), 68 deletions(-)
diff --git a/src/components/flueGas/green_airquality_2.png b/src/assets/images/map-pages/basenav/flugas/green_airquality_2.png
similarity index 100%
rename from src/components/flueGas/green_airquality_2.png
rename to src/assets/images/map-pages/basenav/flugas/green_airquality_2.png
Binary files differ
diff --git a/src/components/flueGas/green_airquality_3.png b/src/assets/images/map-pages/basenav/flugas/green_airquality_3.png
similarity index 100%
rename from src/components/flueGas/green_airquality_3.png
rename to src/assets/images/map-pages/basenav/flugas/green_airquality_3.png
Binary files differ
diff --git a/src/components/flueGas/GasComponents/GasECharts.vue b/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue
similarity index 100%
rename from src/components/flueGas/GasComponents/GasECharts.vue
rename to src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue
diff --git a/src/components/flueGas/GasComponents/GasTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/GasTable.vue
similarity index 100%
rename from src/components/flueGas/GasComponents/GasTable.vue
rename to src/components/BaseNav/PublicBounced/GasComponents/GasTable.vue
diff --git a/src/components/flueGas/GasComponents/GasVideo.vue b/src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue
similarity index 100%
rename from src/components/flueGas/GasComponents/GasVideo.vue
rename to src/components/BaseNav/PublicBounced/GasComponents/GasVideo.vue
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index dab29fe..0522449 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,14 +1,17 @@
<template>
- <div class="public-bounced" v-show="flag">
+ <div class="public-bounced" v-draw v-show="flag">
<div class="public-bounced-title">
<span>{{ displayContent.Name }}</span>
<i class="el-icon-circle-close" @click="closePopup"></i>
</div>
<div class="public-bounced-content">
- <div class="public-bounced-content-left"></div>
- <div class="public-bounced-content-right"></div>
-<!-- <span>鍐呭</span>-->
- <popup-gas></popup-gas>
+ <div class="public-bounced-content-left">
+ <GasTable></GasTable>
+ <GasECharts></GasECharts>
+ </div>
+ <div class="public-bounced-content-right">
+ <GasVideo></GasVideo>
+ </div>
</div>
</div>
</template>
@@ -16,18 +19,22 @@
<script>
import '@/components/BaseNav/SolidWaste/directive'
+import GasTable from '@components/BaseNav/PublicBounced/GasComponents/GasTable'
+import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
+import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'
-import PopupGas from '@components/flueGas/popup-gas'
export default {
name: 'PublicBounced',
+ components: {
+ GasTable,
+ GasECharts,
+ GasVideo
+ },
data () {
return {
displayContent: [],
flag: false
}
- },
- components: {
- PopupGas
},
methods: {
setData (data) {
@@ -80,15 +87,15 @@
display: flex;
align-items: center;
justify-content: space-around;
+
.public-bounced-content-left {
width: 48%;
height: 400px;
- border: 1px red solid;
}
+
.public-bounced-content-right {
width: 48%;
height: 400px;
- border: 1px red solid;
}
}
diff --git a/src/components/flueGas/flueGas.js b/src/components/BaseNav/flueGas/flueGas.js
similarity index 96%
rename from src/components/flueGas/flueGas.js
rename to src/components/BaseNav/flueGas/flueGas.js
index e192167..0ab51b2 100644
--- a/src/components/flueGas/flueGas.js
+++ b/src/components/BaseNav/flueGas/flueGas.js
@@ -1,6 +1,6 @@
import { FlueGas } from '@/api/request'
-import defaultImg from '@components/flueGas/green_airquality_2.png'
-import Setting from '@components/flueGas/green_airquality_3.png'
+import defaultImg from '@assets/images/map-pages/basenav/flugas/green_airquality_2.png'
+import Setting from '@assets/images/map-pages/basenav/flugas/green_airquality_3.png'
// 鍥剧墖
class AddGasHelper {
diff --git a/src/components/flueGas/popup-gas.vue b/src/components/flueGas/popup-gas.vue
deleted file mode 100644
index a9de862..0000000
--- a/src/components/flueGas/popup-gas.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-<template>
- <div v-if="!isShow" class="popupGas">
- <el-row>
- <el-col :span="12">
- <el-row>
- <gas-table :displayContent="displayContent"></gas-table>
- </el-row>
- <el-row>
- <gas-e-charts></gas-e-charts>
- </el-row>
- </el-col>
- <el-col :span="12">
- <gas-video></gas-video>
- </el-col>
- </el-row>
- </div>
-</template>
-
-<script>
-import GasTable from '@components/flueGas/GasComponents/GasTable'
-import GasECharts from '@components/flueGas/GasComponents/GasECharts'
-import GasVideo from '@components/flueGas/GasComponents/GasVideo'
-
-export default {
- name: 'popup-gas',
- components: {
- GasTable,
- GasECharts,
- GasVideo
- },
- data: function () {
- return {
- isShow: false,
- displayContent: []
- }
- },
- methods: {
- // setDate (data) {
- // console.log(data)
- // this.displayContent = data
- // }
- }
-}
-</script>
-
-<style scoped lang="less">
-/deep/ .popupGas {
- color: #fff;
-
- .leaflet-popup-content-wrapper {
- width: 100% !important;
- }
-}
-</style>
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index e0e1dc4..681a454 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -42,7 +42,7 @@
import AddSolidWasteHelper from '@components/BaseNav/SolidWaste/SolidWaste'
// import SolidContent from '@components/SolidWaste/SolidContent'
// 搴熸皵
-import AddGasHelper from '@components/flueGas/flueGas'
+import AddGasHelper from '@components/BaseNav/flueGas/flueGas'
// import PopupGas from '@/components/flueGas/popup-gas'
// // 鍏叡灞曠ず鏁版嵁
import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
--
Gitblit v1.8.0