From d38ac8a1c28172e110ae270730851f947152eb8a Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Wed, 29 Jun 2022 16:17:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E4=BD=8D=E5=8F=96=E6=94=BE=E8=B4=A7?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/getData2.js           |  2 +-
 src/pages/login/Home.vue         |  2 +-
 src/pages/proj/PointRelease.vue  | 72 ++++++++++++++++----------------
 src/pages/proj/PointRelease2.vue |  2 +-
 src/router/index.js              |  2 +-
 5 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/src/config/getData2.js b/src/config/getData2.js
index 99d01c6..7afc421 100644
--- a/src/config/getData2.js
+++ b/src/config/getData2.js
@@ -49,7 +49,7 @@ export const handTask2 = (code, mtype, type, batch) => post('api/aja/hand/task2'
   batch: batch
 })
 
-// 1.5点位放货确认
+// 1.5点位取放货确认
 export const handpointPut = (code, type) => post('api/aja/hand/pointPut', {
   device_code: code,
   status_type: type
diff --git a/src/pages/login/Home.vue b/src/pages/login/Home.vue
index 45f88c7..924f870 100644
--- a/src/pages/login/Home.vue
+++ b/src/pages/login/Home.vue
@@ -18,7 +18,7 @@
         <!-- <li @click="toPage('taskgenerate')">任务生成</li> -->
         <li @click="toPage('painttask')">任务生成</li>
         <li @click="toPage('sitemanage')">站点管理</li>
-        <li @click="toPage('PointRelease')">点位放货确认</li>
+        <li @click="toPage('PointRelease')">点位取放货确认</li>
         <li @click="toPage('taskmanage')">任务管理</li>
         <li @click="toPage('zlmanage')">指令管理</li>
       </ul>
diff --git a/src/pages/proj/PointRelease.vue b/src/pages/proj/PointRelease.vue
index 938fd18..d76d9cc 100644
--- a/src/pages/proj/PointRelease.vue
+++ b/src/pages/proj/PointRelease.vue
@@ -1,6 +1,6 @@
 <template>
   <section>
-    <nav-bar title="点位放货确认"></nav-bar>
+    <nav-bar title="点位取放货确认"></nav-bar>
     <section class="content mgt15">
       <div class="clear icons">
         <div class="fl item_icon">
@@ -39,7 +39,7 @@
         </div>
       </div>
     </section>
-    <div v-if="obj.status === ('0' || '1' || '2' || '3')" class="msg_wrapper">
+    <div v-if="obj.status === '0' || obj.status === '1' || obj.status === '2' || obj.status === '3'" class="msg_wrapper">
       <div class="msg_box">
         <div class="msg_item">
           <div class="label_item">当前设备</div>
@@ -110,12 +110,14 @@ export default {
       obj: {},
       batch: '',
       disabled1: false,
-      disabled2: false
+      disabled2: false,
+      disabled: false
     }
   },
   mounted () {
     document.body.removeAttribute('class', 'login-bg')
     this.initArea()
+    this.initHandMatrial()
   },
   beforeDestroy () {
     clearInterval(this.timer)
@@ -226,47 +228,43 @@ export default {
         if (res.code === '1') {
           this.toast(res.desc)
           clearInterval(this.timer)
-          var that = this
           setTimeout(() => {
-            that.initPonit(this.regobj)
+            this.initPonit(this.regobj)
             this.refresh(this.regobj)
-            this.value = ''
-            this.batch = ''
-            this.disabled1 = false
-            this.disabled2 = false
-          }, 2000)
+          }, 200)
         } else {
           this.Dialog(res.desc)
-          this.value = ''
-          this.batch = ''
-          this.disabled1 = false
-          this.disabled2 = false
         }
+        this.msgCancle()
+        this.disabled1 = false
+        this.disabled2 = false
       } catch (err) {
-        console.log(err)
-        this.value = ''
-        this.batch = ''
+        this.msgCancle()
         this.disabled1 = false
         this.disabled2 = false
       }
     },
     cancle () {
       this.active = false
+      this.obj = {}
+      this.value = ''
+      this.batch = ''
     },
     async toSure () {
       this.disabled = true
       try {
-        let res = await handpointPut(this.obj.device_code, '1')
+        let res = await handpointPut(this.obj.device_code, '2')
         if (res.code === '1') {
-          clearInterval(this.timer)
           this.toast(res.desc)
-          this.initPonit(this.reg)
-          this.refresh(this.reg)
-          this.obj = {}
+          clearInterval(this.timer)
+          setTimeout(() => {
+            this.initPonit(this.regobj)
+            this.refresh(this.regobj)
+          }, 200)
         } else {
           this.Dialog(res.desc)
         }
-        this.active = false
+        this.cancle()
         this.disabled = false
       } catch (e) {
         this.active = false
@@ -280,17 +278,17 @@ export default {
 <style lang="stylus" scoped>
 @import '~@style/mixin'
 .icons
-  height 24px
+  height .24rem
   margin-bottom .12rem
 .item_icon
   _fj()
   margin-right .1rem
 .color_icon
-  _wh(15px,15px)
+  _wh(.2rem,.2rem)
   border-radius 50%
   margin-right .1rem
 .font_icon
-  _font(16px, 24px, #000)
+  _font(.28rem, .24rem, #000)
 .locate_block
   width 100%
   background-color #fff
@@ -299,15 +297,15 @@ export default {
   margin-bottom .12rem
 .locate_name
   position relative
-  _wh(100%,24px)
+  _wh(100%,.48rem)
   h2
-    _font(16px,24px,#000,500)
+    _font(.32rem,.48rem,#000,500)
 .site_block
   _wh(100%,auto)
   overflow hidden
   transition height .3s
 .site_item
-  _wh(32%,50px)
+  _wh(32%,1rem)
   padding 0 .1rem
   margin-top .12rem
   background-color #e5e5e5
@@ -317,17 +315,17 @@ export default {
   &:nth-child(3n)
     margin-right 0
 .site_item_box
-  _wh(100%, 40px)
-  margin 5px 0
+  _wh(100%, .8rem)
+  margin 0.1rem 0
   overflow hidden
   h3
     display block
-    width 18px
-    _font(14px,20px,#000,500)
+    width .36rem
+    _font(.28rem,.4rem,#000,500)
   p
     display block
-    width calc(100% - 18px)
-    _font(14px,20px,#999)
+    width calc(100% - .36rem)
+    _font(.28rem,.4rem,#999)
     background-color #fff
     border-radius 3px
     padding 0 .05rem
@@ -335,8 +333,8 @@ export default {
   position absolute
   right 0
   top 0
-  _wh(24px,24px)
-  _font(20px,24px,$red,,right)
+  _wh(.48rem,.48rem)
+  _font(.4rem,.48rem,$red,,right)
   transition all .3s
   transform rotateZ(180deg)
 .is_reverse
diff --git a/src/pages/proj/PointRelease2.vue b/src/pages/proj/PointRelease2.vue
index e77a35b..a9a1e5c 100644
--- a/src/pages/proj/PointRelease2.vue
+++ b/src/pages/proj/PointRelease2.vue
@@ -1,6 +1,6 @@
 <template>
   <section>
-    <nav-bar title="点位放货确认"></nav-bar>
+    <nav-bar title="点位取放货确认"></nav-bar>
     <section class="content mgt15">
       <div class="clear icons">
         <div class="fl item_icon">
diff --git a/src/router/index.js b/src/router/index.js
index ade6977..5e8c8ef 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -65,7 +65,7 @@ export default new Router({
       component: siteManage
     },
     {
-      path: '/pointrelease', // 点位放货确认
+      path: '/pointrelease', // 点位取放货确认
       component: PointRelease
     },
     {