From b4f43bd1e1a726fceacd747416216c458c7ac78f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?=
 <8702040+cai-ling@user.noreply.gitee.com>
Date: Mon, 23 Dec 2024 13:49:23 +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/App.vue               | 10 ++++++++--
 src/components/header.vue |  1 +
 src/config/getData.js     |  4 +++-
 src/pages/index.vue       | 12 +++++++++---
 src/pages/setup.vue       |  1 +
 src/pages/task.vue        | 26 +++++++++++++++++++++-----
 src/style/layout.styl     |  2 +-
 src/vuex/modules/data.js  | 30 ++++++++++++++++++++++++++++++
 src/vuex/store.js         |  4 +++-
 9 files changed, 77 insertions(+), 13 deletions(-)
 create mode 100644 src/vuex/modules/data.js

diff --git a/src/App.vue b/src/App.vue
index 112c723..396050a 100644
--- a/src/App.vue
+++ b/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>
 
diff --git a/src/components/header.vue b/src/components/header.vue
index 13bcaa2..c9a7ae6 100644
--- a/src/components/header.vue
+++ b/src/components/header.vue
@@ -41,6 +41,7 @@ export default {
           document.msExitFullscreen()
         }
       }
+      localStorage.removeItem('keepAlive')
       this.$router.push('/setup')
     },
     toBack () {
diff --git a/src/config/getData.js b/src/config/getData.js
index 7a57102..0cdd5b4 100644
--- a/src/config/getData.js
+++ b/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
diff --git a/src/pages/index.vue b/src/pages/index.vue
index c636c12..a861080 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -53,9 +53,10 @@
 
 <script>
 import jxHeader from '@components/header.vue'
-import {queryDevices, queryOrders, startOrder} from '@config/mork.js'
-import {forceFinish} from '@config/getData.js'
+// import {queryDevices, queryOrders, startOrder} from '@config/mork.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
diff --git a/src/pages/setup.vue b/src/pages/setup.vue
index c8fb2c6..f2a7d2e 100644
--- a/src/pages/setup.vue
+++ b/src/pages/setup.vue
@@ -19,6 +19,7 @@
 
 <script>
 export default {
+  name: 'setup',
   data () {
     return {
       baseUrl: this.$store.getters.baseUrl,
diff --git a/src/pages/task.vue b/src/pages/task.vue
index ff2b369..246c9ed 100644
--- a/src/pages/task.vue
+++ b/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 {sendWork, reSendWork, finishWork} from '@config/getData.js'
+// import {queryWorks} from '@config/mork.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>
diff --git a/src/style/layout.styl b/src/style/layout.styl
index 69129df..3da1949 100644
--- a/src/style/layout.styl
+++ b/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;
 
diff --git a/src/vuex/modules/data.js b/src/vuex/modules/data.js
new file mode 100644
index 0000000..6d2980c
--- /dev/null
+++ b/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
+}
diff --git a/src/vuex/store.js b/src/vuex/store.js
index a3fab07..d63020a 100644
--- a/src/vuex/store.js
+++ b/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
   }
 })