From 19af6ea9256144bb77cfaeaf81ef19c156146c92 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 21 May 2024 15:53:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/login/Home.vue              | 4 ++--
 src/pages/proj/BelowGradeReport.vue   | 2 +-
 src/pages/proj/CallDefective.vue      | 2 +-
 src/pages/proj/CallEmpty.vue          | 2 +-
 src/pages/proj/CallMater.vue          | 2 +-
 src/pages/proj/CreateChargingTask.vue | 2 +-
 src/pages/proj/KunliaoManage.vue      | 2 +-
 src/pages/proj/RuyaoManage.vue        | 2 +-
 src/pages/proj/SendEmpty.vue          | 2 +-
 src/pages/proj/SendMater.vue          | 2 +-
 src/pages/proj/VehicleBind.vue        | 2 +-
 src/pages/proj/VehicleUnbind.vue      | 2 +-
 src/style/common.styl                 | 6 ++++++
 13 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/pages/login/Home.vue b/src/pages/login/Home.vue
index 1e819fb..e583061 100644
--- a/src/pages/login/Home.vue
+++ b/src/pages/login/Home.vue
@@ -1,7 +1,7 @@
 <template>
   <section>
     <header><span class="fxcol">首页</span></header>
-    <section class="content" style="margin-bottom: 0">
+    <section class="content mgt86">
       <div class="userInfo">
         <div class="fxcol">
           <p class="p1">{{$store.getters.userInfo !== '' ? JSON.parse($store.getters.userInfo).nickName : ''}}</p>
@@ -56,7 +56,7 @@ export default {
       tab: Number(this.$store.getters.navTab),
       menuList: {
         menu1: [{title: '指令管理', path: 'zlmanage', icon: 'RF1'}, {title: '任务管理', path: 'taskmanage', icon: 'RF2'}, {title: '不合格品上报', path: 'belowgradereport', icon: 'RF3'}, {title: '送料', path: 'sendmater', icon: 'RF4'}, {title: '叫料', path: 'callmater', icon: 'RF5'}, {title: '送空', path: 'sendempty', icon: 'RF6'}, {title: '叫空', path: 'callempty', icon: 'RF7'}, {title: '困料管理', path: 'KunliaoManage', icon: 'RF8'}, {title: '入窑管理', path: 'RuyaoManage', icon: 'RF9'}, {title: '载具绑定', path: 'VehicleBind', icon: 'RF10'}, {title: '载具解绑', path: 'VehicleUnbind', icon: 'RF11'}, {title: '呼叫次品料', path: 'CallDefective', icon: 'RF12'}, {title: 'AGV充电', path: 'CreateChargingTask', icon: 'RF13'}],
-        menu2: [{title: '人工异常处理', path: 'ExceptionHand', icon: 'RF14'}, {title: '人工混碾搬运', path: 'MixMove', icon: 'RF15'}, {title: '压机料盅转移', path: 'LzTransfer', icon: 'RF16'}, {title: '上料', path: 'Suppress', icon: 'RF8'}, {title: '下料', path: 'SuppressDown', icon: 'RF9'}, {title: '人工出窑', path: 'KilnOut', icon: 'RF4'}, {title: '载具转移', path: 'KilnMove', icon: 'RF17'}, {title: '料盅退料', path: 'MaterReturn', icon: 'RF6'}, {title: '取样计数', path: 'SamplingCount', icon: 'RF1'}]
+        menu2: [{title: '人工异常处理', path: 'ExceptionHand', icon: 'RF14'}, {title: '人工混碾搬运', path: 'MixMove', icon: 'RF15'}, {title: '压机料盅转移', path: 'LzTransfer', icon: 'RF16'}, {title: '人工压制上料', path: 'Suppress', icon: 'RF8'}, {title: '人工压制下料', path: 'SuppressDown', icon: 'RF9'}, {title: '人工出窑', path: 'KilnOut', icon: 'RF4'}, {title: '载具转移', path: 'KilnMove', icon: 'RF17'}, {title: '料盅退料', path: 'MaterReturn', icon: 'RF6'}, {title: '取样计数', path: 'SamplingCount', icon: 'RF1'}]
       }
     }
   },
diff --git a/src/pages/proj/BelowGradeReport.vue b/src/pages/proj/BelowGradeReport.vue
index c4a257b..47b72e0 100644
--- a/src/pages/proj/BelowGradeReport.vue
+++ b/src/pages/proj/BelowGradeReport.vue
@@ -1,7 +1,7 @@
 <template>
   <section>
     <nav-bar title="不合格品上报"></nav-bar>
-    <section class="content mgt186">
+    <section class="content mgt86">
       <div class="filter-wraper">
         <div class="bottom-filter-tip">
           <div class="filter-label txtjustify">设备</div>
diff --git a/src/pages/proj/CallDefective.vue b/src/pages/proj/CallDefective.vue
index 0f37e50..6bc4eec 100644
--- a/src/pages/proj/CallDefective.vue
+++ b/src/pages/proj/CallDefective.vue
@@ -1,7 +1,7 @@
 <template>
   <section>
     <nav-bar title="呼叫次品料"></nav-bar>
-    <section class="content mgt186">
+    <section class="content mgt86">
       <div class="filter-wraper">
         <div class="bottom-filter-tip">
           <div class="filter-label txtjustify">设备</div>
diff --git a/src/pages/proj/CallEmpty.vue b/src/pages/proj/CallEmpty.vue
index a58d2eb..1484b11 100644
--- a/src/pages/proj/CallEmpty.vue
+++ b/src/pages/proj/CallEmpty.vue
@@ -1,7 +1,7 @@
 <template>
   <section>
     <nav-bar title="叫空"></nav-bar>
-    <section class="content mgt186">
+    <section class="content mgt86">
       <div class="filter-wraper">
         <div class="bottom-filter-tip">
           <div class="filter-label txtjustify">区域</div>
diff --git a/src/pages/proj/CallMater.vue b/src/pages/proj/CallMater.vue
index 7f880a4..cf55e91 100644
--- a/src/pages/proj/CallMater.vue
+++ b/src/pages/proj/CallMater.vue
@@ -1,7 +1,7 @@
 <template>
   <section>
     <nav-bar title="叫料"></nav-bar>
-    <section class="content mgt186">
+    <section class="content mgt86">
       <div class="filter-wraper">
         <div class="bottom-filter-tip">
           <div class="filter-label txtjustify">区域</div>
diff --git a/src/pages/proj/CreateChargingTask.vue b/src/pages/proj/CreateChargingTask.vue
index 0c00c3c..3b6e13a 100644
--- a/src/pages/proj/CreateChargingTask.vue
+++ b/src/pages/proj/CreateChargingTask.vue
@@ -1,7 +1,7 @@
 <template>
   <section>
     <nav-bar title="AGV充电"></nav-bar>
-    <section class="content mgt186">
+    <section class="content mgt86">
     </section>
     <section class="submit-bar">
       <button class="btn submit-button" :disabled="disabled1" @click="_createChargingTask('1')">1号车充电</button>
diff --git a/src/pages/proj/KunliaoManage.vue b/src/pages/proj/KunliaoManage.vue
index 8abe679..c108550 100644
--- a/src/pages/proj/KunliaoManage.vue
+++ b/src/pages/proj/KunliaoManage.vue
@@ -1,7 +1,7 @@
 <template>
   <section>
     <nav-bar title="困料管理"></nav-bar>
-    <section class="content mgt186">
+    <section class="content mgt86">
       <div class="filter-wraper">
         <search-box
         label="载具"
diff --git a/src/pages/proj/RuyaoManage.vue b/src/pages/proj/RuyaoManage.vue
index 0160dcd..137c78f 100644
--- a/src/pages/proj/RuyaoManage.vue
+++ b/src/pages/proj/RuyaoManage.vue
@@ -1,7 +1,7 @@
 <template>
   <section>
     <nav-bar title="入窑管理"></nav-bar>
-    <section class="content mgt186">
+    <section class="content mgt86">
       <div class="filter-wraper">
         <search-box
         label="载具"
diff --git a/src/pages/proj/SendEmpty.vue b/src/pages/proj/SendEmpty.vue
index d672ce7..ea18521 100644
--- a/src/pages/proj/SendEmpty.vue
+++ b/src/pages/proj/SendEmpty.vue
@@ -1,7 +1,7 @@
 <template>
   <section>
     <nav-bar title="送空"></nav-bar>
-    <section class="content mgt186">
+    <section class="content mgt86">
       <div class="filter-wraper">
         <div class="bottom-filter-tip">
           <div class="filter-label txtjustify">区域</div>
diff --git a/src/pages/proj/SendMater.vue b/src/pages/proj/SendMater.vue
index 8d9863e..34d383a 100644
--- a/src/pages/proj/SendMater.vue
+++ b/src/pages/proj/SendMater.vue
@@ -1,7 +1,7 @@
 <template>
   <section>
     <nav-bar title="送料"></nav-bar>
-    <section class="content mgt186">
+    <section class="content mgt86">
       <div class="filter-wraper">
         <div class="bottom-filter-tip">
           <div class="filter-label txtjustify">区域</div>
diff --git a/src/pages/proj/VehicleBind.vue b/src/pages/proj/VehicleBind.vue
index bd10f80..1754e1c 100644
--- a/src/pages/proj/VehicleBind.vue
+++ b/src/pages/proj/VehicleBind.vue
@@ -1,7 +1,7 @@
 <template>
   <section>
     <nav-bar title="载具绑定"></nav-bar>
-    <section class="content mgt186">
+    <section class="content mgt86">
       <div class="filter-wraper">
         <div class="bottom-filter-tip">
           <div class="filter-label txtjustify">区域</div>
diff --git a/src/pages/proj/VehicleUnbind.vue b/src/pages/proj/VehicleUnbind.vue
index d227585..d37f41f 100644
--- a/src/pages/proj/VehicleUnbind.vue
+++ b/src/pages/proj/VehicleUnbind.vue
@@ -1,7 +1,7 @@
 <template>
   <section>
     <nav-bar title="载具解绑"></nav-bar>
-    <section class="content mgt186">
+    <section class="content mgt86">
       <div class="filter-wraper">
         <div class="bottom-filter-tip">
           <div class="filter-label txtjustify">区域</div>
diff --git a/src/style/common.styl b/src/style/common.styl
index f798bbf..0b8341f 100644
--- a/src/style/common.styl
+++ b/src/style/common.styl
@@ -87,6 +87,9 @@ html,body
 .mgt15
   margin-top: .15rem !important
 
+.mgt86
+  margin-top 0.86rem !important
+
 .mgl20
   margin-left: .2rem !important
 
@@ -220,7 +223,10 @@ html,body
 
 /** 公共样式 **/
 header
+  position fixed
+  top 0
   _fj()
+  width 100%
   height .86rem
   padding 0 .24rem
   background: $red