运行操作

src/config/getData.js

@@ -19,11 +19,19 @@ export const instOperation = (uuid, type) => post('api/andxy2/hand/inst', {
   type: type
 })
 // 信号下发
-// 1.3下发设备信号
-export const putPoint = (val1, val2, val3, val4, val5) => post('api/hand/putPoint', {
-  outer_diameter: val1,
-  length: val2,
-  color: val3,
-  jackup_num: val4,
-  strap_number: val5
+// // 1.3下发设备信号
+// export const putPoint = (val1, val2, val3, val4, val5) => post('api/hand/putPoint', {
+//   outer_diameter: val1,
+//   length: val2,
+//   color: val3,
+//   jackup_num: val4,
+//   strap_number: val5
+// })
+
+// 1.3信号查询(定时)
+export const queryDeviceInfo = () => post('api/hand/queryDeviceInfo', {})
+// 1.3下发设备信号（按照查询的字段，每次1个信号）
+export const putPoint = (type, value) => post('api/hand/putPoint', {
+  type: type,
+  value: value
 })

src/pages/proj/HomePage.vue

@@ -19,7 +19,8 @@
         <!-- <li @click="toSure('zlmanage')">指令管理</li> -->
         <li @click="toSure('SortingManage')">分拣管理</li>
         <li @click="toSure('OrderManage')">工单管理</li>
-        <li @click="toSure('SignalSend')">信号下发</li>
+        <!-- <li @click="toSure('SignalSend')">信号下发</li> -->
+        <li @click="toSure('RunOperate')">运行操作</li>
       </ul>
     </div>
   </div>

src/pages/proj/RunOperate.vue

@@ -0,0 +1,225 @@
+<template>
+  <div class="inner-wrap">
+    <nav-bar title="运行操作"></nav-bar>
+    <div class="wrap2">
+      <div class="wrap-filter-button">
+        <div class="wrap-filter clearfix">
+          <div class="fl filter_item">
+            <div class="filter_input">
+              <label class="filter-label">管径（mm）</label>
+              <div class="iliblock">
+                <div class="showbox" @click="toChange(1, val1)">{{val1}}</div>
+              </div>
+            </div>
+          </div>
+          <div class="fl filter_item">
+            <div class="filter_input">
+              <label class="filter-label">管长（mm）</label>
+              <div class="iliblock">
+                <!-- <input type="number" class="input" v-model="val2"> -->
+                <div class="showbox" @click="toChange(2, val2)">{{val2}}</div>
+              </div>
+            </div>
+          </div>
+          <div class="fl filter_item">
+            <div class="filter_input">
+              <label class="filter-label">壁厚（mm）</label>
+              <div class="iliblock">
+                <!-- <input type="number" class="input" v-model="val3"> -->
+                <div class="showbox" @click="toChange(3, val3)">{{val3}}</div>
+              </div>
+            </div>
+          </div>
+          <div class="fl filter_item">
+            <div class="filter_input">
+              <label class="filter-label">颜色</label>
+              <div class="iliblock from_item">
+                <el-select v-model="val4" placeholder="请选择">
+                  <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </div>
+            </div>
+          </div>
+          <div class="fl filter_item">
+            <div class="filter_input">
+              <label class="filter-label">合格提升每次提升根数</label>
+              <div class="iliblock">
+                <!-- <input type="number" class="input" v-model="val5"> -->
+                <div class="showbox" @click="toChange(5, val5)">{{val5}}</div>
+              </div>
+            </div>
+          </div>
+          <div class="fl filter_item">
+            <div class="filter_input">
+              <label class="filter-label">每捆根数</label>
+              <div class="iliblock">
+                <!-- <input type="number" class="input" v-model="val6"> -->
+                <div class="showbox" @click="toChange(6, val6)">{{val6}}</div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="wrap-button clearfix">
+          <!-- <button class="button--primary" :disabled="disabled1" @touchstart="handleTouchStart" @touchend="handleTouchEnd">启动</button>
+          <button class="button--primary" :disabled="disabled1" @click="toStop">停止</button>
+          <button class="button--primary" :class="{'button--defalut': 1}" :disabled="disabled1" @click="toSendMessage1">A测摇杆出料异常复位</button>
+          <button class="button--primary" :class="{'button--defalut': 1}" :disabled="disabled1" @click="toSendMessage1">A测皮带出料异常复位</button>
+          <button class="button--primary" :class="{'button--defalut': 1}" :disabled="disabled1" @click="toSendMessage1">裹膜机控制权</button>
+          <button class="button--primary" :class="{'button--defalut': 1}" :disabled="disabled1" @click="toSendMessage1">捆扎完成</button>
+          <button class="button--primary" :class="{'button--defalut': 1}" :disabled="disabled1" @click="toSendMessage1">B测摇杆出料异常复位</button>
+          <button class="button--primary" :class="{'button--defalut': 1}" :disabled="disabled1" @click="toSendMessage1">B测皮带出料异常复位</button>
+          <button class="button--primary" :class="{'button--defalut': 1}" :disabled="disabled1" @click="toSendMessage1">故障复位</button> -->
+        </div>
+      </div>
+    </div>
+    <div v-if="active" class="msg_wrapper">
+      <div class="msg_box">
+        <div class="msg_item">
+          <div class="label_item">修改</div>
+          <div class="from_item">
+            <input type="number" class="msg_input" v-model="val">
+          </div>
+        </div>
+        <div class="msg_btns">
+          <button class="msg_btn" :disabled="disabled2" @click="msgSure">确认</button>
+          <button class="msg_btn" @click="msgCancle">取消</button>
+        </div>
+      </div>
+    </div>
+    <div v-if="active" class="mask"></div>
+  </div>
+</template>
+
+<script>
+import {queryDeviceInfo, putPoint} from '@config/getData'
+import NavBar from '@components/NavBar.vue'
+export default {
+  name: 'RunOperate',
+  components: {
+    NavBar
+  },
+  data () {
+    return {
+      opt: '', // 标识
+      interTime: this.$store.getters.setTime,
+      timer: null,
+      active: false,
+      val: '', // 弹框值
+      val1: '',
+      val2: '',
+      val3: '',
+      val4: '',
+      val5: '',
+      val6: '',
+      options: [
+        {
+          value: '1',
+          label: '1蓝'
+        },
+        {
+          value: '2',
+          label: '2黑'
+        },
+        {
+          value: '3',
+          label: '3红'
+        },
+        {
+          value: '4',
+          label: '4白'
+        },
+        {
+          value: '5',
+          label: '5黄'
+        },
+        {
+          value: '6',
+          label: '6绿'
+        },
+        {
+          value: '7',
+          label: '7粉'
+        },
+        {
+          value: '8',
+          label: '8墨绿'
+        },
+        {
+          value: '9',
+          label: '9紫'
+        }
+      ],
+      disabled1: false,
+      disabled2: false
+    }
+  },
+  // created () {
+  //   this.refresh()
+  // },
+  // beforeDestroy () {
+  //   clearInterval(this.timer)
+  //   this.timer = null
+  // },
+  methods: {
+    refresh () {
+      this._queryDeviceInfo()
+      this.timer = setInterval(() => {
+        this._queryDeviceInfo()
+      }, this.interTime)
+    },
+    toChange (a, v) {
+      this.opt = a
+      this.val = v
+      this.active = true
+    },
+    msgSure () {
+      if (this.opt === 1) {
+        this.val1 = this.val
+      }
+      if (this.opt === 2) {
+        this.val2 = this.val
+      }
+      if (this.opt === 3) {
+        this.val3 = this.val
+      }
+      if (this.opt === 5) {
+        this.val5 = this.val
+      }
+      if (this.opt === 6) {
+        this.val6 = this.val
+      }
+      this.active = false
+    },
+    msgCancle () {
+      this.active = false
+    },
+    handleTouchStart (event) {
+      event.preventDefault()
+      console.log(1)
+      let _this = this
+      _this.val1 = '100'
+    },
+    handleTouchEnd (event) {
+      console.log(2)
+      let _this = this
+      _this.val1 = '200'
+    }
+  }
+}
+</script>
+<style lang="stylus" scoped>
+.wrap-filter-button
+  padding 0.05rem 0.2rem
+  margin 0
+.wrap-button
+  margin 0.01rem auto
+.filter-table
+  margin 0.08rem 0
+.filter_item
+  margin 0.08rem 0 0 0
+</style>

src/router/index.js

@@ -3,9 +3,9 @@ import Router from 'vue-router'
 
 const Login = r => require.ensure([], () => r(require('@page/Login')), 'Login')
 
-// const ZlManage = r => require.ensure([], () => r(require('@page/proj/ZlManage')), 'ZlManage')
 const HomePage = r => require.ensure([], () => r(require('@page/proj/HomePage')), 'HomePage')
 const SignalSend = r => require.ensure([], () => r(require('@page/proj/SignalSend')), 'SignalSend')
+const RunOperate = r => require.ensure([], () => r(require('@page/proj/RunOperate')), 'RunOperate')
 const SortingManage = r => require.ensure([], () => r(require('@page/proj/SortingManage')), 'SortingManage')
 const OrderManage = r => require.ensure([], () => r(require('@page/proj/OrderManage')), 'OrderManage')
 Vue.use(Router)
@@ -14,7 +14,7 @@ export default new Router({
   routes: [
     {
       path: '/',
-      redirect: '/login'
+      redirect: '/RunOperate'
     },
     {
       path: '/login',
@@ -25,14 +25,14 @@ export default new Router({
       path: '/home',
       component: HomePage
     },
-    // {
-    //   path: '/zlmanage',
-    //   component: ZlManage
-    // },
     {
       path: '/SignalSend',
       component: SignalSend
     },
+    {
+      path: '/RunOperate',
+      component: RunOperate
+    },
     {
       path: '/SortingManage',
       component: SortingManage

src/style/layout.styl

@@ -770,4 +770,17 @@ header
   margin-bottom .1rem
 button:disabled
   background-color #e1e1e1
-  color #444
+  color #444
+// same input
+.showbox
+  display inline-block
+  // width calc(100% - .8rem)
+  width 100%
+  height .4rem
+  line-height .3rem
+  font-size .13rem
+  color #606266
+  text-indent .16rem
+  background-color #fff
+  border 1px solid #D1D1D1
+  border-radius 4px