From b70fd76b13480fc4ec3f073aeafd9163c87fddd4 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期四, 01 四月 2021 15:29:31 +0800
Subject: [PATCH] 判断显示弹窗
---
src/components/LayerController/logic/WasteGas.js | 2
src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue | 2
src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue | 51 ++++++++++++-------------
src/components/BaseNav/PublicBounced/PublicBounced.vue | 18 ++++++---
4 files changed, 38 insertions(+), 35 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
index a99b76f..a35207d 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
@@ -60,7 +60,7 @@
.main-video {
width: 100%;
- min-height: 195px;
+ min-height: 164px;
video {
width: 100%;
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
index 42a4157..7625204 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
@@ -8,32 +8,29 @@
<div class="border_corner border_corner_right_bottom"></div>
<div class="main">
<div class="main-matter">
- <el-row type="flex" class="row-bg row-item-one" justify="space-around">
- <el-col :span="8">鐩戞祴鐐瑰悕绉�:{{ displayContentTab2.StoragePlaceName }}</el-col>
- <el-col :span="8">鐢熶骇鍗曚綅:{{ displayContentTab2.StoragePlaceName }}</el-col>
- <el-col :span="8">鎺掓斁绫诲瀷鍔犺浇:{{ displayContentTab2.DesignFloorArea }}</el-col>
- </el-row>
- <el-row type="flex" class="row-bg" justify="space-around">
- <el-col :span="8">鎺掓斁鍘诲悜:{{ displayContentTab2.StorageQty }}</el-col>
- <el-col :span="8">鎺у埗绾у埆鍚嶇О:{{ displayContentTab2.SurplusFloorArea }}</el-col>
- <el-col :span="8">鍐�/澶栨帓鍙�:{{ displayContentTab2.StorageDate }}</el-col>
- </el-row>
-<!-- <el-row type="flex" class="row-bg row-item-one" justify="space-around">-->
-<!-- <el-col :span="8">鐩戞祴鐐瑰悕绉�:{{ displayContent.Name }}</el-col>-->
-<!-- <el-col :span="8">鐢熶骇鍗曚綅:{{ displayContent.porltName }}</el-col>-->
-<!-- <el-col :span="8">鎺掓斁绫诲瀷鍔犺浇:{{ displayContent.MonTypeName }}</el-col>-->
-<!-- <!– <el-col :span="8">鐩戞祴鐐瑰悕绉�:{{ displayContentTab2.StoragePlaceName }}</el-col>–>-->
-<!-- <!– <el-col :span="8">鐢熶骇鍗曚綅:{{ displayContentTab2.StoragePlaceName }}</el-col>–>-->
-<!-- <!– <el-col :span="8">鎺掓斁绫诲瀷鍔犺浇:{{ displayContentTab2.DesignFloorArea }}</el-col>–>-->
-<!-- </el-row>-->
-<!-- <el-row type="flex" class="row-bg" justify="space-around">-->
-<!-- <el-col :span="8">鎺掓斁鍘诲悜:{{ displayContent.EmissDirecti }}</el-col>-->
-<!-- <el-col :span="8">鎺у埗绾у埆鍚嶇О:{{ displayContent.ContrLevelShowName }}</el-col>-->
-<!-- <el-col :span="8">鍐�/澶栨帓鍙�:{{ displayContent.OrOutPortName }}</el-col>-->
-<!-- <!– <el-col :span="8">鎺掓斁鍘诲悜:{{ displayContentTab2.StorageQty }}</el-col>–>-->
-<!-- <!– <el-col :span="8">鎺у埗绾у埆鍚嶇О:{{ displayContentTab2.SurplusFloorArea }}</el-col>–>-->
-<!-- <!– <el-col :span="8">鍐�/澶栨帓鍙�:{{ displayContentTab2.StorageDate }}</el-col>–>-->
-<!-- </el-row>-->
+ <div v-if="value == '搴熸皵'">
+ <el-row type="flex" class="row-bg row-item-one" justify="space-around">
+ <el-col :span="8">鐩戞祴鐐瑰悕绉�:{{ displayContentTab2.Name }}</el-col>
+ <el-col :span="8">鐢熶骇鍗曚綅:{{ displayContentTab2.porltName }}</el-col>
+ </el-row>
+ <el-row type="flex" class="row-bg" justify="space-around">
+ <el-col :span="8">鎺掓斁鍘诲悜:{{ displayContent.EmissDirecti }}</el-col>
+ <el-col :span="8">鎺у埗绾у埆鍚嶇О:{{ displayContent.ContrLevelShowName }}</el-col>
+ <el-col :span="8">鍐�/澶栨帓鍙�:{{ displayContent.OrOutPortName }}</el-col>
+ </el-row>
+ </div>
+ <div else-if>
+ <el-row type="flex" class="row-bg row-item-one" justify="space-around">
+ <el-col :span="8">鐩戞祴鐐瑰悕绉�:{{ displayContentTab2.StoragePlaceName }}</el-col>
+ <el-col :span="8">鐢熶骇鍗曚綅:{{ displayContentTab2.StoragePlaceName }}</el-col>
+ <el-col :span="8">鎺掓斁绫诲瀷鍔犺浇:{{ displayContentTab2.DesignFloorArea }}</el-col>
+ </el-row>
+ <el-row type="flex" class="row-bg" justify="space-around">
+ <el-col :span="8">鎺掓斁鍘诲悜:{{ displayContentTab2.StorageQty }}</el-col>
+ <el-col :span="8">鎺у埗绾у埆鍚嶇О:{{ displayContentTab2.SurplusFloorArea }}</el-col>
+ <el-col :span="8">鍐�/澶栨帓鍙�:{{ displayContentTab2.StorageDate }}</el-col>
+ </el-row>
+ </div>
</div>
</div>
</div>
@@ -42,7 +39,7 @@
<script>
export default {
name: 'GasTable',
- props: ['displayContentTab'],
+ props: ['displayContentTab', 'value'],
data () {
return {
displayContentTab2: []
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 91fa74f..e5831da 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -6,14 +6,14 @@
</div>
<div class="public-bounced-content">
<div class="public-bounced-content-left">
- <GasTab :displayContentTab="displayContentTab"></GasTab>
+ <PublicTabs :displayContentTab="displayContentTab" :value="value"></PublicTabs>
<div class="public-bounced-content-left-bottom">
<PublicTable v-if="value === 'gufei'"></PublicTable>
<GasTabs v-else></GasTabs>
</div>
</div>
<div class="public-bounced-content-right">
- <GasVideo></GasVideo>
+ <PublicVideo></PublicVideo>
</div>
</div>
</div>
@@ -22,18 +22,18 @@
<script>
import '@/components/BaseNav/SolidWaste/directive/dir'
-import GasTab from '@components/BaseNav/PublicBounced/GasComponents/GasTab'
+import PublicTabs from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
-import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo'
+import PublicVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
import GasTabs from '@components/BaseNav/PublicBounced/GasComponents/GasTabs'
export default {
name: 'PublicBounced',
components: {
GasTabs,
- GasTab,
+ PublicTabs,
PublicTable,
- GasVideo
+ PublicVideo
},
data () {
return {
@@ -53,6 +53,12 @@
this.flag = true
this.value = value
},
+ setGasData (data, value) {
+ this.displayContentTitle = data.Name
+ this.displayContentTab = data
+ this.flag = true
+ this.value = value
+ },
closePopup () {
this.flag = false
}
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index 574ed9f..a992284 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -56,7 +56,7 @@
// const result = await mapApi.getWasteGas(dataValue)
const PublicBounced = window.Vue.extend(publicBounced)
const instance = new PublicBounced()
- instance.setData(e.layer.options.test)
+ instance.setGasData(e.layer.options.test, 'feiqi')
instance.$mount()
document.body.appendChild(instance.$el)
}
--
Gitblit v1.8.0