From 0c71a89748fb4e4cd433e8e9883d460033a3b996 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期五, 16 四月 2021 14:39:55 +0800
Subject: [PATCH] 固废废水废气弹框问题修改

---
 src/components/BaseNav/WasteSolid/WasteSolidIndex.vue |   42 ++++++++++++++++++++++++------------------
 1 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/components/BaseNav/WasteSolid/WasteSolidIndex.vue b/src/components/BaseNav/WasteSolid/WasteSolidIndex.vue
index 51c40ef..09b2ace 100644
--- a/src/components/BaseNav/WasteSolid/WasteSolidIndex.vue
+++ b/src/components/BaseNav/WasteSolid/WasteSolidIndex.vue
@@ -1,29 +1,29 @@
 <template>
-  <div class="public-bounced map-background" v-drag v-show="flag">
-    <div class="public-bounced-title panel-title" ref="publicBounced">
-      <span>{{ displayContentTitle }}</span>
-      <i class="el-icon-circle-close" @click="closePopup"></i>
+  <div class="public-bounced-content">
+    <div class="public-bounced-content-left">
+      <slot name='WasteSolidTabs'>
+        <PublicTabs></PublicTabs>
+      </slot>
+      <div class="public-bounced-content-left-bottom">
+        <slot name='WasteSolidTable'>
+          <PublicTable></PublicTable>
+        </slot>
+      </div>
     </div>
-    <div class="public-bounced-content">
-      <div class="public-bounced-content-left">
-        <public-tabs :setSolidWaste="displayContentTab"></public-tabs>
-        <div class="public-bounced-content-left-bottom">
-          <public-table :displayContentTable="displayContentTable"></public-table>
-        </div>
-      </div>
-      <div class="public-bounced-content-right">
-        <public-video></public-video>
-      </div>
+    <div class="public-bounced-content-right">
+      <slot name='WasteSolidVideo'>
+        <PublicVideo></PublicVideo>
+      </slot>
     </div>
   </div>
 </template>
 
 <script>
 
-import '@/utils/dragBoxes'
+// import '@/utils/dragBoxes'
 import PublicTabs from '@components/BaseNav/WasteSolid/PublicTabs'
 import PublicTable from '@components/BaseNav/WasteSolid/PublicTable'
-import PublicVideo from '@components/BaseNav/WasteSolid/PublicVideo'
+import PublicVideo from '@components/BaseNav/PublicVideo'
 
 export default {
   name: 'WasteSolidIndex',
@@ -34,8 +34,14 @@
   },
   data () {
     return {
-      displayContentTitle: '',
-      displayContentTab: '',
+      displayContentTabs: [{
+        StoragePlaceId: 0,
+        StoragePlaceName: '鍙栨按鍗曞厓骞叉偿鏆傚瓨搴�',
+        DesignFloorArea: 0.024,
+        StorageQty: 0.016,
+        SurplusFloorArea: 0.018,
+        StorageDate: '2021-01-17'
+      }],
       displayContentTable: '',
       flag: false
     }

--
Gitblit v1.8.0