wangziqian před 4 roky
rodič
revize
03f8de40ba

+ 1 - 1
src/layout/components/Sidebar/SidebarItem.vue

@@ -4,7 +4,7 @@
       <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
         <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
           <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />
-          <div v-show="onlyOneChild.meta.title === '个人工作台' || onlyOneChild.meta.title === '团队工作台'" class="if-notice" />
+          <div v-show="onlyOneChild.meta.title === '个人工作台'" class="if-notice" />
         </el-menu-item>
       </app-link>
     </template>

+ 82 - 15
src/views/workbench/components/statisticsSection.vue

@@ -1,11 +1,26 @@
 <template>
-  <div class="drawer-statistics">
+  <div class="drawer-statistics" :class="{'drawer-padding': show}">
     <transition name="fade-drawer">
-      <div v-show="show" class="statistics" />
+      <div v-show="show" class="statistics">
+        <div class="statistics-data">
+          <h2>{{ title }}统计</h2>
+          <div class="data-main">
+            <div class="data-item">
+              <label>交付已延期</label>
+              <div class="number">1</div>
+            </div>
+          </div>
+        </div>
+        <div class="statistics-chart">
+          <h2>未上线{{ title }}状态分布</h2>
+        </div>
+      </div>
     </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 v-show="show" class="drawer" @click="show = !show">
+      <i class="el-icon-arrow-up" />
+    </div>
+    <div v-show="!show" class="drawer drawer-pull" @click="show = !show">
+      <i class="el-icon-arrow-down" />
     </div>
   </div>
 </template>
@@ -26,7 +41,12 @@ export default {
     },
     type: {
       type: String,
-      default: 'require',
+      default: 'person',
+      required: false
+    },
+    title: {
+      type: String,
+      default: '需求',
       required: false
     }
   },
@@ -55,21 +75,60 @@ export default {
 .drawer-statistics {
   position: relative;
   width: 100%;
-  padding-bottom: 14px;
-}
-.fade-drawer, .fade-drawer-leave {
-  opacity: 0
+  padding-bottom: 1px;
 }
-.fade-drawer-enter-active {
-  transition: all 1.5s ease
-}
-.fade-drawer-leave-active {
-  transition: all 1.5s ease
+.drawer-padding {
+  padding-bottom: 14px;
 }
+//.fade-drawer-enter-active {
+//  transition: all 1.5s ease
+//}
+//.fade-drawer-leave-active {s
+//  transition: all 1.5s ease
+//}
+//.fade-drawer-enter, .fade-drawer-leave-to {
+//  transition: all 1.5s ease;
+//}
 .statistics {
   position: relative;
   width: 100%;
   height: 474px;
+  padding: 35px;
+  display: grid;
+  grid-template-columns: repeat(2,50%);
+  h2 {
+    color: #333333;
+    font-size: 16px;
+    margin-bottom: 20px;
+    font-weight: bold;
+  }
+}
+.statistics-data {
+  .data-main{
+    width: 80%;
+    display: grid;
+    grid-template-columns: repeat(2,188px);
+    grid-column-gap: 30px;
+    grid-template-rows: repeat(3,111px);
+    grid-row-gap: 20px;
+  }
+  .data-item {
+    box-shadow: 0px 6px 12px rgba(0, 0, 0, 0.2);
+    border-radius: 5px;
+    display: grid;
+    grid-template-rows: repeat(2,50%);
+    align-items: center;
+    padding: 5px 11px;
+    label {
+      font-weight: 400;
+      color: #666666;
+    }
+    .number {
+      font-weight: 500;
+      color: #333333;
+      font-size: 26px;
+    }
+  }
 }
 .drawer-statistics:after {
   content: '';
@@ -94,5 +153,13 @@ export default {
   color: #666666;
   font-weight: bold;
   background-color: #ffffff;
+  border-bottom: 1px solid #999999;
+  border-left: 1px solid #999999;
+  border-right: 1px solid #999999;
+  border-bottom-left-radius: 2px;
+  border-bottom-right-radius: 2px;
+}
+.drawer-pull {
+  top: 1px;
 }
 </style>

+ 1 - 1
src/views/workbench/person/index.vue

@@ -277,7 +277,7 @@ export default {
   },
   created() {
     this.$nextTick(() => {
-      this.activeName = this.$route.query.page
+      this.activeName = this.$route.query.page ? this.$route.query.page : '1'
     })
     this.showTeamAndMemberEnum()
   },

+ 1 - 1
src/views/workbench/team/index.vue

@@ -225,7 +225,7 @@ export default {
   },
   created() {
     this.$nextTick(() => {
-      this.activeName = this.$route.query.page
+      this.activeName = this.$route.query.page ? this.$route.query.page : '1'
     })
   },
   mounted() {