接口

src/App.vue

@@ -1,12 +1,18 @@
 <template>
   <div id="app">
-    <router-view/>
+    <keep-alive :include="keepAlive" >
+      <router-view/>
+    </keep-alive>
   </div>
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 export default {
-  name: 'App'
+  name: 'App',
+  computed: {
+    ...mapGetters(['keepAlive'])
+  }
 }
 </script>
 

src/components/header.vue

@@ -41,6 +41,7 @@ export default {
           document.msExitFullscreen()
         }
       }
+      localStorage.removeItem('keepAlive')
       this.$router.push('/setup')
     },
     toBack () {

src/config/getData.js

@@ -16,7 +16,9 @@ export const forceFinish = (order) => post('api/pda/forceFinish', {
   mfg_order_name: order
 })
 // 配料作业查询
-export const queryWorks = () => post('api/pda/queryWorks', {})
+export const queryWorks = (order) => post('api/pda/queryWorks', {
+  mfg_order_name: order
+})
 // 下发配料作业
 export const sendWork = (code) => post('api/pda/sendWork', {
   work_code: code

src/pages/index.vue

@@ -53,9 +53,10 @@
 
 <script>
 import jxHeader from '@components/header.vue'
-import {queryDevices, queryOrders, startOrder} from '@config/mork.js'
+// import {queryDevices, queryOrders, startOrder} from '@config/mork.js'
-import {forceFinish} from '@config/getData.js'
+import {queryDevices, queryOrders, startOrder, forceFinish} from '@config/getData.js'
 export default {
+  name: 'index',
   components: {
     jxHeader
   },
@@ -98,7 +99,12 @@ export default {
       try {
         let res = await startOrder(this.value, this.pkId)
         if (res.message) {
-          this.$router.push('/task')
+          this.disabled = false
+          this.$store.dispatch('setKeepAlive', ['index'])
+          this.$router.push({
+            path: '/task',
+            query: {order: this.pkId}
+          })
         }
       } catch (e) {
         this.disabled = false

src/pages/setup.vue

@@ -19,6 +19,7 @@
 
 <script>
 export default {
+  name: 'setup',
   data () {
     return {
       baseUrl: this.$store.getters.baseUrl,

src/pages/task.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="contianer">
-    <jxHeader type="false" title="配料作业"></jxHeader>
+    <jxHeader :type="type" title="配料作业"></jxHeader>
     <div class="contianer content">
       <div class="contianer content_wraper">
         <div class="contianer mgt2 grid_wraper">
@@ -34,6 +34,7 @@
                   <button class="grid_button" :disabled="disabled" @click="_sendWork(e)">下发</button>
                   <!-- <button class="grid_button" :disabled="disabled">执行中</button> -->
                   <button class="grid_button" :disabled="disabled" @click="_reSendWork(e)">补发</button>
+                  <button class="grid_button" :disabled="disabled" @click="_pdaPause(e)">暂停</button>
                   <button class="grid_button" :disabled="disabled" @click="_finishWork(e)">完成</button>
                 </div>
               </td>
@@ -47,14 +48,16 @@
 
 <script>
 import jxHeader from '@components/header.vue'
-import {queryWorks} from '@config/mork.js'
+// import {queryWorks} from '@config/mork.js'
-import {sendWork, reSendWork, finishWork} from '@config/getData.js'
+import {queryWorks, sendWork, reSendWork, pdaPause, finishWork} from '@config/getData.js'
 export default {
+  name: 'task',
   components: {
     jxHeader
   },
   data () {
     return {
+      type: true,
       timer: null,
       dataList: [],
       pkId: '',
@@ -66,7 +69,7 @@ export default {
   },
   methods: {
     async _queryWorks () {
-      let res = await queryWorks()
+      let res = await queryWorks(this.$route.query.order)
       this.dataList = [...res]
     },
     async _sendWork (e) {
@@ -95,6 +98,19 @@ export default {
         this.disabled = false
       }
     },
+    async _pdaPause (e) {
+      this.disabled = true
+      try {
+        let res = await pdaPause(e.work_code)
+        this.$message({
+          message: res.message,
+          type: 'success'
+        })
+        this.disabled = false
+      } catch (e) {
+        this.disabled = false
+      }
+    },
     async _finishWork (e) {
       this.disabled = true
       try {
@@ -117,5 +133,5 @@ export default {
 .grid_wraper
   height 100%
 .btn_wraper
-  width 3.1rem
+  width 3.5rem
 </style>

src/style/layout.styl

@@ -166,7 +166,7 @@ header
   font-size: .3rem;
   line-height: .82rem;
   color: #3CC1FF;
-  margin 0 .16rem;
+  margin 0 .1rem;
   background: transparent;
   border: 0;
 

src/vuex/modules/data.js

@@ -0,0 +1,30 @@
+import * as types from '../types'
+import { getStore, setStore } from '@config/utils.js'
+
+const state = {
+  keepAlive: getStore('keepAlive') || [] // 缓存页面
+}
+
+const getters = {
+  keepAlive: state => state.keepAlive
+}
+
+const actions = {
+  setKeepAlive ({commit}, res) {
+    setStore('keepAlive', res)
+    commit(types.SET_KEEP_ALIVE, res)
+  }
+}
+
+const mutations = {
+  [types.SET_KEEP_ALIVE] (state, res) {
+    state.keepAlive = res
+  }
+}
+
+export default {
+  state,
+  getters,
+  actions,
+  mutations
+}

src/vuex/store.js

@@ -3,12 +3,14 @@ import Vuex from 'vuex'
 
 import com from './modules/com'
 import user from './modules/user'
+import data from './modules/data'
 
 Vue.use(Vuex)
 
 export default new Vuex.Store({
   modules: {
     com,
-    user
+    user,
+    data
   }
 })