改

2022-10-27 19:24:31 +08:00
parent baf73370f7
commit aa2c671bd5
2 changed files with 67 additions and 45 deletions
--- a/src/pages/proj/RunOperate.vue
+++ b/src/pages/proj/RunOperate.vue
@@ -6,8 +6,8 @@
        <div class="d-status">
          <label class="d-label1">设备状态</label>
          <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>
+          <span class="obt" :class="{'obt2': rData.is_running === '1'}" :disabled="disabled1" @click="handleChange0()">系统运行</span>
+          <span class="obt mgl15" :class="{'obt3': rData.mode === '1'}" :disabled="disabled1" @click="handleChange1()">联机模式</span>
        </div>
        <div class="d_item">
          <div class="d_input">
@@ -76,45 +76,45 @@
          <ul class="ul-r">
            <li>
              <label>主输送一段</label>
-              <button class="button--primary button--defalut" :disabled="disabled1" @click="handleChange_m('main_convey1')">有料</button>
+              <button class="button--primary button--defalut" :class="{'bgcgreen': rData.main_convey1 === '1'}" :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" :disabled="disabled1" @click="handleChange_m('ink_jet')">一段出料完成</button>
+              <button class="button--primary button--defalut" :class="{'bgcgreen': rData.ink_jet === '1'}" :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" :disabled="disabled1" @click="handleChange_m('main_convey2')">有料</button>
+              <button class="button--primary button--defalut" :class="{'bgcgreen': rData.main_convey2 === '1'}" :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" :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>
+              <button class="button--primary button--defalut" :class="{'bgcgreen': rData.main_convey3_has_pass === '1'}" :disabled="disabled1" @click="handleChange_m('main_convey3_has_pass')">有料合格</button>
+              <button class="button--primary button--defalut" :class="{'bgcgreen': rData.main_convey3_has_noPass === '1'}" :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" :disabled="disabled1" @click="handleChange_m('cowl_a_cache')">有料</button>
+              <button class="button--primary button--defalut" :class="{'bgcgreen': rData.cowl_a_cache === '1'}" :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" :disabled="disabled1" @click="handleChange_m('cowl_a_cowl')">有料</button>
+              <button class="button--primary button--defalut" :class="{'bgcgreen': rData.cowl_a_cowl === '1'}" :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--defalut" :class="{'bgcgreen': rData.cowl_a_cowl_pass}">合格</button>
            </li>
            <li>
              <label>反向输送</label>
-              <button class="button--primary button--defalut" :disabled="disabled1" @click="handleChange_m('reverse_convey')">有料</button>
+              <button class="button--primary button--defalut" :class="{'bgcgreen': rData.reverse_convey === '1'}" :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>
@@ -122,14 +122,14 @@
            </li>
            <li>
              <label>套帽B缓存</label>
-              <button class="button--primary button--defalut" :disabled="disabled1" @click="handleChange_m('cowl_b_cache')">有料</button>
+              <button class="button--primary button--defalut" :class="{'bgcgreen': rData.cowl_b_cache === '1'}" :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--defalut" :class="{'bgcgreen': rData.cowl_b_cache}">合格</button>
            </li>
            <li>
              <label>套帽B套帽</label>
-              <button class="button--primary button--defalut" :disabled="disabled1" @click="handleChange_m('cowl_b_cowl')">有料</button>
+              <button class="button--primary button--defalut" :class="{'bgcgreen': rData.cowl_b_cowl === '1'}" :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--defalut" :class="{'bgcgreen': rData.cowl_b_cowl_aPass}">套帽A合格</button>
@@ -149,13 +149,13 @@
          <ul class="ul-r">
            <li>
              <label>裹膜前段</label>
-              <button class="button--primary button--defalut" :disabled="disabled1" @click="handleChange_m('wrap_ago')">{{rData.wrap_ago === '1' ? '有料' : '无料'}}</button>
+              <button class="button--primary button--defalut" :class="{'bgcgreen': rData.wrap_ago === '1'}" :disabled="disabled1" @click="handleChange_m('wrap_ago')">有料</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" :disabled="disabled1" @click="handleChange_m('wrap_after')">有料</button>
+              <button class="button--primary button--defalut" :class="{'bgcgreen': rData.wrap_after === '1'}" :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>
@@ -226,6 +226,7 @@ export default {
  },
  data () {
    return {
+      flag: false, // 返回标识 暂时不用
      opt: '', // 标识
      optname: '',
      interTime: this.$store.getters.setTime,
@@ -283,13 +284,13 @@ export default {
      disabled2: false
    }
  },
-  // created () {
-  //   this.refresh()
-  // },
-  // beforeDestroy () {
-  //   clearInterval(this.timer)
-  //   this.timer = null
-  // },
+  created () {
+    this.refresh()
+  },
+  beforeDestroy () {
+    clearInterval(this.timer)
+    this.timer = null
+  },
  methods: {
    refresh () {
      this._queryDeviceInfo()
@@ -301,29 +302,40 @@ export default {
    async _queryDeviceInfo () {
      let res = await queryDeviceInfo()
      if (res.code === '1') {
-        this.rData = [...res.result]
+        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
+        this.val7 = res.result.no_pass_convey_cache_num
+        this.val8 = res.result.strapping_current_step
      } else {
        this.Dialog(res.desc)
      }
    },
-    async putPoint (name, type, value) {
+    async putPoint (name, type, value, a) {
      this.disabled1 = true
      try {
        let res = await putPoint(name, type, value)
        if (res.code === '1') {
          this.toast('操作成功')
+          if (!a) {
+            // 点动不更新
+            setTimeout(() => {
+              this._queryDeviceInfo()
+            }, 300)
+            this.flag = true
+          }
        } else {
          this.Dialog(res.desc)
+          this.flag = false
        }
        this.disabled1 = false
      } catch (err) {
        console.log(err)
+        this.flag = false
        this.disabled1 = false
      }
    },
@@ -338,40 +350,47 @@ export default {
    },
    msgSure () {
      if (this.opt === 1) {
-        this.val1 = this.val
        this.putPoint('outer_diameter', '3', this.val)
+        this.val1 = this.val
      }
      if (this.opt === 2) {
-        this.val2 = this.val
        this.putPoint('length', '3', this.val)
+        this.val2 = this.val
      }
      if (this.opt === 3) {
-        this.val3 = this.val
        this.putPoint('wall_thickness', '3', this.val)
+        this.val3 = this.val
      }
      if (this.opt === 5) {
-        this.val5 = this.val
        this.putPoint('jackup_num', '3', this.val)
+        this.val5 = this.val
      }
      if (this.opt === 6) {
-        this.val6 = this.val
        this.putPoint('strap_number', '3', this.val)
+        this.val6 = this.val
      }
      if (this.opt === 7) {
-        this.val7 = this.val
        this.putPoint('no_pass_convey_cache_num', '3', this.val)
+        this.val7 = this.val
      }
      if (this.opt === 8) {
-        this.val8 = this.val
        this.putPoint('strapping_current_step', '3', this.val)
+        this.val8 = this.val
      }
      this.active = false
    },
    msgCancle () {
      this.active = false
    },
-    handleChange1 () {
-      this.putPoint('mode', '2', '')
+    async handleChange1 () {
+      await this.putPoint('mode', '2', '')
+      // if (this.flag) {
+      //   if (this.rData.mode === '0') {
+      //     this.rData.mode = '1'
+      //   } else {
+      //     this.rData.mode = '0'
+      //   }
+      // }
    },
    handleChange_m (name) {
      this.putPoint(name, '2', '')
@@ -382,38 +401,38 @@ export default {
    handleTouchStart1 (event) {
      event.preventDefault()
      let _this = this
-      _this.putPoint('start', '1', '1')
+      _this.putPoint('start', '1', '1', 1)
    },
    handleTouchEnd1 (event) {
      let _this = this
-      _this.putPoint('start', '1', '0')
+      _this.putPoint('start', '1', '0', 1)
    },
    handleTouchStart2 (event) {
      event.preventDefault()
      let _this = this
-      _this.putPoint('stop', '1', '1')
+      _this.putPoint('stop', '1', '1', 1)
    },
    handleTouchEnd2 (event) {
      let _this = this
-      _this.putPoint('stop', '1', '0')
+      _this.putPoint('stop', '1', '0', 1)
    },
    handleTouchStart3 (event) {
      event.preventDefault()
      let _this = this
-      _this.putPoint('strapping_finish', '1', '1')
+      _this.putPoint('strapping_finish', '1', '1', 1)
    },
    handleTouchEnd3 (event) {
      let _this = this
-      _this.putPoint('strapping_finish', '1', '0')
+      _this.putPoint('strapping_finish', '1', '0', 1)
    },
    handleTouchStart4 (event) {
      event.preventDefault()
      let _this = this
-      _this.putPoint('error_clear', '1', '1')
+      _this.putPoint('error_clear', '1', '1', 1)
    },
    handleTouchEnd4 (event) {
      let _this = this
-      _this.putPoint('error_clear', '1', '0')
+      _this.putPoint('error_clear', '1', '0', 1)
    },
    toColor (e) {
      this.putPoint('color', '3', this.val4)
@@ -422,6 +441,8 @@ export default {
 }
 </script>
 <style lang="stylus" scoped>
+.mgl15
+  margin-left 15px
 .bgcgreen
  background #7BF351 !important
  border none
@@ -464,7 +485,7 @@ export default {
  background-color blue
  color #fff
 .obt2
-  background-color green
+  background-color #5cc241
  color #fff
 .obt3
  background-color #6798ef
@@ -588,9 +609,10 @@ ul
  width 35%
 .button--primary
  font-size 12px
-  border 1px solid #d7592f
-  background #ffffff8c
-  border-radius 5px
+  // border 1px solid #d7592f
+  // background #ffffff8c
+  // border-radius 5px
 .button--defalut
  border-radius 5px
+  border none
 </style>
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -14,7 +14,7 @@ export default new Router({
  routes: [
    {
      path: '/',
-      redirect: '/RunOperate'
+      redirect: '/login'
    },
    {
      path: '/login',