From 69904749ea419cc23127a445847eae203bd79168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <15099670051>
Date: Thu, 18 Feb 2021 13:20:30 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E5=89=8D=E7=AB=AF=E5=B8=83=E5=B1=80=E5=A4=9A=E5=A4=84?=
 =?UTF-8?q?=E7=BB=86=E8=8A=82=EF=BC=8C=E6=9B=B4=E5=8D=8F=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _web/src/App.vue                              | 27 ++++++++-
 .../components/GlobalHeader/GlobalHeader.vue  |  6 +-
 _web/src/components/Menu/SideMenu.vue         |  4 +-
 _web/src/components/NoticeIcon/NoticeIcon.vue | 58 ++++++++++++++++++-
 _web/src/components/PageHeader/PageHeader.vue |  8 +--
 _web/src/components/global.less               | 32 +++++-----
 _web/src/components/tools/UserMenu.vue        |  6 +-
 _web/src/layouts/BasicLayout.vue              |  6 +-
 _web/src/layouts/PageView.vue                 |  8 +--
 _web/src/views/system/dashboard/Analysis.vue  |  2 +-
 10 files changed, 114 insertions(+), 43 deletions(-)

diff --git a/_web/src/App.vue b/_web/src/App.vue
index bbca4b86..3a611db8 100644
--- a/_web/src/App.vue
+++ b/_web/src/App.vue
@@ -1,7 +1,7 @@
 <template>
   <a-config-provider :locale="locale">
-    <div id="app">
-      <router-view/>
+    <div id="app" class="app app1">
+      <router-view class="scrollbar"/>
     </div>
   </a-config-provider>
 </template>
@@ -22,3 +22,26 @@ export default {
   }
 }
 </script>
+<style>
+  .app {
+    overflow: auto;
+    border  : none;
+  }
+  .scrollbar {
+    margin: 0 auto;
+  }
+  .app1::-webkit-scrollbar {
+    /*滚动条整体样式*/
+    width : 8px;  /*高宽分别对应横竖滚动条的尺寸*/
+  }
+  .app1::-webkit-scrollbar-thumb {
+    /*滚动条里面小方块*/
+    border-radius: 6px;
+    background   : #aaa;
+  }
+  .app1::-webkit-scrollbar-track {
+    /*滚动条里面轨道*/
+    border-radius: 8px;
+    background   : #FFFFFF;
+  }
+</style>
diff --git a/_web/src/components/GlobalHeader/GlobalHeader.vue b/_web/src/components/GlobalHeader/GlobalHeader.vue
index 7db65f07..d0b45bce 100644
--- a/_web/src/components/GlobalHeader/GlobalHeader.vue
+++ b/_web/src/components/GlobalHeader/GlobalHeader.vue
@@ -4,18 +4,18 @@
       <a-layout-header
         v-if="visible"
         :class="[fixedHeader && 'ant-header-fixedHeader', sidebarOpened ? 'ant-header-side-opened' : 'ant-header-side-closed', ]"
-        :style="{ padding: '0' }">
+        :style="{ padding: '0', height: '55px' }">
         <div v-if="mode === 'sidemenu'" class="header">
 
           <a-menu
+            style="height: 55px"
             mode="horizontal"
             :default-selected-keys="this.defApp"
-            style="border-bottom:0px;lineHeight:58px;"
           >
             <a-icon v-if="device==='mobile'" class="trigger" :type="collapsed ? 'menu-fold' : 'menu-unfold'" @click="toggle"/>
             <a-icon v-else class="trigger" :type="collapsed ? 'menu-unfold' : 'menu-fold'" @click="toggle"/>
 
-            <a-menu-item v-for="(item) in userInfo.apps" :key="item.code" style="top:0px;" @click="switchApp(item.code)">
+            <a-menu-item v-for="(item) in userInfo.apps" :key="item.code" style="top:0px; line-height: 55px; padding-left: 10px; padding-right: 10px" @click="switchApp(item.code)">
               {{ item.name }}
             </a-menu-item>
             <user-menu></user-menu>
diff --git a/_web/src/components/Menu/SideMenu.vue b/_web/src/components/Menu/SideMenu.vue
index 62fb01d9..2889535d 100644
--- a/_web/src/components/Menu/SideMenu.vue
+++ b/_web/src/components/Menu/SideMenu.vue
@@ -1,7 +1,7 @@
 <template>
   <a-layout-sider
     :class="['sider', isDesktop() ? null : 'shadow', theme, fixSiderbar ? 'ant-fixed-sidemenu' : null ]"
-    width="256px"
+    width="230px"
     :collapsible="collapsible"
     v-model="collapsed"
     :trigger="null">
@@ -12,7 +12,7 @@
       :theme="theme"
       :mode="mode"
       @select="onSelect"
-      style="padding: 16px 0px;"></s-menu>
+    ></s-menu>
   </a-layout-sider>
 
 </template>
diff --git a/_web/src/components/NoticeIcon/NoticeIcon.vue b/_web/src/components/NoticeIcon/NoticeIcon.vue
index 8ae1c80d..f5e341fe 100644
--- a/_web/src/components/NoticeIcon/NoticeIcon.vue
+++ b/_web/src/components/NoticeIcon/NoticeIcon.vue
@@ -29,13 +29,65 @@
                   <a-avatar style="background-color: white" slot="avatar" src="https://gw.alipayobjects.com/zos/rmsportal/kISTdvpyTAhtGxpovNWd.png"/>
                 </a-list-item-meta>
               </a-list-item>
+              <a-list-item>
+                <a-list-item-meta title="你推荐的 曲妮妮 已通过第三轮面试" description="一年前">
+                  <a-avatar style="background-color: white" slot="avatar" src="https://gw.alipayobjects.com/zos/rmsportal/OKJXDXrmkNshAMvwtvhu.png"/>
+                </a-list-item-meta>
+              </a-list-item>
+              <a-list-item>
+                <a-list-item-meta title="这种模板可以区分多种通知类型" description="一年前">
+                  <a-avatar style="background-color: white" slot="avatar" src="https://gw.alipayobjects.com/zos/rmsportal/kISTdvpyTAhtGxpovNWd.png"/>
+                </a-list-item-meta>
+              </a-list-item>
             </a-list>
           </a-tab-pane>
           <a-tab-pane tab="消息" key="2">
-            123
+            <a-list>
+              <a-list-item>
+                <a-list-item-meta title="你收到了 14 份新周报" description="一年前">
+                  <a-avatar style="background-color: white" slot="avatar" src="https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png"/>
+                </a-list-item-meta>
+              </a-list-item>
+              <a-list-item>
+                <a-list-item-meta title="你推荐的 曲妮妮 已通过第三轮面试" description="一年前">
+                  <a-avatar style="background-color: white" slot="avatar" src="https://gw.alipayobjects.com/zos/rmsportal/OKJXDXrmkNshAMvwtvhu.png"/>
+                </a-list-item-meta>
+              </a-list-item>
+              <a-list-item>
+                <a-list-item-meta title="这种模板可以区分多种通知类型" description="一年前">
+                  <a-avatar style="background-color: white" slot="avatar" src="https://gw.alipayobjects.com/zos/rmsportal/kISTdvpyTAhtGxpovNWd.png"/>
+                </a-list-item-meta>
+              </a-list-item>
+            </a-list>
           </a-tab-pane>
           <a-tab-pane tab="待办" key="3">
-            123
+            <a-list>
+              <a-list-item>
+                <a-list-item-meta title="你收到了 14 份新周报" description="一年前">
+                  <a-avatar style="background-color: white" slot="avatar" src="https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png"/>
+                </a-list-item-meta>
+              </a-list-item>
+              <a-list-item>
+                <a-list-item-meta title="你推荐的 曲妮妮 已通过第三轮面试" description="一年前">
+                  <a-avatar style="background-color: white" slot="avatar" src="https://gw.alipayobjects.com/zos/rmsportal/OKJXDXrmkNshAMvwtvhu.png"/>
+                </a-list-item-meta>
+              </a-list-item>
+              <a-list-item>
+                <a-list-item-meta title="这种模板可以区分多种通知类型" description="一年前">
+                  <a-avatar style="background-color: white" slot="avatar" src="https://gw.alipayobjects.com/zos/rmsportal/kISTdvpyTAhtGxpovNWd.png"/>
+                </a-list-item-meta>
+              </a-list-item>
+              <a-list-item>
+                <a-list-item-meta title="你推荐的 曲妮妮 已通过第三轮面试" description="一年前">
+                  <a-avatar style="background-color: white" slot="avatar" src="https://gw.alipayobjects.com/zos/rmsportal/OKJXDXrmkNshAMvwtvhu.png"/>
+                </a-list-item-meta>
+              </a-list-item>
+              <a-list-item>
+                <a-list-item-meta title="这种模板可以区分多种通知类型" description="一年前">
+                  <a-avatar style="background-color: white" slot="avatar" src="https://gw.alipayobjects.com/zos/rmsportal/kISTdvpyTAhtGxpovNWd.png"/>
+                </a-list-item-meta>
+              </a-list-item>
+            </a-list>
           </a-tab-pane>
         </a-tabs>
       </a-spin>
@@ -63,7 +115,7 @@ export default {
         this.loading = true
         setTimeout(() => {
           this.loading = false
-        }, 2000)
+        }, 100)
       } else {
         this.loading = false
       }
diff --git a/_web/src/components/PageHeader/PageHeader.vue b/_web/src/components/PageHeader/PageHeader.vue
index 80e686e9..aeb02276 100644
--- a/_web/src/components/PageHeader/PageHeader.vue
+++ b/_web/src/components/PageHeader/PageHeader.vue
@@ -65,11 +65,11 @@ export default {
 <style lang="less" scoped>
 .page-header {
   background: #fff;
-  padding: 16px 32px 0;
-  border-bottom: 1px solid #e8e8e8;
+  padding: 10px 32px 0;
+  border-bottom: 0px solid #e8e8e8;
 
   .breadcrumb {
-    margin-bottom: 16px;
+    margin-bottom: 10px;
   }
 
   .detail {
@@ -97,7 +97,7 @@ export default {
         width: 100%;
 
         .avatar {
-          margin-bottom: 16px;
+          margin-bottom: 10px;
         }
       }
 
diff --git a/_web/src/components/global.less b/_web/src/components/global.less
index 7e942663..74c17c38 100644
--- a/_web/src/components/global.less
+++ b/_web/src/components/global.less
@@ -67,7 +67,7 @@ body {
 
   .trigger {
     font-size: 20px;
-    line-height: 64px;
+    line-height: 55px;
     padding: 0 24px;
     cursor: pointer;
     transition: color 0.3s;
@@ -128,7 +128,7 @@ body {
       transition: width 0.2s;
 
       &.ant-header-side-opened {
-        width: calc(100% - 256px);
+        width: calc(100% - 230px);
       }
 
       &.ant-header-side-closed {
@@ -138,8 +138,8 @@ body {
   }
 
   .header {
-    height: 64px;
-    padding: 0 12px 0 0;
+    height: 55px;
+    // padding: 0 12px 0 0;
     background: #fff;
     box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
     position: relative;
@@ -152,6 +152,7 @@ body {
       height: 100%;
 
       .action {
+        line-height: 55px;
         cursor: pointer;
         padding: 0 12px;
         display: inline-block;
@@ -164,7 +165,7 @@ body {
         }
 
         .avatar {
-          margin: 20px 8px 20px 0;
+          margin: 15px 8px 15px 0;
           color: #1890ff;
           background: hsla(0, 0%, 100%, 0.85);
           vertical-align: middle;
@@ -255,14 +256,14 @@ body {
       margin: auto;
       padding-left: 0;
       display: flex;
-      height: 64px;
+      height: 55px;
 
       .ant-menu.ant-menu-horizontal {
         max-width: 835px;
         flex: 0 1 835px;
         border: none;
-        height: 64px;
-        line-height: 64px;
+        height: 55px;
+        line-height: 55px;
       }
 
       .header-index-left {
@@ -272,9 +273,9 @@ body {
         .logo.top-nav-header {
           flex: 0 0 165px;
           width: 165px;
-          height: 64px;
+          height: 55px;
           position: relative;
-          line-height: 64px;
+          line-height: 55px;
           transition: all 0.3s;
           overflow: hidden;
 
@@ -300,7 +301,7 @@ body {
       .header-index-right {
         flex: 0 0 238px;
         align-self: flex-end;
-        height: 64px;
+        height: 55px;
         overflow: hidden;
 
         .content-box {
@@ -333,8 +334,8 @@ body {
   // 内容区
   .layout-content {
     margin: 24px 24px 0px;
-    height: 100%;
-    height: 64px;
+    //height: 100%;
+    //height: 64px;
     padding: 0 12px 0 0;
   }
 
@@ -394,12 +395,13 @@ body {
     height: 100%;
   }
 
+  // logo区域样式
   .logo {
     position: relative;
-    height: 64px;
+    height: 55px;
     padding-left: 24px;
     overflow: hidden;
-    line-height: 64px;
+    line-height: 55px;
     background: #002140;
     transition: all .3s;
 
diff --git a/_web/src/components/tools/UserMenu.vue b/_web/src/components/tools/UserMenu.vue
index 770378bf..65ce592d 100644
--- a/_web/src/components/tools/UserMenu.vue
+++ b/_web/src/components/tools/UserMenu.vue
@@ -1,11 +1,11 @@
 <template>
   <div class="user-wrapper">
     <div class="content-box">
-      <a href="https://www.xiaonuo.vip" target="_blank">
+      <!--<a href="https://www.xiaonuo.vip" target="_blank">
         <span class="action">
           <a-icon type="question-circle-o"></a-icon>
         </span>
-      </a>
+      </a>-->
 
       <notice-icon class="action"/>
 
@@ -59,7 +59,7 @@
           <a-menu
             mode="inline"
             :default-selected-keys="this.defApp"
-            style="border-bottom:0px;lineHeight:58px;"
+            style="border-bottom:0px;lineHeight:55px;"
           >
             <a-menu-item v-for="(item) in userInfo.apps" :key="item.code" style="top:0px;" @click="switchApp(item.code)">
               {{ item.name }}
diff --git a/_web/src/layouts/BasicLayout.vue b/_web/src/layouts/BasicLayout.vue
index 797a5755..731e4bee 100644
--- a/_web/src/layouts/BasicLayout.vue
+++ b/_web/src/layouts/BasicLayout.vue
@@ -40,7 +40,7 @@
       />
 
       <!-- layout content -->
-      <a-layout-content :style="{ height: '100%', margin: '24px 24px 0', paddingTop: fixedHeader ? '64px' : '0' }">
+      <a-layout-content :style="{ height: '100%', margin: '24px 24px 0', paddingTop: fixedHeader ? '55px' : '0' }">
         <multi-tab v-if="multiTab"></multi-tab>
         <transition name="page-transition">
           <route-view />
@@ -99,7 +99,7 @@ export default {
         return '0'
       }
       if (this.sidebarOpened) {
-        return '256px'
+        return '230px'
       }
       return '80px'
     }
@@ -145,7 +145,7 @@ export default {
     paddingCalc () {
       let left = ''
       if (this.sidebarOpened) {
-        left = this.isDesktop() ? '256px' : '80px'
+        left = this.isDesktop() ? '230px' : '80px'
       } else {
         left = (this.isMobile() && '0') || ((this.fixSidebar && '80px') || '0')
       }
diff --git a/_web/src/layouts/PageView.vue b/_web/src/layouts/PageView.vue
index aba50ccc..7d9c6e1a 100644
--- a/_web/src/layouts/PageView.vue
+++ b/_web/src/layouts/PageView.vue
@@ -7,12 +7,6 @@
       <div slot="content" v-if="!this.$slots.headerContent && description">
         <p style="font-size: 14px;color: rgba(0,0,0,.65)">{{ description }}</p>
         <div class="link">
-          <template v-for="(link, index) in linkList">
-            <a :key="index" @click="() => { link.callback && link.callback() }">
-              <a-icon :type="link.icon" />
-              <span>{{ link.title }}</span>
-            </a>
-          </template>
         </div>
       </div>
       <slot slot="extra" name="extra">
@@ -44,7 +38,7 @@
           <keep-alive v-if="multiTab">
             <router-view ref="content" />
           </keep-alive>
-          <router-view v-else ref="content" />
+          <router-view v-else ref="content" style="margin: -12px -14px 0;"/>
         </slot>
       </div>
     </div>
diff --git a/_web/src/views/system/dashboard/Analysis.vue b/_web/src/views/system/dashboard/Analysis.vue
index eeb85a5c..6fd22be8 100644
--- a/_web/src/views/system/dashboard/Analysis.vue
+++ b/_web/src/views/system/dashboard/Analysis.vue
@@ -72,7 +72,7 @@
               <a>本月</a>
               <a>本年</a>
             </div>
-            <a-range-picker :style="{width: '256px'}" />
+            <a-range-picker :style="{width: '230px'}" />
           </div>
           <a-tab-pane loading="true" tab="销售额" key="1">
             <a-row>