From 4cbac935b66fab80d411843dfa8d72b7ba43c444 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 20 Sep 2022 14:28:43 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=88=86=E6=8B=A3=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/getData2.js           | 199 ++++++++++++++----
 src/pages/proj/SortingManage.vue | 341 +++++++++++++++++++++++++++++++
 src/router/index.js              |   5 +
 src/style/layout.styl            |   5 +-
 4 files changed, 508 insertions(+), 42 deletions(-)
 create mode 100644 src/pages/proj/SortingManage.vue

diff --git a/src/config/getData2.js b/src/config/getData2.js
index 6e35474..c6419d9 100644
--- a/src/config/getData2.js
+++ b/src/config/getData2.js
@@ -1,49 +1,166 @@
 import {post} from '@config/http.js'
 // import store from '../vuex/store'
 
-/** 设备状态修改 */
+/**
+ * 分拣管理
+ */
 
-// 1.1查询所有区域信息
-export const handArea = (type) => post('api/andxy2/hand/area', {
+// 1.查询分拣工单及明细（定时查询）
+// export const sortingOrder = (reg) => post('api/hand/sortingOrder', {})
+export const sortingOrder = () => {
+  let res = {
+    result: [
+      {
+        alloy: '',
+        is_labeling: '1',
+        type: 'order',
+        order_status: '06',
+        material_uuid: 'cf50d49e01424b2fb37d10ddfeae70f1',
+        material_spec: '22.23',
+        children: [
+          {
+            labeling_template: '15',
+            color_type: '6',
+            lettering_message: '77',
+            type: 'orderDetail',
+            order_code: '1',
+            order_status: '00',
+            cust_code: 'A00001',
+            lettering_icon: '1',
+            strap_number: '99',
+            parent_order_code: '10000037',
+            qty: '11',
+            is_flag: '0',
+            lettering_message2: '88',
+            cust_name: 'A00001',
+            parent_order_id: '907694f7e2de49bc943a8575ab5b3395',
+            order_id: '57fbc012c50d4398b91142086d5445b6',
+            cust_id: '092f1d84fddb417a914c8aa20d5bca81'
+          }
+        ],
+        material_name: '直管14',
+        wall_thickness: '0.20',
+        is_coating: '1',
+        jackup_num: '5',
+        length: '4000.00',
+        end_time: '',
+        outer_diameter: '22.23',
+        order_code: '10000037',
+        start_time: '',
+        temper: '',
+        feeding_mouth: '3',
+        is_strapping: '1',
+        qty: '11',
+        is_flag: '1',
+        is_risking: '1',
+        order_id: '907694f7e2de49bc943a8575ab5b3395',
+        is_lettering: '1',
+        material_code: 'A10014'
+      },
+      {
+        alloy: '',
+        is_labeling: '1',
+        type: 'order',
+        order_status: '01',
+        material_uuid: 'cf50d49e01424b2fb37d10ddfeae70f1',
+        material_spec: '22.23',
+        children: [
+          {
+            labeling_template: '15',
+            color_type: '7',
+            lettering_message: '',
+            type: 'orderDetail',
+            order_code: '2',
+            order_status: '05',
+            cust_code: 'A00001',
+            lettering_icon: '2',
+            strap_number: '3',
+            parent_order_code: '10000038',
+            qty: '5555',
+            is_flag: '0',
+            lettering_message2: '33',
+            cust_name: 'A00001',
+            parent_order_id: 'fb8f80bee3c9455c8a902e4911acf1ec',
+            order_id: '1333a8a35df64432bb0e314d9636d2db',
+            cust_id: '092f1d84fddb417a914c8aa20d5bca81'
+          },
+          {
+            labeling_template: '14',
+            color_type: '7',
+            lettering_message: '',
+            type: 'orderDetail',
+            order_code: '1',
+            order_status: '04',
+            cust_code: 'A00002',
+            lettering_icon: '1',
+            strap_number: '1',
+            parent_order_code: '10000038',
+            qty: '5555',
+            is_flag: '0',
+            lettering_message2: '1',
+            cust_name: 'A00002',
+            parent_order_id: 'fb8f80bee3c9455c8a902e4911acf1ec',
+            order_id: '250354651d614a6dbc445e4089ce0e72',
+            cust_id: '4b80d1c012e44027ad09b9f33ca7af0d'
+          },
+          {
+            labeling_template: '15',
+            color_type: '6',
+            lettering_message: '55',
+            type: 'orderDetail',
+            order_code: '3',
+            order_status: '05',
+            cust_code: 'A00002',
+            lettering_icon: '2',
+            strap_number: '55',
+            parent_order_code: '10000038',
+            qty: '5555',
+            is_flag: '0',
+            lettering_message2: '5',
+            cust_name: 'A00002',
+            parent_order_id: 'fb8f80bee3c9455c8a902e4911acf1ec',
+            order_id: 'e7356f2f443f499e8807bac8cfb3ddce',
+            cust_id: '4b80d1c012e44027ad09b9f33ca7af0d'
+          }
+        ],
+        material_name: '直管14',
+        wall_thickness: '0.20',
+        is_coating: '1',
+        jackup_num: '5',
+        length: '4000.00',
+        end_time: '',
+        outer_diameter: '22.23',
+        order_code: '10000038',
+        start_time: '',
+        temper: '',
+        feeding_mouth: '3',
+        is_strapping: '1',
+        qty: '5555',
+        is_flag: '1',
+        is_risking: '1',
+        order_id: 'fb8f80bee3c9455c8a902e4911acf1ec',
+        is_lettering: '1',
+        material_code: 'A10014'
+      }
+    ],
+    code: '1',
+    desc: '查询成功'
+  }
+  return res
+}
+// 2.下发刻字、贴标
+export const sendMessage = (type, uuid, ouuid) => post('api/hand/sendMessage', {
+  type: type,
+  orderDetail_uuid: uuid,
+  order_uuid: ouuid
+})
+// 3.下发设备信号
+export const deviceOperation = (type) => post('api/hand/deviceOperation', {
   type: type
 })
-// export const handArea = () => {
-//   let res = {
-//     code: '1',
-//     desc: '',
-//     result: [{region_id: '1', region_name: 'a'}]
-//   }
-//   return res
-// }
-
-// 1.2根据区域查询设备编号及状态
-export const handPoint = (reg) => post('api/andxy2/hand/point', {
-  region: reg
-})
-
-// 1.3修改设备状态
-export const handDeviceStatus = (code, type, no, mtype, quantity, remark) => post('api/andxy2/hand/deviceStatus', {
-  device_code: code,
+// 4.工单操作
+export const orderOperation = (type, uuid, ouuid) => post('api/hand/orderOperation', {
   type: type,
-  status: no,
-  material_type: mtype,
-  quantity: quantity,
-  remark: remark
-})
-
-// 1.4查询物料
-export const handMatrial = () => post('api/andxy2/hand/matrial', {})
-
-/** 普通任务 */
-
-// 1.1创建任务
-export const handTask = (scode, ncode) => post('api/andxy2/hand/task2', {
-  start_devicecode: scode,
-  next_devicecode: ncode
-})
-
-/** 特殊任务 */
-export const spehandTask = (scode, ncode) => post('api/andxy2/hand/task', {
-  start_devicecode: scode,
-  next_devicecode: ncode
+  orderDetail_uuid: uuid,
+  order_uuid: ouuid
 })
diff --git a/src/pages/proj/SortingManage.vue b/src/pages/proj/SortingManage.vue
new file mode 100644
index 0000000..ccd60b7
--- /dev/null
+++ b/src/pages/proj/SortingManage.vue
@@ -0,0 +1,341 @@
+<template>
+  <div class="inner-wrap">
+    <nav-bar title="分拣管理"></nav-bar>
+    <div class="wrap2">
+      <div class="wrap-filter-button">
+        <div class="wrap-button clearfix">
+          <button class="button--primary" :disabled="disabled3" @click="toSure1">设备暂停</button>
+          <button class="button--primary" :disabled="disabled4" @click="toSure2">设备恢复</button>
+          <button class="button--primary" :disabled="disabled5" @click="toSure3">急停</button>
+          <button class="button--primary" :disabled="disabled6" @click="toSure4">清料</button>
+          <button class="button--primary" :class="{'button--defalut': pkId === ''}" :disabled="disabled1" @click="toSendMessage1">手动下发刻字信息</button>
+          <button class="button--primary" :class="{'button--defalut': pkId === ''}" :disabled="disabled2" @click="toSendMessage2">手动下发贴标信息</button>
+        </div>
+      </div>
+      <section class="grid-wraper mgt15">
+        <div class="slide_new">
+          <table>
+            <thead>
+              <tr>
+                <th>选择</th>
+                <th>工单（明细）号</th>
+                <th>工单（明细）状态</th>
+                <th>物料编码</th>
+                <th>物料名称</th>
+                <th>外径</th>
+                <th>壁厚</th>
+                <th>长度</th>
+                <th>下料数量</th>
+                <th>客户编码</th>
+                <th>客户名称</th>
+                <th>当前上料数量</th>
+                <th>当前上料合格数量</th>
+                <th>当前刻字数量</th>
+                <th>当前刻字合格数量</th>
+                <th>当前套冒数量</th>
+                <th>当前套冒合格数量</th>
+                <th>当前捆扎包数</th>
+                <th>当前捆扎数</th>
+                <th>当前裹膜数量</th>
+                <th>当前裹膜合格数量</th>
+                <th>当前贴标数量</th>
+                <th>上料完成</th>
+                <th>刻字完成</th>
+                <th>套冒完成</th>
+                <th>捆扎完成</th>
+                <th>裹膜完成</th>
+                <th>贴标完成</th>
+                <th>创建者</th>
+                <th>创建时间</th>
+                <th>操作</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-for="(e, i) in dataList" :key="e.order_id">
+                <td @click="toCheck(e)"><div v-show="e.pid !== 0" class="iconfont select_icon" :class="e.order_id === pkId ? 'selected_icon' : 'unselect_icon'"></div></td>
+                <td>
+                  <div class="td_detail" @click="showSec(e, i)">
+                     <p>{{e.order_code}}</p>
+                    <div v-show="e.pid === 0" class="iconfont table_dropdown_icon" :class="{'rotate180': e.childShow}"></div>
+                  </div>
+                </td>
+                <td>{{['就绪', '已确认', '已下发', '执行中', '下发工单暂停 05-工单暂停', '下发强制完成', '强制完成', '自动完成', '取消'][Number(e.order_status)]}}</td>
+                <td>{{e.material_code}}</td>
+                <td>{{e.material_name}}</td>
+                <td>{{e.outer_diameter}}</td>
+                <td>{{e.wall_thickness}}</td>
+                <td>{{e.length}}</td>
+                <td>{{e.qty}}</td>
+                <td>{{e.cust_code}}</td>
+                <td>{{e.cust_name}}</td>
+                <td>{{e.present_feeding_number}}</td>
+                <td>{{e.feeding_qualified_number}}</td>
+                <td>{{e.present_lettering_number}}</td>
+                <td>{{e.qualified_lettering_number}}</td>
+                <td>{{e.present_sleeveing_number}}</td>
+                <td>{{e.qualified_sleeveing_number}}</td>
+                <td>{{e.present_strap_pack_number}}</td>
+                <td>{{e.present_strap_number}}</td>
+                <td>{{e.present_wraping_number}}</td>
+                <td>{{e.qualified_wraping_number}}</td>
+                <td>{{e.present_labeling_number}}</td>
+                <td>{{['未完成', '完成', '强制完成'][Number(e.feeding_finished)]}}</td>
+                <td>{{e.lettering_finished}}</td>
+                <td>{{e.sleeveing_finished}}</td>
+                <td>{{['未完成', '完成', '强制完成'][Number(e.strap_finished)]}}</td>
+                <td>{{['未完成', '完成', '强制完成'][Number(e.wraping_finished)]}}</td>
+                <td>{{['未完成', '完成', '强制完成'][Number(e.labeling_finished)]}}</td>
+                <td>{{e.create_by}}</td>
+                <td>{{e.create_time}}</td>
+                <td>
+                  <button v-show="e.pid === 0" class="button--primary button--cancle button_table_font" :disabled="disabled7" @click="toOrderOperation1(e)">强制完成工单</button>
+                  <button v-show="e.pid !== 0" class="button--primary button--cancle button_table_font" :disabled="disabled8" @click="toOrderOperation2(e)">手动完成</button>
+                  <button v-show="e.pid !== 0" class="button--primary button--cancle button_table_font" :disabled="disabled9" @click="toOrderOperation3(e)">强制完成明细</button>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </section>
+    </div>
+  </div>
+</template>
+
+<script>
+import NavBar from '@components/NavBar.vue'
+import {sortingOrder, sendMessage, deviceOperation, orderOperation} from '@config/getData2.js'
+export default {
+  name: 'SortingManage',
+  components: {
+    NavBar
+  },
+  data () {
+    return {
+      dataList: [],
+      newList: [],
+      pkId: '',
+      pkObj: {},
+      disabled1: false,
+      disabled2: false,
+      disabled3: false,
+      disabled4: false,
+      disabled5: false,
+      disabled6: false,
+      disabled7: false,
+      disabled8: false,
+      disabled9: false
+    }
+  },
+  created () {
+    this.sortingOrder()
+  },
+  methods: {
+    showSec (e, i) {
+      e.childShow = !e.childShow
+      if (e.childShow) {
+        if (e.children.length > 0) {
+          e.children.map((el, j) => {
+            let obj = Object.assign({}, e, el, {children: [], pid: j + 1})
+            this.dataList.splice(i + j + 1, 0, obj)
+          })
+        }
+      } else {
+        if (e.children.length > 0) {
+          this.dataList.splice(i + 1, e.children.length)
+        }
+      }
+    },
+    toCheck (e) {
+      this.pkId = this.pkId === e.order_id ? '' : e.order_id
+      this.pkObj = this.pkId === e.order_id ? e : {}
+    },
+    /** 查询分拣工单及明细（定时查询） */
+    async sortingOrder () {
+      let res = await sortingOrder()
+      if (res.code === '1') {
+        this.dataList = [...res.result]
+        this.dataList.map(el => {
+          this.$set(el, 'pid', 0)
+          this.$set(el, 'childShow', false)
+        })
+      } else {
+        this.Dialog(res.desc)
+      }
+    },
+    /** 下发刻字、贴标 */
+    async _sendMessage (type, uuid, ouuid) {
+      try {
+        let res = await sendMessage(type, uuid, ouuid)
+        if (res.code === '1') {
+          this.toast(res.desc)
+        } else {
+          this.Dialog(res.desc)
+        }
+        this.disabled1 = false
+        this.disabled2 = false
+      } catch (err) {
+        this.Dialog(err)
+        this.disabled1 = false
+        this.disabled2 = false
+      }
+    },
+    toSendMessage1 () {
+      this.disabled1 = true
+      if (!this.pkId) {
+        this.disabled1 = false
+        return
+      }
+      this._sendMessage('1', this.pkObj.order_code, this.pkObj.order_id)
+    },
+    toSendMessage2 () {
+      this.disabled2 = true
+      if (!this.pkId) {
+        this.disabled2 = false
+        return
+      }
+      this._sendMessage('2', this.pkObj.order_code, this.pkObj.order_id)
+    },
+    /** 下发设备信号 */
+    async _deviceOperation (type) {
+      try {
+        let res = await deviceOperation(type)
+        if (res.code === '1') {
+          this.toast(res.desc)
+        } else {
+          this.Dialog(res.desc)
+        }
+        this.disabled3 = false
+        this.disabled4 = false
+        this.disabled5 = false
+        this.disabled6 = false
+      } catch (err) {
+        this.Dialog(err)
+        this.disabled3 = false
+        this.disabled4 = false
+        this.disabled5 = false
+        this.disabled6 = false
+      }
+    },
+    toSure1 () {
+      this.disabled3 = true
+      this._deviceOperation('1')
+    },
+    toSure2 () {
+      this.disabled4 = true
+      this._deviceOperation('2')
+    },
+    toSure3 () {
+      this.disabled5 = true
+      this._deviceOperation('3')
+    },
+    toSure4 () {
+      this.disabled6 = true
+      this._deviceOperation('4')
+    },
+    /** 工单操作 */
+    async _orderOperation (type, uuid, ouuid) {
+      try {
+        let res = await orderOperation(type, uuid, ouuid)
+        if (res.code === '1') {
+          this.toast(res.desc)
+        } else {
+          this.Dialog(res.desc)
+        }
+        this.disabled7 = false
+        this.disabled8 = false
+        this.disabled9 = false
+      } catch (err) {
+        this.Dialog(err)
+        this.disabled7 = false
+        this.disabled8 = false
+        this.disabled9 = false
+      }
+    },
+    toOrderOperation1 (e) {
+      this.disabled7 = true
+      this._orderOperation('2', e.order_code, e.order_id)
+    },
+    toOrderOperation2 (e) {
+      this.disabled8 = true
+      this._orderOperation('3', e.order_code, e.order_id)
+    },
+    toOrderOperation3 (e) {
+      this.disabled9 = true
+      this._orderOperation('4', e.order_code, e.order_id)
+    }
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+@import '~@style/mixin.styl'
+.wrap-filter-button
+  padding 0.05rem 0.2rem
+  margin 0
+.wrap-button
+  margin 0.01rem auto
+.grid-wraper
+  _wh(100%, 100%)
+  overflow-y scroll
+  box-sizing border-box
+.slide_new
+  table
+    table-layout fixed
+    min-width 100%
+    border-collapse separate
+    border-spacing 0
+    border 0
+    td, th
+      box-sizing border-box
+      overflow hidden
+      white-space nowrap
+      text-overflow ellipsis
+      white-space nowrap
+      padding 0 .15rem
+      border-bottom .05rem solid #f5f5f5
+      &:first-child
+        position sticky
+        left 0
+      &:nth-child(2)
+        position sticky
+        left .4rem
+      &:last-child
+        position sticky
+        right 0
+    thead
+      tr
+        th
+          position sticky
+          top 0
+          z-index 99
+          background #d7d7d7
+          _font(.13rem, .5rem, #696969, bold)
+          border-right .01rem dashed #fff
+          &:first-child
+            z-index 1
+            background #d7d7d7
+          &:nth-child(2)
+            z-index 2
+            background #d7d7d7
+          &:last-child
+            border-right none
+    tbody
+      tr
+        td
+          _font(.13rem, .5rem, #323232)
+          background #fff
+          border-right .01rem dashed #d7d7d7
+          &:last-child
+            border-right none
+.td_detail
+  _fj(flex-start)
+.table_dropdown_icon
+  _wh(.2rem, .2rem)
+  _font(.13rem, .2rem, #c0c4cc,,center)
+  margin-left .1rem
+  &::before
+    content: '\e62b'
+.rotate180
+  transform rotate(-180deg)
+  transition transform 0.3s
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index eb40c94..f319628 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -6,6 +6,7 @@ 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 SortingManage = r => require.ensure([], () => r(require('@page/proj/SortingManage')), 'SortingManage')
 
 Vue.use(Router)
 
@@ -31,6 +32,10 @@ export default new Router({
     {
       path: '/SignalSend',
       component: SignalSend
+    },
+    {
+      path: '/SortingManage',
+      component: SortingManage
     }
   ]
 })
diff --git a/src/style/layout.styl b/src/style/layout.styl
index 2dfbf14..81060ac 100644
--- a/src/style/layout.styl
+++ b/src/style/layout.styl
@@ -71,16 +71,19 @@
   line-height .3rem
   font-size .15rem
   color #ffffff
+  border 1px solid #D7592F
   background-color #D7592F
   padding 0 .1rem
   border-radius 5px
 .button--defalut
   color #606266
   border 1px solid #dcdfe6
-  background-color #fff
+  background-color #dcdfe6
 .button--cancle
   color #D7592F
   background-color #fff
+.button_table_font
+  font-size .13rem
 .top_header
   position fixed
   top 0

From 70b9a249c5806ffb4ee637ad6884de858cb6b9e3 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 20 Sep 2022 14:29:58 +0800
Subject: [PATCH 2/5] homepage

---
 src/pages/proj/HomePage.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/proj/HomePage.vue b/src/pages/proj/HomePage.vue
index a059801..bc5ab4d 100644
--- a/src/pages/proj/HomePage.vue
+++ b/src/pages/proj/HomePage.vue
@@ -17,6 +17,7 @@
     <div class="menu">
       <ul>
         <li @click="toSure('zlmanage')">指令管理</li>
+        <li @click="toSure('SortingManage')">分拣管理</li>
         <li @click="toSure('SignalSend')">信号下发</li>
       </ul>
     </div>

From 668152047514a8b44d0170b821d3ed03391113f1 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 20 Sep 2022 14:37:35 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=88=B7=E6=96=B0=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Login.vue     | 11 ++++++-----
 src/vuex/modules/com.js |  4 ++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/pages/Login.vue b/src/pages/Login.vue
index 7e84f8c..d598c59 100644
--- a/src/pages/Login.vue
+++ b/src/pages/Login.vue
@@ -33,8 +33,8 @@
               <button v-show="showBtn1" class="iconfont login_icon delete_icon" @click="clearData(1)"></button>
             </div>
             <div class="inputOuter">
-              <!-- <input type="text" placeholder="图片域名地址" class="inputStyle" v-model="imgBaseUrl">
-              <button v-show="showBtn2" class="iconfont login_icon delete_icon" @click="clearData(2)"></button> -->
+              <input type="number" placeholder="刷新时间（秒）" class="inputStyle" v-model="setTime">
+              <button v-show="showBtn2" class="iconfont login_icon delete_icon" @click="clearData(2)"></button>
             </div>
           </div>
           <div class="submit">
@@ -57,6 +57,7 @@ export default {
       password: '',
       baseUrl: this.$store.getters.baseUrl,
       imgBaseUrl: this.$store.getters.imgBaseUrl,
+      setTime: this.$store.getters.setTime / 1000,
       inputType: 'password',
       eyeOpen: true,
       drift: 0,
@@ -71,7 +72,7 @@ export default {
       return this.baseUrl !== ''
     },
     showBtn2 () {
-      return this.imgBaseUrl !== ''
+      return this.setTime !== ''
     },
     showBtn3 () {
       return this.loginname !== ''
@@ -126,7 +127,7 @@ export default {
           this.baseUrl = ''
           break
         case 2:
-          this.imgBaseUrl = ''
+          this.setTime = ''
           break
         case 3:
           this.loginname = ''
@@ -144,7 +145,7 @@ export default {
     _config () {
       let obj = {
         baseUrl: this.baseUrl,
-        imgBaseUrl: this.imgBaseUrl
+        setTime: this.setTime * 1000
       }
       this.$store.dispatch('setConfig', obj)
       this._tabChange(0)
diff --git a/src/vuex/modules/com.js b/src/vuex/modules/com.js
index fded4ba..1387df5 100644
--- a/src/vuex/modules/com.js
+++ b/src/vuex/modules/com.js
@@ -5,6 +5,7 @@ const baseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.81.155:
 const imgBaseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.81.100/' : 'http://192.168.46.5/'
 const state = {
   baseUrl: getStore('baseUrl') || baseUrl,
+  setTime: getStore('setTime') || 5000,
   imgBaseUrl: getStore('imgBaseUrl') || imgBaseUrl,
   lockTime: getStore('lockTime') || 0,
   loading: false,
@@ -18,6 +19,7 @@ const state = {
 
 const getters = {
   baseUrl: state => state.baseUrl,
+  setTime: state => state.setTime,
   imgBaseUrl: state => state.imgBaseUrl,
   lockTime: state => state.lockTime,
   loading: state => state.loading,
@@ -28,6 +30,7 @@ const getters = {
 const actions = {
   setConfig ({commit}, res) {
     setStore('baseUrl', res.baseUrl)
+    setStore('setTime', res.setTime)
     setStore('imgBaseUrl', res.imgBaseUrl)
     setStore('lockTime', res.lockTime)
     commit(types.COM_CONFIG, res)
@@ -58,6 +61,7 @@ const actions = {
 const mutations = {
   [types.COM_CONFIG] (state, res) {
     state.baseUrl = res.baseUrl
+    state.setTime = res.setTime
     state.imgBaseUrl = res.imgBaseUrl
     state.lockTime = res.lockTime
   },

From a4662753702c0a8702257f13a5e350ab68e51ec7 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 20 Sep 2022 14:45:51 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=88=B7=E6=96=B0=E5=88=86=E6=8B=A3?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/proj/SortingManage.vue | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/pages/proj/SortingManage.vue b/src/pages/proj/SortingManage.vue
index ccd60b7..cbfe3f3 100644
--- a/src/pages/proj/SortingManage.vue
+++ b/src/pages/proj/SortingManage.vue
@@ -111,6 +111,8 @@ export default {
   },
   data () {
     return {
+      interTime: this.$store.getters.setTime,
+      timer: null,
       dataList: [],
       newList: [],
       pkId: '',
@@ -127,9 +129,19 @@ export default {
     }
   },
   created () {
-    this.sortingOrder()
+    this.refresh()
+  },
+  beforeDestroy () {
+    clearInterval(this.timer)
+    this.timer = null
   },
   methods: {
+    refresh () {
+      this.sortingOrder()
+      this.timer = setInterval(() => {
+        this.sortingOrder()
+      }, this.interTime)
+    },
     showSec (e, i) {
       e.childShow = !e.childShow
       if (e.childShow) {
@@ -168,6 +180,9 @@ export default {
         let res = await sendMessage(type, uuid, ouuid)
         if (res.code === '1') {
           this.toast(res.desc)
+          clearInterval(this.timer)
+          this.timer = null
+          this.refresh()
         } else {
           this.Dialog(res.desc)
         }
@@ -201,6 +216,9 @@ export default {
         let res = await deviceOperation(type)
         if (res.code === '1') {
           this.toast(res.desc)
+          clearInterval(this.timer)
+          this.timer = null
+          this.refresh()
         } else {
           this.Dialog(res.desc)
         }
@@ -238,6 +256,9 @@ export default {
         let res = await orderOperation(type, uuid, ouuid)
         if (res.code === '1') {
           this.toast(res.desc)
+          clearInterval(this.timer)
+          this.timer = null
+          this.refresh()
         } else {
           this.Dialog(res.desc)
         }

From 80b4078643ce7d97166ac4cb5366375e6da48ebd Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 20 Sep 2022 14:53:45 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=88=86=E6=8B=A3=E7=AE=A1=E7=90=86?=
 =?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/getData2.js | 284 ++++++++++++++++++++---------------------
 src/config/http.js     |  66 +++-------
 2 files changed, 159 insertions(+), 191 deletions(-)

diff --git a/src/config/getData2.js b/src/config/getData2.js
index c6419d9..860ca85 100644
--- a/src/config/getData2.js
+++ b/src/config/getData2.js
@@ -6,148 +6,148 @@ import {post} from '@config/http.js'
  */
 
 // 1.查询分拣工单及明细（定时查询）
-// export const sortingOrder = (reg) => post('api/hand/sortingOrder', {})
-export const sortingOrder = () => {
-  let res = {
-    result: [
-      {
-        alloy: '',
-        is_labeling: '1',
-        type: 'order',
-        order_status: '06',
-        material_uuid: 'cf50d49e01424b2fb37d10ddfeae70f1',
-        material_spec: '22.23',
-        children: [
-          {
-            labeling_template: '15',
-            color_type: '6',
-            lettering_message: '77',
-            type: 'orderDetail',
-            order_code: '1',
-            order_status: '00',
-            cust_code: 'A00001',
-            lettering_icon: '1',
-            strap_number: '99',
-            parent_order_code: '10000037',
-            qty: '11',
-            is_flag: '0',
-            lettering_message2: '88',
-            cust_name: 'A00001',
-            parent_order_id: '907694f7e2de49bc943a8575ab5b3395',
-            order_id: '57fbc012c50d4398b91142086d5445b6',
-            cust_id: '092f1d84fddb417a914c8aa20d5bca81'
-          }
-        ],
-        material_name: '直管14',
-        wall_thickness: '0.20',
-        is_coating: '1',
-        jackup_num: '5',
-        length: '4000.00',
-        end_time: '',
-        outer_diameter: '22.23',
-        order_code: '10000037',
-        start_time: '',
-        temper: '',
-        feeding_mouth: '3',
-        is_strapping: '1',
-        qty: '11',
-        is_flag: '1',
-        is_risking: '1',
-        order_id: '907694f7e2de49bc943a8575ab5b3395',
-        is_lettering: '1',
-        material_code: 'A10014'
-      },
-      {
-        alloy: '',
-        is_labeling: '1',
-        type: 'order',
-        order_status: '01',
-        material_uuid: 'cf50d49e01424b2fb37d10ddfeae70f1',
-        material_spec: '22.23',
-        children: [
-          {
-            labeling_template: '15',
-            color_type: '7',
-            lettering_message: '',
-            type: 'orderDetail',
-            order_code: '2',
-            order_status: '05',
-            cust_code: 'A00001',
-            lettering_icon: '2',
-            strap_number: '3',
-            parent_order_code: '10000038',
-            qty: '5555',
-            is_flag: '0',
-            lettering_message2: '33',
-            cust_name: 'A00001',
-            parent_order_id: 'fb8f80bee3c9455c8a902e4911acf1ec',
-            order_id: '1333a8a35df64432bb0e314d9636d2db',
-            cust_id: '092f1d84fddb417a914c8aa20d5bca81'
-          },
-          {
-            labeling_template: '14',
-            color_type: '7',
-            lettering_message: '',
-            type: 'orderDetail',
-            order_code: '1',
-            order_status: '04',
-            cust_code: 'A00002',
-            lettering_icon: '1',
-            strap_number: '1',
-            parent_order_code: '10000038',
-            qty: '5555',
-            is_flag: '0',
-            lettering_message2: '1',
-            cust_name: 'A00002',
-            parent_order_id: 'fb8f80bee3c9455c8a902e4911acf1ec',
-            order_id: '250354651d614a6dbc445e4089ce0e72',
-            cust_id: '4b80d1c012e44027ad09b9f33ca7af0d'
-          },
-          {
-            labeling_template: '15',
-            color_type: '6',
-            lettering_message: '55',
-            type: 'orderDetail',
-            order_code: '3',
-            order_status: '05',
-            cust_code: 'A00002',
-            lettering_icon: '2',
-            strap_number: '55',
-            parent_order_code: '10000038',
-            qty: '5555',
-            is_flag: '0',
-            lettering_message2: '5',
-            cust_name: 'A00002',
-            parent_order_id: 'fb8f80bee3c9455c8a902e4911acf1ec',
-            order_id: 'e7356f2f443f499e8807bac8cfb3ddce',
-            cust_id: '4b80d1c012e44027ad09b9f33ca7af0d'
-          }
-        ],
-        material_name: '直管14',
-        wall_thickness: '0.20',
-        is_coating: '1',
-        jackup_num: '5',
-        length: '4000.00',
-        end_time: '',
-        outer_diameter: '22.23',
-        order_code: '10000038',
-        start_time: '',
-        temper: '',
-        feeding_mouth: '3',
-        is_strapping: '1',
-        qty: '5555',
-        is_flag: '1',
-        is_risking: '1',
-        order_id: 'fb8f80bee3c9455c8a902e4911acf1ec',
-        is_lettering: '1',
-        material_code: 'A10014'
-      }
-    ],
-    code: '1',
-    desc: '查询成功'
-  }
-  return res
-}
+export const sortingOrder = (reg) => post('api/hand/sortingOrder', {})
+// export const sortingOrder = () => {
+//   let res = {
+//     result: [
+//       {
+//         alloy: '',
+//         is_labeling: '1',
+//         type: 'order',
+//         order_status: '06',
+//         material_uuid: 'cf50d49e01424b2fb37d10ddfeae70f1',
+//         material_spec: '22.23',
+//         children: [
+//           {
+//             labeling_template: '15',
+//             color_type: '6',
+//             lettering_message: '77',
+//             type: 'orderDetail',
+//             order_code: '1',
+//             order_status: '00',
+//             cust_code: 'A00001',
+//             lettering_icon: '1',
+//             strap_number: '99',
+//             parent_order_code: '10000037',
+//             qty: '11',
+//             is_flag: '0',
+//             lettering_message2: '88',
+//             cust_name: 'A00001',
+//             parent_order_id: '907694f7e2de49bc943a8575ab5b3395',
+//             order_id: '57fbc012c50d4398b91142086d5445b6',
+//             cust_id: '092f1d84fddb417a914c8aa20d5bca81'
+//           }
+//         ],
+//         material_name: '直管14',
+//         wall_thickness: '0.20',
+//         is_coating: '1',
+//         jackup_num: '5',
+//         length: '4000.00',
+//         end_time: '',
+//         outer_diameter: '22.23',
+//         order_code: '10000037',
+//         start_time: '',
+//         temper: '',
+//         feeding_mouth: '3',
+//         is_strapping: '1',
+//         qty: '11',
+//         is_flag: '1',
+//         is_risking: '1',
+//         order_id: '907694f7e2de49bc943a8575ab5b3395',
+//         is_lettering: '1',
+//         material_code: 'A10014'
+//       },
+//       {
+//         alloy: '',
+//         is_labeling: '1',
+//         type: 'order',
+//         order_status: '01',
+//         material_uuid: 'cf50d49e01424b2fb37d10ddfeae70f1',
+//         material_spec: '22.23',
+//         children: [
+//           {
+//             labeling_template: '15',
+//             color_type: '7',
+//             lettering_message: '',
+//             type: 'orderDetail',
+//             order_code: '2',
+//             order_status: '05',
+//             cust_code: 'A00001',
+//             lettering_icon: '2',
+//             strap_number: '3',
+//             parent_order_code: '10000038',
+//             qty: '5555',
+//             is_flag: '0',
+//             lettering_message2: '33',
+//             cust_name: 'A00001',
+//             parent_order_id: 'fb8f80bee3c9455c8a902e4911acf1ec',
+//             order_id: '1333a8a35df64432bb0e314d9636d2db',
+//             cust_id: '092f1d84fddb417a914c8aa20d5bca81'
+//           },
+//           {
+//             labeling_template: '14',
+//             color_type: '7',
+//             lettering_message: '',
+//             type: 'orderDetail',
+//             order_code: '1',
+//             order_status: '04',
+//             cust_code: 'A00002',
+//             lettering_icon: '1',
+//             strap_number: '1',
+//             parent_order_code: '10000038',
+//             qty: '5555',
+//             is_flag: '0',
+//             lettering_message2: '1',
+//             cust_name: 'A00002',
+//             parent_order_id: 'fb8f80bee3c9455c8a902e4911acf1ec',
+//             order_id: '250354651d614a6dbc445e4089ce0e72',
+//             cust_id: '4b80d1c012e44027ad09b9f33ca7af0d'
+//           },
+//           {
+//             labeling_template: '15',
+//             color_type: '6',
+//             lettering_message: '55',
+//             type: 'orderDetail',
+//             order_code: '3',
+//             order_status: '05',
+//             cust_code: 'A00002',
+//             lettering_icon: '2',
+//             strap_number: '55',
+//             parent_order_code: '10000038',
+//             qty: '5555',
+//             is_flag: '0',
+//             lettering_message2: '5',
+//             cust_name: 'A00002',
+//             parent_order_id: 'fb8f80bee3c9455c8a902e4911acf1ec',
+//             order_id: 'e7356f2f443f499e8807bac8cfb3ddce',
+//             cust_id: '4b80d1c012e44027ad09b9f33ca7af0d'
+//           }
+//         ],
+//         material_name: '直管14',
+//         wall_thickness: '0.20',
+//         is_coating: '1',
+//         jackup_num: '5',
+//         length: '4000.00',
+//         end_time: '',
+//         outer_diameter: '22.23',
+//         order_code: '10000038',
+//         start_time: '',
+//         temper: '',
+//         feeding_mouth: '3',
+//         is_strapping: '1',
+//         qty: '5555',
+//         is_flag: '1',
+//         is_risking: '1',
+//         order_id: 'fb8f80bee3c9455c8a902e4911acf1ec',
+//         is_lettering: '1',
+//         material_code: 'A10014'
+//       }
+//     ],
+//     code: '1',
+//     desc: '查询成功'
+//   }
+//   return res
+// }
 // 2.下发刻字、贴标
 export const sendMessage = (type, uuid, ouuid) => post('api/hand/sendMessage', {
   type: type,
diff --git a/src/config/http.js b/src/config/http.js
index f1f5bbe..0d07950 100644
--- a/src/config/http.js
+++ b/src/config/http.js
@@ -1,13 +1,9 @@
 import axios from 'axios'
-// import qs from 'qs'
-import { Dialog } from './utils.js'
-// import { Dialog, toast } from './utils.js'
+import { Dialog, toast } from './utils.js'
 import store from '../vuex/store'
-// import router from './../router'
+import router from '@/router'
 
 axios.defaults.timeout = 50000
-// axios.defaults.retry = 5
-// axios.defaults.retryDelay = 10000
 axios.defaults.headers.post['Content-Type'] = 'application/json;charset=UTF-8'
 
 axios.interceptors.request.use(
@@ -29,49 +25,23 @@ axios.interceptors.request.use(
 
 axios.interceptors.response.use(
   response => {
-    return Promise.resolve(response)
+    if (response.status === 200) {
+      return Promise.resolve(response)
+    } else {
+      return Promise.reject(response)
+    }
   },
   error => {
-    // let condata = error.config.data.split('&')
-    // console.log('condata', condata)
-    // if (condata[1] === '_SRVMETHOD=queryProduceOrderReprot' || condata[1] === '_SRVMETHOD=queryQCRecord' || condata[1] === '_SRVMETHOD=queryEquipWorkTeam') {
-    //   toast(error.message)
-    //   setTimeout(() => {
-    //     router.replace({
-    //       path: '/login'
-    //     })
-    //   }, 10000)
-    // } else {
-    //   if (condata[1] === '_SRVMETHOD=queryEquip') {
-    //     toast(error.message)
-    //   } else {
-    //     Dialog(error.message)
-    //   }
-    //   // Dialog(error.message)
-    // }
-    // toast(error.message)
-    // - 20201215-x
-    // router.push({
-    //   path: '/500',
-    //   query: {redirect: router.currentRoute.fullPath}
-    // })
-    // - 20201215-x
+    if (error && error.response) {
+      switch (error.response.status) {
+        case 401:
+          toast(error.response.data.message)
+          store.dispatch('setSignOut')
+          router.push('/login')
+          break
+      }
+    }
     return Promise.reject(error)
-    // let config = error.config
-    // if (!config || !config.retry) return Promise.reject(error)
-    // config.__retryCount = config.__retryCount || 0
-    // if (config.__retryCount >= config.retry) {
-    //   return Promise.reject(error)
-    // }
-    // config.__retryCount += 1
-    // let backoff = new Promise(resolve => {
-    //   setTimeout(() => {
-    //     resolve()
-    //   }, config.retryDelay || 1)
-    // })
-    // return backoff.then(() => {
-    //   return axios(config)
-    // })
   }
 )
 
@@ -79,11 +49,9 @@ export const post = (sevmethod, params) => {
   return new Promise((resolve, reject) => {
     axios.post(`${store.getters.baseUrl}/` + sevmethod, params)
       .then(response => {
-        // if (response.data.code === '0') {
-        //   Dialog(response.data.desc)
-        // }
         resolve(response.data)
       }, error => {
+        Dialog(error.message)
         reject(error.message)
       })
       .catch((error) => {