From 6b4d30104d7b0958cee1aa9c02b4315af3472c7b Mon Sep 17 00:00:00 2001
From: duan <duanduanduan.com>
Date: Mon, 8 Aug 2022 10:23:21 +0800
Subject: [PATCH] =?UTF-8?q?feat(index):=20=E5=8A=A8=E6=80=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9header=E6=A0=B7=E5=BC=8F=EF=BC=8C=E5=8F=8A=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/AppMain.vue              |  3 +--
 src/layout/components/Navbar.vue               | 12 +++++++++---
 src/permission.js                              |  5 +++++
 src/store/getters.js                           |  3 ++-
 src/store/modules/settings.js                  |  4 +++-
 src/views/reagent/inventory/index.vue          |  8 ++++----
 src/views/reagent/receivingandreturn/index.vue |  4 ++--
 src/views/reagent/warehousing/index.vue        |  2 +-
 src/views/reagent/weighing/index.vue           |  2 +-
 src/views/user/index.vue                       |  8 ++++----
 src/views/user/role/index.vue                  |  8 ++++----
 11 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 240891a..33e7e29 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -1,5 +1,5 @@
 <template>
-  <section class="app-main">
+  <section class="app-main" :style="{'height': this.$store.getters.isMain ? 'calc(100vh - 130px)' : 'calc(100vh - 60px)'}">
     <transition name="fade-transform" mode="out-in">
       <router-view :key="key" />
     </transition>
@@ -20,7 +20,6 @@ export default {
 <style scoped>
 .app-main {
   /*50 = navbar  */
-  height: calc(100vh - 10rem);
   position: relative;
   overflow-y: auto;
   overflow-x:hidden;
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 15afc87..51d895b 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,7 +1,8 @@
 <template>
-  <div class="navbar" :style="obj">
+  <div class="navbar" :style="{...obj,'height': this.$store.getters.isMain ? '130px' : '60px'}">
     <div class="header-top">
       <div class="header-top-item"><img src="@/assets/login/logo-white.png" alt=""> </div>
+      <div v-if="!$store.getters.isMain" class="header-top-item mid">RMS后台管理系统</div>
       <div class="header-top-item">
         <el-badge :value="39">
           <img style="height: 23px" src="@/assets/0-常用/预警管理-白.png" alt="">
@@ -16,10 +17,10 @@
         </el-select>
       </div>
     </div>
-    <div class="header-title">
+    <div v-if="$store.getters.isMain" class="header-title">
       RMS后台管理系统
     </div>
-    <div class="header-desc">
+    <div v-if="$store.getters.isMain" class="header-desc">
       为您提供基于物联网的智慧实验室物资管理解决方案
     </div>
   </div>
@@ -101,6 +102,11 @@ export default {
     display: flex;
     justify-content: space-between;
     align-items: center;
+    .mid {
+      font-size: 2rem;
+      font-weight: 400;
+      color: #FFFFFF;
+    }
     .header-top-item{
       img{
         height: 4.6875rem;
diff --git a/src/permission.js b/src/permission.js
index 560643e..fce9271 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,6 +26,11 @@ router.beforeEach(async(to, from, next) => {
       NProgress.done()
     } else {
       if (to.name) {
+        if (to.path === '/reagent/mainoverview/index') {
+          store.commit('settings/CHANGE_SETTING', { key: 'isMain', value: true })
+        } else {
+          store.commit('settings/CHANGE_SETTING', { key: 'isMain', value: false })
+        }
         if (to.path.indexOf('reagent') !== -1) {
           store.commit('user/SET_CLASS', 'reagent')
         }
diff --git a/src/store/getters.js b/src/store/getters.js
index bc2d7cf..4351ce4 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -5,6 +5,7 @@ const getters = {
   avatar: state => state.user.avatar,
   name: state => state.user.name,
   permission_routes: state => state.permission.routes,
-  classification: state => state.user.classification
+  classification: state => state.user.classification,
+  isMain: state => state.settings.isMain
 }
 export default getters
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index b3f33f8..4fe515b 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -5,11 +5,13 @@ const { showSettings, fixedHeader, sidebarLogo } = defaultSettings
 const state = {
   showSettings: showSettings,
   fixedHeader: fixedHeader,
-  sidebarLogo: sidebarLogo
+  sidebarLogo: sidebarLogo,
+  isMain: true
 }
 
 const mutations = {
   CHANGE_SETTING: (state, { key, value }) => {
+    console.log(key, value)
     // eslint-disable-next-line no-prototype-builtins
     if (state.hasOwnProperty(key)) {
       state[key] = value
diff --git a/src/views/reagent/inventory/index.vue b/src/views/reagent/inventory/index.vue
index 3d5ec39..d13e5bd 100644
--- a/src/views/reagent/inventory/index.vue
+++ b/src/views/reagent/inventory/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="main-container">
+  <div class="main-container-text">
     <div class="title">库存盘点</div>
     <div class="header">
       <el-select v-model="client_id" size="small" placeholder="请选择柜体">
@@ -20,7 +20,7 @@
     <el-table
       :data="tableData"
       :header-cell-style="headerStyle"
-      height="465"
+      height="530"
       @selection-change="handleSelectionChange"
     >
       <el-table-column
@@ -240,8 +240,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.main-container{
-  min-height:calc(100vh - 12rem) ;
+.main-container-text{
+  min-height:calc(100vh - 110px) ;
   padding: 1rem;
   margin: 1rem;
   background: white;
diff --git a/src/views/reagent/receivingandreturn/index.vue b/src/views/reagent/receivingandreturn/index.vue
index dce2c1c..2d943d2 100644
--- a/src/views/reagent/receivingandreturn/index.vue
+++ b/src/views/reagent/receivingandreturn/index.vue
@@ -17,7 +17,7 @@
           element-loading-text="拼命加载中"
           :data="tableData"
           style="width: 100%"
-          height="500"
+          height="560"
           :header-cell-style="headerStyle"
         >
           <el-table-column
@@ -147,7 +147,7 @@ export default {
   display: flex;
   .content{
     width: 50%;
-    height: calc(100vh - 12rem);
+    height: calc(100vh - 110px);
     padding: 1rem;
     background: white;
     .title{
diff --git a/src/views/reagent/warehousing/index.vue b/src/views/reagent/warehousing/index.vue
index 5c62eb0..04ee23c 100644
--- a/src/views/reagent/warehousing/index.vue
+++ b/src/views/reagent/warehousing/index.vue
@@ -533,7 +533,7 @@ export default {
 .main-content-container{
   margin: 1rem;
   background: white;
-  min-height: calc(100vh - 12rem);
+  min-height: calc(100vh - 110px);
   .header{
     margin: 1rem;
     .title{
diff --git a/src/views/reagent/weighing/index.vue b/src/views/reagent/weighing/index.vue
index 4351891..45a28fa 100644
--- a/src/views/reagent/weighing/index.vue
+++ b/src/views/reagent/weighing/index.vue
@@ -98,7 +98,7 @@ export default {
   display: flex;
   .content{
     width: 50%;
-    height: calc(100vh - 12rem);
+    height: calc(100vh - 110px);
     padding: 1rem;
     background: white;
     .title{
diff --git a/src/views/user/index.vue b/src/views/user/index.vue
index 2a96a5b..0f1986e 100644
--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="main-container">
+  <div class="main-container-text">
     <div class="title">用户管理</div>
     <div class="header">
       <el-input v-model="user_code" placeholder="请输入工号" />
@@ -28,7 +28,7 @@
       element-loading-text="拼命加载中"
       :data="tableData"
       :header-cell-style="headerStyle"
-      height="460"
+      height="530"
       @selection-change="handleSelectionChange"
     >
       <el-table-column
@@ -410,8 +410,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.main-container{
-  min-height:calc(100vh - 12rem) ;
+.main-container-text{
+  min-height:calc(100vh - 110px) ;
   padding: 1rem;
   margin: 1rem;
   background: white;
diff --git a/src/views/user/role/index.vue b/src/views/user/role/index.vue
index 16a85d1..c15f64c 100644
--- a/src/views/user/role/index.vue
+++ b/src/views/user/role/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="main-container">
+  <div class="main-container-text">
     <div class="title">角色信息</div>
     <div class="header">
       <el-button type="primary" plain @click="handleAddRole"><i class="el-icon-plus" />新增角色</el-button>
@@ -13,7 +13,7 @@
       element-loading-text="拼命加载中"
       :data="tableData"
       :header-cell-style="headerStyle"
-      height="460"
+      height="530"
       @selection-change="handleSelectionChange"
     >
       <el-table-column
@@ -340,8 +340,8 @@ export default {
 </style>
 
 <style lang="scss" scoped>
-.main-container{
-  min-height:calc(100vh - 12rem) ;
+.main-container-text{
+  min-height:calc(100vh - 110px) ;
   padding: 1rem;
   margin: 1rem;
   background: white;