Merge branch 'master' of http://106.55.241.82:3000/lzf/zhbsq-vue-web

src/components/TopNav/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog :modal="true" custom-class="testgks" width="20vw" :before-close="closeMenuHandler" :visible.sync="isShowMenu">
+    <el-dialog :modal="false" custom-class="testgks" width="20vw" :before-close="closeMenuHandler" :visible.sync="isShowMenu">
       <el-menu :default-active="activeMenu" mode="horizontal" @select="handleSelect">
         <template v-for="(item, index) in topMenus">
           <el-menu-item :style="{ '--theme': theme }" :index="item.path" :key="index"
@@ -136,7 +136,7 @@ export default {
         this.activeRoutes(key);
         this.$store.dispatch('app/toggleSideBarHide', false);
       }
-
+      this.$emit("showHamBurger");
       this.$emit("closeMenuHandler");
     },
     // 当前激活的路由

src/layout/components/Navbar.vue

@@ -4,10 +4,10 @@
       <div class="cursor index menu-hover" @click="handlerIndex">首页</div>
       <div class="cursor menu menu-hover" @click="handlerShowMenu">数据接口</div>
       <!-- 伸缩按钮 -->
-      <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container"
+      <hamburger id="hamburger-container" :is-active="sidebar.opened" v-show="isShowHamBurger" class="hamburger-container"
         @toggleClick="toggleSideBar" />
-        <top-nav  @closeMenuHandler="handlerShowMenu" :isShowMenu="isShowMenu"></top-nav>
-    </div>
+        <top-nav @showHamBurger="isShowHamBurger=true"  @closeMenuHandler="handlerShowMenu" :isShowMenu="isShowMenu"></top-nav>
+      </div>
 
 
 
@@ -63,7 +63,11 @@ import RuoYiDoc from '@/components/RuoYi/Doc'
 export default {
   data() {
     return {
+      // 菜单列表显示、隐藏
       isShowMenu: false,
+
+      // 伸缩按钮显示、隐藏
+      isShowHamBurger:false,
       routeImgs: [require('@/assets/route_images/u211.svg'), require('@/assets/route_images/u217.svg'), require('@/assets/route_images/u226.svg'), require('@/assets/route_images/u214.svg'), require('@/assets/route_images/u223.svg'), require('@/assets/route_images/u229.svg'), require('@/assets/route_images/u220.svg'), require('@/assets/route_images/u232.svg')],
     }
   },
@@ -118,14 +122,27 @@ export default {
     },
     handlerShowMenu() {
       this.isShowMenu = !this.isShowMenu;
-    },
-    handlerRouteData(item, index) {
+
     },
 
     handlerIndex() {
-      this.$router.push("/index")
+      this.isShowHamBurger = false;
+      this.$router.push("/")
     }
   },
+
+  watch:{
+    '$route.fullPath':{
+      handler:function(newV,oldV){
+        if(newV == '/index'){
+          this.isShowHamBurger = false;
+        }else{
+          this.isShowHamBurger = true;
+        }
+      },
+      // deep:true,
+    }
+  }
 }
 </script>
 

src/utils/generator/zhbsq-portal-vue

@@ -0,0 +1 @@
+Subproject commit 76aea68039c1803e50b04786eb067cc6b11fdfc7

src/views/index.vue

@@ -1,9 +1,9 @@
 <template>
-  <div class="dashboard-editor-container">
+  <!-- <div class="dashboard-editor-container"> -->
 
-    <panel-group @handleSetLineChartData="handleSetLineChartData" />
+    <!-- <panel-group @handleSetLineChartData="handleSetLineChartData" /> -->
 
-  </div>
+  <!-- </div> -->
 </template>
 
 <script>

src/views/task/index.vue

@@ -54,7 +54,7 @@
           {{ scope.row.acname }}
         </template>
       </el-table-column>
-      <el-table-column label="业务备注" align="center" prop="fromKeyword ">
+      <el-table-column label="标题" align="center" prop="fromKeyword ">
         <template slot-scope="scope">
           {{ scope.row.fromKeyword }}
         </template>