From b7b8b5e9f55515d0a753756064dc40865d7f8de3 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 17 Jul 2023 17:00:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E6=B4=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/getData1.js                       |  3 +-
 src/config/getData2.js                       | 20 +++----
 src/pages/modules/clean/cleaning-loading.vue |  6 +--
 src/pages/modules/clean/index.vue            | 57 +++++++++++++++++---
 4 files changed, 63 insertions(+), 23 deletions(-)

diff --git a/src/config/getData1.js b/src/config/getData1.js
index 79f77ab..d7d006d 100644
--- a/src/config/getData1.js
+++ b/src/config/getData1.js
@@ -43,8 +43,7 @@ export const authority = () => {
         name: '清洗管理',
         sonTree: [
           {menu_id: '1', name: '清洗上料', path: '/cleaningloading'},
-          {menu_id: '2', name: '清洗下料', path: '/cleaningcutting'},
-          {menu_id: '3', name: '人工倒料', path: '/manpour'}
+          {menu_id: '2', name: '人工倒料', path: '/manpour'}
         ]
       },
       {menu_id: '6',
diff --git a/src/config/getData2.js b/src/config/getData2.js
index fc97036..992caad 100644
--- a/src/config/getData2.js
+++ b/src/config/getData2.js
@@ -321,16 +321,16 @@ export const washSubmitWash = (arr) => post('api/pda/wash/submitWash', arr)
  * 清洗下料
  */
 // 1.1查询列表
-// export const washWashTasks = (area) => post('api/pda/wash/washTasks', {
-//   product_area: area
-// })
-export const washWashTasks = (area) => {
-  let res = {
-    code: 200,
-    content: [{task_id: '1', sep_on: '1'}, {task_id: '2', sep_on: '2'}]
-  }
-  return res
-}
+export const washWashTasks = (area) => post('api/pda/wash/washTasks', {
+  product_area: area
+})
+// export const washWashTasks = (area) => {
+//   let res = {
+//     code: 200,
+//     content: [{task_id: '1', sep_on: '1'}, {task_id: '2', sep_on: '2'}]
+//   }
+//   return res
+// }
 // 1.2获取信息
 export const washWashVechileInfo = (area) => post('api/pda/wash/washVechileInfo', {
   product_area: area
diff --git a/src/pages/modules/clean/cleaning-loading.vue b/src/pages/modules/clean/cleaning-loading.vue
index 7c5133e..74bb3f3 100644
--- a/src/pages/modules/clean/cleaning-loading.vue
+++ b/src/pages/modules/clean/cleaning-loading.vue
@@ -56,8 +56,8 @@
                         <td>{{ e.device_code }}</td>
                         <td>{{e.material_code}}</td>
                         <td>{{e.material_spec}}</td>
-                        <td>{{e.deviceinstor_qty | numeric(3)}}</td>
-                        <td>{{ e.deviceinstor_weight | numeric(3)  }}</td>
+                        <td>{{e.deviceinstor_weight | numeric(3)}}</td>
+                        <td>{{ e.deviceinstor_qty | numeric(3)  }}</td>
                         <td>{{ e.task_code }}</td>
                     </tr>
                 </tbody>
@@ -145,6 +145,4 @@ export default {
 </script>
 
 <style lang="stylus" scoped>
-.grid_wraper
-    height calc(100% - 95px)
 </style>
diff --git a/src/pages/modules/clean/index.vue b/src/pages/modules/clean/index.vue
index e0eaa44..bbee03a 100644
--- a/src/pages/modules/clean/index.vue
+++ b/src/pages/modules/clean/index.vue
@@ -5,11 +5,18 @@
         @switchColor="switchColor"
         />
         <div class="body-container">
-            <div class="main-container">
-                <keep-alive :include="keepAlive" >
-                  <router-view/>
-                </keep-alive>
-            </div>
+          <div v-show="$route.meta.guidePath !== '4'" class="tabs_wrap">
+              <ul class="tabs">
+                  <li v-for="i in menus" :key="i.index">
+                      <router-link :to="i.router" :class="{'router-link-active': i.router === $route.path}">{{i.label}}</router-link>
+                  </li>
+              </ul>
+          </div>
+          <div class="main-container" :style="$route.meta.guidePath !== '4' ? 'height: calc(100% - 44px)' : 'height: 100%'">
+              <keep-alive :include="keepAlive" >
+                <router-view/>
+              </keep-alive>
+          </div>
         </div>
     </div>
     </template>
@@ -22,7 +29,22 @@ export default {
     jxHeader
   },
   data () {
-    return {}
+    return {
+      menus: [
+        {
+          label: '清洗上料',
+          router: '/cleaningloading'
+        },
+        {
+          label: '清洗下料',
+          router: '/cleaningcutting'
+        },
+        {
+          label: '人工倒料',
+          router: '/manpour'
+        }
+      ]
+    }
   },
   computed: {
     title () {
@@ -58,6 +80,27 @@ export default {
     margin 0 auto 10px
     padding 5px
     border 1px solid #484cce
+.tabs_wrap
+    height 34px
+    margin-bottom 10px
+.tabs
+  height 34px
+  li
+    float left
+    line-height 32px
+    text-align center
+    padding-right 10px
+    a
+      display inline-block
+      color #fff
+      width 100%
+      padding 0 10px
+      font-size 14px
+      border-bottom 1px solid #2aa6f9
+    .router-link-active
+        background linear-gradient(#0de0ff 0%,#2aa6f9 100%)
+        border-top-left-radius 12px
+        border-top-right-radius 12px
 .main-container
-    _wh(100%, 100%)
+  width 100%
 </style>