From f022a79499ff08979d1ece9f24d00d7660cb781b Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期二, 18 五月 2021 11:08:49 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/components/BaseNav/PublicSector.vue |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/components/BaseNav/PublicSector.vue b/src/components/BaseNav/PublicSector.vue
index 8c848c6..328b263 100644
--- a/src/components/BaseNav/PublicSector.vue
+++ b/src/components/BaseNav/PublicSector.vue
@@ -1,22 +1,21 @@
 <template>
   <div class="public-bounced-content">
-    <WasteSolidIndex>
-      <template v-slot:WasteSolidTabs></template>
-      <template v-slot:WasteSolidTable></template>
-      <template v-slot:WasteSolidVideo></template>
-    </WasteSolidIndex>
+    <div class="public-bounced-content-left">
+      <slot name='tabs'></slot>
+      <div class="public-bounced-content-left-bottom">
+        <slot name='publicPart'></slot>
+      </div>
+    </div>
+    <div class="public-bounced-content-right">
+      <slot name='video'></slot>
+    </div>
   </div>
 </template>
 
 <script>
 
-import WasteSolidIndex from '@components/BaseNav/WasteSolid/WasteSolidIndex'
-
 export default {
   name: 'PublicSector',
-  components: {
-    WasteSolidIndex
-  },
   data () {
     return {}
   }
@@ -31,7 +30,7 @@
   left: 20%;
 
   .public-bounced-content {
-    padding: 0.1rem;
+    padding: 0.05rem;
     display: flex;
 
     .public-bounced-content-left {

--
Gitblit v1.8.0