wangziqian 4 éve
szülő
commit
1cecc06594

+ 1 - 1
src/layout/index.vue

@@ -83,7 +83,7 @@ export default {
     position: fixed;
     top: 0;
     right: 0;
-    z-index: 9;
+    z-index: 999;
     width: calc(100% - #{$sideBarWidth});
     transition: width 0.28s;
   }

+ 54 - 2
src/views/workbench/components/statisticsSection.vue

@@ -1,5 +1,13 @@
 <template>
-  <div class="drawer-statistics" />
+  <div class="drawer-statistics">
+    <transition name="fade-drawer">
+      <div v-show="show" class="statistics" />
+    </transition>
+    <div class="drawer" @click="show = !show">
+      <i v-show="show" class="el-icon-arrow-up" />
+      <i v-show="!show" class="el-icon-arrow-down" />
+    </div>
+  </div>
 </template>
 
 <script>
@@ -19,7 +27,12 @@ export default {
     type: {
       type: String,
       default: 'require',
-      required: true
+      required: false
+    }
+  },
+  data() {
+    return {
+      show: true
     }
   },
   watch: {
@@ -40,7 +53,46 @@ export default {
 
 <style scoped lang="scss">
 .drawer-statistics {
+  position: relative;
+  width: 100%;
+  padding-bottom: 14px;
+}
+.fade-drawer, .fade-drawer-leave {
+  opacity: 0
+}
+.fade-drawer-enter-active {
+  transition: all 1.5s ease
+}
+.fade-drawer-leave-active {
+  transition: all 1.5s ease
+}
+.statistics {
+  position: relative;
+  width: 100%;
   height: 474px;
+}
+.drawer-statistics:after {
+  content: '';
   width: 100%;
+  height: 14px;
+  background-color: #F2F3F6;
+  position: absolute;
+  left: 0;
+  bottom: 0;
+}
+.drawer {
+  width: 26px;
+  height: 13px;
+  left: 50%;
+  position: absolute;
+  bottom: 1px;
+  transform: translateX(-50%);
+  z-index: 98;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: #666666;
+  font-weight: bold;
+  background-color: #ffffff;
 }
 </style>

+ 4 - 2
src/views/workbench/person/index.vue

@@ -272,11 +272,13 @@ export default {
         Number(newV) > 0
           ? this.$router.push({ path: this.$route.path, query: { page: newV }})
           : this.$router.push({ path: this.$route.path, query: { page: '1' }})
-      },
-      immediate: true
+      }
     }
   },
   created() {
+    this.$nextTick(() => {
+      this.activeName = this.$route.query.page
+    })
     this.showTeamAndMemberEnum()
   },
   mounted() {

+ 6 - 4
src/views/workbench/team/index.vue

@@ -88,8 +88,6 @@
     <el-container v-if="activeName === '3'">
       <section class="main-section">
         <statistics-section :search-form="searchForm" />
-      </section>
-      <section class="main-section">
         <needs-list :search-form="searchForm" type="team" />
       </section>
     </el-container>
@@ -222,10 +220,14 @@ export default {
         Number(newV) > 0
           ? this.$router.push({ path: this.$route.path, query: { page: newV }})
           : this.$router.push({ path: this.$route.path, query: { page: '1' }})
-      },
-      immediate: true
+      }
     }
   },
+  created() {
+    this.$nextTick(() => {
+      this.activeName = this.$route.query.page
+    })
+  },
   mounted() {
     this.settingGetBizList()
     this.queryTeamInfoList()