From ebf83c4749866d724d5acc58f04b7d9f83dbbcad Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Thu, 27 Oct 2022 14:55:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/getData.js         |   3 +-
 src/pages/proj/RunOperate.vue | 246 ++++++++++++++++++++++------------
 src/style/layout.styl         |   1 +
 3 files changed, 162 insertions(+), 88 deletions(-)

diff --git a/src/config/getData.js b/src/config/getData.js
index 645517c..4898f08 100644
--- a/src/config/getData.js
+++ b/src/config/getData.js
@@ -31,7 +31,8 @@ export const instOperation = (uuid, type) => post('api/andxy2/hand/inst', {
 // 1.3信号查询(定时)
 export const queryDeviceInfo = () => post('api/hand/queryDeviceInfo', {})
 // 1.3下发设备信号（按照查询的字段，每次1个信号）
-export const putPoint = (type, value) => post('api/hand/putPoint', {
+export const putPoint = (name, type, value) => post('api/hand/putPoint', {
+  name: name,
   type: type,
   value: value
 })
diff --git a/src/pages/proj/RunOperate.vue b/src/pages/proj/RunOperate.vue
index 9c57587..f3c41ec 100644
--- a/src/pages/proj/RunOperate.vue
+++ b/src/pages/proj/RunOperate.vue
@@ -5,20 +5,20 @@
       <div class="box1">
         <div class="d-status">
           <label class="d-label1">设备状态</label>
-          <span class="obt obt1">自动</span>
-          <span class="obt obt2">系统运行</span>
-          <span class="obt obt3">联机模式</span>
+          <span class="obt" :class="{'obt1': rData.is_auto === '1'}">自动</span>
+          <span class="obt" :class="{'obt2': rData.is_auto === '1'}">系统运行</span>
+          <span class="obt" :class="{'obt3': rData.is_auto === '1'}" :disabled="disabled1" @click="handleChange1">联机模式</span>
         </div>
         <div class="d_item">
           <div class="d_input">
             <label class="d-label2">A侧档压压力(kg)</label>
-            <div class="showbox bggray">{{val1}}</div>
+            <div class="showbox bggray">{{rData.a_pressure}}</div>
           </div>
         </div>
         <div class="d_item">
           <div class="d_input">
             <label class="d-label2">B侧档压压力(kg)</label>
-            <div class="showbox bggray">{{val1}}</div>
+            <div class="showbox bggray">{{rData.b_pressure}}</div>
           </div>
         </div>
         <div class="d_item">
@@ -43,7 +43,7 @@
           <div class="d_input">
             <label class="d-label2">颜色</label>
             <div class="f_item">
-              <el-select v-model="val4" placeholder="请选择">
+              <el-select v-model="val4" placeholder="请选择" @change="toColor">
                 <el-option
                   v-for="item in options"
                   :key="item.value"
@@ -67,8 +67,8 @@
           </div>
         </div>
         <div class="d_btm">
-          <button class="button--primary">启动</button>
-          <button class="button--primary">停止</button>
+          <button class="button--primary button--defalut" :disabled="disabled1" @touchstart="handleTouchStart1" @touchend="handleTouchEnd1">启动</button>
+          <button class="button--primary button--defalut" :disabled="disabled1" @touchstart="handleTouchStart2" @touchend="handleTouchEnd2">停止</button>
         </div>
       </div>
       <div class="box2">
@@ -76,64 +76,64 @@
           <ul class="ul-r">
             <li>
               <label>主输送一段</label>
-              <button class="button--primary button--defalut">有料</button>
-              <span>1</span>
-              <span>2</span>
+              <button class="button--primary button--defalut" :disabled="disabled1" @click="handleChange_m('main_convey1')">有料</button>
+              <span :class="{'bgcgreen': rData.main_convey1_seat1 === '1'}">1</span>
+              <span :class="{'bgcgreen': rData.main_convey1_seat2 === '1'}">2</span>
             </li>
             <li>
               <label>喷墨</label>
-              <button class="button--primary button--defalut">一段出料完成</button>
-              <span>1</span>
-              <span>2</span>
-              <span>3</span>
+              <button class="button--primary button--defalut" :disabled="disabled1" @click="handleChange_m('ink_jet')">一段出料完成</button>
+              <span :class="{'bgcgreen': rData.ink_jet_seat1 === '1'}">1</span>
+              <span :class="{'bgcgreen': rData.ink_jet_seat2 === '1'}">2</span>
+              <span :class="{'bgcgreen': rData.ink_jet_seat3 === '1'}">3</span>
             </li>
             <li>
               <label>主输送二段</label>
-              <button class="button--primary button--defalut">有料</button>
-              <span>1</span>
+              <button class="button--primary button--defalut" :disabled="disabled1" @click="handleChange_m('main_convey2')">有料</button>
+              <span :class="{'bgcgreen': rData.main_convey2_seat1 === '1'}">1</span>
             </li>
             <li>
               <label>主输送三段</label>
-              <button class="button--primary button--defalut">有料合格</button>
-              <button class="button--primary button--defalut">有料不合格</button>
-              <span>1</span>
-              <span>2</span>
+              <button class="button--primary button--defalut" :disabled="disabled1" @click="handleChange_m('main_convey3_has_pass')">有料合格</button>
+              <button class="button--primary button--defalut" :disabled="disabled1" @click="handleChange_m('main_convey3_has_noPass')">有料不合格</button>
+              <span :class="{'bgcgreen': rData.main_convey3_seat1 === '1'}">1</span>
+              <span :class="{'bgcgreen': rData.main_convey3_seat2 === '1'}">2</span>
             </li>
             <li>
               <label>套帽A缓存</label>
-              <button class="button--primary button--defalut">有料</button>
-              <span>1</span>
-              <span>2</span>
+              <button class="button--primary button--defalut" :disabled="disabled1" @click="handleChange_m('cowl_a_cache')">有料</button>
+              <span :class="{'bgcgreen': rData.cowl_a_cache_seat1 === '1'}">1</span>
+              <span :class="{'bgcgreen': rData.cowl_a_cache_seat2 === '1'}">2</span>
             </li>
             <li>
               <label>套帽A套帽</label>
-              <button class="button--primary button--defalut">有料</button>
-              <span>1</span>
-              <span>2</span>
-              <button class="button--primary button--defalut">合格</button>
+              <button class="button--primary button--defalut" :disabled="disabled1" @click="handleChange_m('cowl_a_cowl')">有料</button>
+              <span :class="{'bgcgreen': rData.cowl_a_cowl_seat1 === '1'}">1</span>
+              <span :class="{'bgcgreen': rData.cowl_a_cowl_seat2 === '1'}">2</span>
+              <button class="button--primary button--defalut" :class="{'bgcgreen': rData.cowl_a_cowl_pass}">合格</button>
             </li>
             <li>
               <label>反向输送</label>
-              <button class="button--primary button--defalut">有料</button>
-              <span>1</span>
-              <span>2</span>
-              <span>3</span>
-              <button class="button--primary button--defalut">合格</button>
+              <button class="button--primary button--defalut" :disabled="disabled1" @click="handleChange_m('reverse_convey')">有料</button>
+              <span :class="{'bgcgreen': rData.reverse_convey_seat1 === '1'}">1</span>
+              <span :class="{'bgcgreen': rData.reverse_convey_seat2 === '1'}">2</span>
+              <span :class="{'bgcgreen': rData.reverse_convey_seat3 === '1'}">3</span>
+              <button class="button--primary button--defalut" :class="{'bgcgreen': rData.reverse_convey_pass}">合格</button>
             </li>
             <li>
               <label>套帽B缓存</label>
-              <button class="button--primary button--defalut">有料</button>
-              <span>1</span>
-              <span>2</span>
-              <button class="button--primary button--defalut">合格</button>
+              <button class="button--primary button--defalut" :disabled="disabled1" @click="handleChange_m('cowl_b_cache')">有料</button>
+              <span :class="{'bgcgreen': rData.cowl_b_cache_seat1 === '1'}">1</span>
+              <span :class="{'bgcgreen': rData.cowl_b_cache_seat2 === '1'}">2</span>
+              <button class="button--primary button--defalut" :class="{'bgcgreen': rData.cowl_b_cache}">合格</button>
             </li>
             <li>
               <label>套帽B套帽</label>
-              <button class="button--primary button--defalut">有料</button>
-              <span>1</span>
-              <span>2</span>
-              <button class="button--primary button--defalut">套帽A合格</button>
-              <button class="button--primary button--defalut">套帽B合格</button>
+              <button class="button--primary button--defalut" :disabled="disabled1" @click="handleChange_m('cowl_b_cowl')">有料</button>
+              <span :class="{'bgcgreen': rData.cowl_b_cowl_seat1 === '1'}">1</span>
+              <span :class="{'bgcgreen': rData.cowl_b_cowl_seat2 === '1'}">2</span>
+              <button class="button--primary button--defalut" :class="{'bgcgreen': rData.cowl_b_cowl_aPass}">套帽A合格</button>
+              <button class="button--primary button--defalut" :class="{'bgcgreen': rData.cowl_b_cowl_bPass}">套帽B合格</button>
             </li>
           </ul>
           <div class="d_item">
@@ -149,15 +149,15 @@
           <ul class="ul-r">
             <li>
               <label>裹膜前段</label>
-              <button class="button--primary button--defalut">有料</button>
-              <span>1</span>
-              <span>2</span>
+              <button class="button--primary button--defalut" :disabled="disabled1" @click="handleChange_m('wrap_ago')">{{rData.wrap_ago === '1' ? '有料' : '无料'}}</button>
+              <span :class="{'bgcgreen': rData.wrap_ago_seat1 === '1'}">1</span>
+              <span :class="{'bgcgreen': rData.wrap_ago_seat2 === '1'}">2</span>
             </li>
             <li>
               <label>裹膜后段</label>
-              <button class="button--primary button--defalut">有料</button>
-              <span>1</span>
-              <span>2</span>
+              <button class="button--primary button--defalut" :disabled="disabled1" @click="handleChange_m('wrap_after')">有料</button>
+              <span :class="{'bgcgreen': rData.wrap_after_seat1 === '1'}">1</span>
+              <span :class="{'bgcgreen': rData.wrap_after_seat2 === '1'}">2</span>
             </li>
           </ul>
           <div class="d_item">
@@ -168,33 +168,33 @@
           </div>
         </div>
         <div class="b3-center">
-          <span>1</span>
-          <span>2</span>
-          <span>3</span>
-          <span>4</span>
-          <span>5</span>
-          <span>6</span>
-          <span>7</span>
-          <span>8</span>
-          <span>9</span>
-          <span>10</span>
-          <span>11</span>
-          <span>12</span>
+          <span :class="{'bgcgreen': rData.strapping_seat1 === '1'}">1</span>
+          <span :class="{'bgcgreen': rData.strapping_seat2 === '1'}">2</span>
+          <span :class="{'bgcgreen': rData.strapping_seat3 === '1'}">3</span>
+          <span :class="{'bgcgreen': rData.strapping_seat4 === '1'}">4</span>
+          <span :class="{'bgcgreen': rData.strapping_seat5 === '1'}">5</span>
+          <span :class="{'bgcgreen': rData.strapping_seat6 === '1'}">6</span>
+          <span :class="{'bgcgreen': rData.strapping_seat7 === '1'}">7</span>
+          <span :class="{'bgcgreen': rData.strapping_seat8 === '1'}">8</span>
+          <span :class="{'bgcgreen': rData.strapping_seat9 === '1'}">9</span>
+          <span :class="{'bgcgreen': rData.strapping_seat10 === '1'}">10</span>
+          <span :class="{'bgcgreen': rData.strapping_seat11 === '1'}">11</span>
+          <span :class="{'bgcgreen': rData.strapping_seat12 === '1'}">12</span>
         </div>
         <div class="b3_btm">
           <div class="fl">
-            <button class="button--primary" :class="{'button--defalut': 1}" :disabled="disabled1" @click="toSure">A测摇杆出料异常复位</button>
-            <button class="button--primary" :class="{'button--defalut': 1}" :disabled="disabled1" @click="toSure">A测皮带出料异常复位</button>
-            <button class="button--primary" :class="{'button--defalut': 1}" :disabled="disabled1" @click="toSure">裹膜机控制权</button>
-            <button class="button--primary" :class="{'button--defalut': 1}" :disabled="disabled1" @click="toSure">捆扎完成</button>
+            <button class="button--primary" :class="{'button--defalut': 1}" :disabled="disabled1"  @click="handleChange_rb('a_error1_clear')">A测摇杆出料异常复位</button>
+            <button class="button--primary" :class="{'button--defalut': 1}" :disabled="disabled1"  @click="handleChange_rb('a_error2_clear')">A测皮带出料异常复位</button>
+            <button class="button--primary" :class="{'button--defalut': 1}" :disabled="disabled1"  @click="handleChange_rb('wrap_control')">裹膜机控制权</button>
+            <button class="button--primary" :class="{'button--defalut': 1}" :disabled="disabled1" @touchstart="handleTouchStart3" @touchend="handleTouchEnd3">捆扎完成</button>
           </div>
           <div class="fr">
-            <button class="button--primary" :class="{'button--defalut': 1}" :disabled="disabled1" @click="toSure">B测摇杆出料异常复位</button>
-            <button class="button--primary" :class="{'button--defalut': 1}" :disabled="disabled1" @click="toSure">B测皮带出料异常复位</button>
+            <button class="button--primary" :class="{'button--defalut': 1}" :disabled="disabled1"  @click="handleChange_rb('b_error1_clear')">B测摇杆出料异常复位</button>
+            <button class="button--primary" :class="{'button--defalut': 1}" :disabled="disabled1"  @click="handleChange_rb('b_error2_clear')">B测皮带出料异常复位</button>
           </div>
         </div>
         <div class="b3_btm2 fr">
-          <button class="button--primary" :class="{'button--defalut': 1}" :disabled="disabled1" @click="toSure">故障复位</button>
+          <button class="button--primary" :class="{'button--defalut': 1}" :disabled="disabled1" @touchstart="handleTouchStart4" @touchend="handleTouchEnd4">故障复位</button>
         </div>
       </div>
     </div>
@@ -217,7 +217,7 @@
 </template>
 
 <script>
-// import {queryDeviceInfo, putPoint} from '@config/getData'
+import {queryDeviceInfo, putPoint} from '@config/getData'
 import NavBar from '@components/NavBar.vue'
 export default {
   name: 'RunOperate',
@@ -240,6 +240,7 @@ export default {
       val6: '',
       val7: '',
       val8: '',
+      rData: '',
       options: [
         {
           value: '1',
@@ -289,10 +290,6 @@ export default {
   //   clearInterval(this.timer)
   //   this.timer = null
   // },
-  mounted () {
-    alert(window.screen.width)
-    alert(window.screen.height)
-  },
   methods: {
     refresh () {
       this._queryDeviceInfo()
@@ -300,12 +297,41 @@ export default {
         this._queryDeviceInfo()
       }, this.interTime)
     },
+    // 查询
+    async _queryDeviceInfo () {
+      let res = await queryDeviceInfo()
+      if (res.code === '1') {
+        this.rData = [...res.result]
+        this.val1 = res.result.outer_diameter
+        this.val2 = res.result.length
+        this.val3 = res.result.wall_thickness
+        this.val4 = res.result.color
+        this.val5 = res.result.jackup_num
+        this.val6 = res.result.strap_number
+      } else {
+        this.Dialog(res.desc)
+      }
+    },
+    async putPoint (name, type, value) {
+      this.disabled1 = true
+      try {
+        let res = await putPoint(name, type, value)
+        if (res.code === '1') {
+          this.toast('操作成功')
+        } else {
+          this.Dialog(res.desc)
+        }
+        this.disabled1 = false
+      } catch (err) {
+        console.log(err)
+        this.disabled1 = false
+      }
+    },
     toChange (a, b, v) {
       this.active = true
       setTimeout(() => {
         this.$refs.id.focus()
       }, 200)
-      // document.getElementById('inputId').focus()
       this.opt = a
       this.optname = b
       this.val = v
@@ -313,48 +339,91 @@ export default {
     msgSure () {
       if (this.opt === 1) {
         this.val1 = this.val
+        this.putPoint('outer_diameter', '3', this.val)
       }
       if (this.opt === 2) {
         this.val2 = this.val
+        this.putPoint('length', '3', this.val)
       }
       if (this.opt === 3) {
         this.val3 = this.val
+        this.putPoint('wall_thickness', '3', this.val)
       }
       if (this.opt === 5) {
         this.val5 = this.val
+        this.putPoint('jackup_num', '3', this.val)
       }
       if (this.opt === 6) {
         this.val6 = this.val
+        this.putPoint('strap_number', '3', this.val)
       }
       if (this.opt === 7) {
         this.val7 = this.val
+        this.putPoint('no_pass_convey_cache_num', '3', this.val)
       }
       if (this.opt === 8) {
         this.val8 = this.val
+        this.putPoint('strapping_current_step', '3', this.val)
       }
       this.active = false
     },
     msgCancle () {
       this.active = false
     },
-    handleTouchStart (event) {
+    handleChange1 () {
+      this.putPoint('mode', '2', '')
+    },
+    handleChange_m (name) {
+      this.putPoint(name, '2', '')
+    },
+    handleChange_rb (name) {
+      this.putPoint(name, '2', '')
+    },
+    handleTouchStart1 (event) {
       event.preventDefault()
-      console.log(1)
       let _this = this
-      _this.val1 = '100'
+      _this.putPoint('start', '1', '1')
     },
-    handleTouchEnd (event) {
-      console.log(2)
+    handleTouchEnd1 (event) {
       let _this = this
-      _this.val1 = '200'
+      _this.putPoint('start', '1', '0')
     },
-    toSure () {
-      console.log(2)
+    handleTouchStart2 (event) {
+      event.preventDefault()
+      let _this = this
+      _this.putPoint('stop', '1', '1')
+    },
+    handleTouchEnd2 (event) {
+      let _this = this
+      _this.putPoint('stop', '1', '0')
+    },
+    handleTouchStart3 (event) {
+      event.preventDefault()
+      let _this = this
+      _this.putPoint('strapping_finish', '1', '1')
+    },
+    handleTouchEnd3 (event) {
+      let _this = this
+      _this.putPoint('strapping_finish', '1', '0')
+    },
+    handleTouchStart4 (event) {
+      event.preventDefault()
+      let _this = this
+      _this.putPoint('error_clear', '1', '1')
+    },
+    handleTouchEnd4 (event) {
+      let _this = this
+      _this.putPoint('error_clear', '1', '0')
+    },
+    toColor (e) {
+      this.putPoint('color', '3', this.val4)
     }
   }
 }
 </script>
 <style lang="stylus" scoped>
+.bgcgreen
+  background #7BF351 !important
 .box
   display flex
   width 100%
@@ -387,15 +456,18 @@ export default {
   text-align center
   line-height .2rem
   font-size 12px
-  color #fff
   border 1px solid #eee
   padding 2px 5px
+  background-color #dcdfe6
 .obt1
   background-color blue
+  color #fff
 .obt2
   background-color green
+  color #fff
 .obt3
-  background-color #fc0
+  background-color #6798ef
+  color #fff
 .d-label2
   font-size 12px
   color #464646
@@ -416,8 +488,8 @@ export default {
   display inline-block
   // width calc(100% - .8rem)
   width 60%
-  height .34rem
-  line-height .34rem
+  height .32rem
+  line-height .32rem
   font-size .12rem
   color #606266
   text-indent .16rem
@@ -438,7 +510,7 @@ export default {
 .d_btm
   margin-top .12rem
   button
-    font-size 16px
+    font-size 12px
 .b3-top
   width 100%
   // height 3rem
@@ -491,7 +563,7 @@ ul
     padding 0
 .b3_btm2
   position fixed
-  bottom .5rem
+  bottom .3rem
   right 0
   .button--primary
     font-size 12px
diff --git a/src/style/layout.styl b/src/style/layout.styl
index 311c9c5..72fb53f 100644
--- a/src/style/layout.styl
+++ b/src/style/layout.styl
@@ -611,6 +611,7 @@ header
   padding-right .3rem
 .el-input__suffix
   right .05rem
+  top .05rem
 .el-select .el-input .el-select__caret
   font-size .14rem
 .el-input__icon