From ce6eaa02e5f32e3f077c654d6e93f33c62b5f781 Mon Sep 17 00:00:00 2001
From: icewint <icewint@qq.com>
Date: Thu, 1 Aug 2024 16:20:35 +0800
Subject: [PATCH] =?UTF-8?q?<point>[important]=E5=8F=AF=E7=94=A8=E5=88=9D?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/axios/base/base.axios.js                  |  4 ++--
 src/enum/stacker/stackerStatusEnum.js         | 20 +++++++++----------
 .../component/elTagTask/ElTagTaskList.vue     |  4 ++--
 src/view/tab/systemStatus/StackerStatus.vue   | 18 +++++++++++++----
 4 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/axios/base/base.axios.js b/src/axios/base/base.axios.js
index 9a8c7b4..1658302 100644
--- a/src/axios/base/base.axios.js
+++ b/src/axios/base/base.axios.js
@@ -1,7 +1,7 @@
 import axios from "axios";
 
 if(process.env.NODE_ENV === 'development') {
-    axios.defaults.baseURL = 'http://localhost:890';
+    axios.defaults.baseURL = 'http://localhost:18990';
 }else {
     axios.defaults.baseURL = 'http://192.168.103.200:18990';
 }
@@ -11,7 +11,7 @@ axios.defaults.timeout = 5000
 
 axios.interceptors.request.use(function (config) {
     // 在发送请求之前做些什么
-    //config.headers.set('Content-Type', 'application/json');
+    config.headers.set('Content-Type', 'application/json');
     const token = window.sessionStorage.getItem('token')
     token?config.headers.Authorization = token:null;
     return config;
diff --git a/src/enum/stacker/stackerStatusEnum.js b/src/enum/stacker/stackerStatusEnum.js
index ad2d25e..67dca33 100644
--- a/src/enum/stacker/stackerStatusEnum.js
+++ b/src/enum/stacker/stackerStatusEnum.js
@@ -14,52 +14,52 @@ export const stackerControlModel = {
     acceptTask: {
         value: 2,
         label: '任务接收',
-        type: 'Info'
+        type: 'info'
     },
     getMove: {
         value: 3,
         label: '取货移动',
-        type: 'Info'
+        type: 'info'
     },
     getting: {
         value: 4,
         label: '取货中',
-        type: 'Info'
+        type: 'info'
     },
     getComplete: {
         value: 5,
         label: '取货完成',
-        type: 'Info'
+        type: 'info'
     },
     setMove: {
         value: 6,
         label: '卸货移动',
-        type: 'Info'
+        type: 'info'
     },
     setting: {
         value: 7,
         label: '卸货中',
-        type: 'Info'
+        type: 'info'
     },
     setComplete: {
         value: 8,
         label: '卸货完成',
-        type: 'Info'
+        type: 'info'
     },
     taskComplete: {
         value: 9,
         label: '任务完成',
-        type: 'Info'
+        type: 'info'
     },
     deleteTask: {
         value: 10,
         label: '删除任务',
-        type: 'Info'
+        type: 'info'
     },
     checking: {
         value: 11,
         label: '盘点中',
-        type: 'Info'
+        type: 'info'
     },
     applyTask: {
         value: 12,
diff --git a/src/view/component/elTagTask/ElTagTaskList.vue b/src/view/component/elTagTask/ElTagTaskList.vue
index 4d77bef..25407b0 100644
--- a/src/view/component/elTagTask/ElTagTaskList.vue
+++ b/src/view/component/elTagTask/ElTagTaskList.vue
@@ -13,8 +13,8 @@
           </template>
         </el-table-column>
         <el-table-column prop="orderId" label="订单号" width="100px" align="center" show-overflow-tooltip/>
-        <el-table-column prop="vehicleNo" label="载具号" width="100px" align="center" show-overflow-tooltip/>
-        <el-table-column prop="goodsId" label="物料编号" width="100px" align="center" show-overflow-tooltip/>
+        <el-table-column prop="vehicleNo" label="载具号" width="120px" align="center" show-overflow-tooltip/>
+        <el-table-column prop="goodsId" label="物料编号" width="130px" align="center" show-overflow-tooltip/>
         <el-table-column prop="goodsName" label="物料名称" width="100px" align="center" show-overflow-tooltip/>
         <el-table-column prop="taskStatus" label="任务状态" width="140px" align="center">
           <template #default="scope">
diff --git a/src/view/tab/systemStatus/StackerStatus.vue b/src/view/tab/systemStatus/StackerStatus.vue
index 341607b..d3b4de3 100644
--- a/src/view/tab/systemStatus/StackerStatus.vue
+++ b/src/view/tab/systemStatus/StackerStatus.vue
@@ -16,8 +16,8 @@
         </el-table-column>
         <el-table-column prop="forkStatus" label="货叉状态（系统）" align="center" width="150px"/>
         <el-table-column prop="msg" label="查询结果" align="center" show-overflow-tooltip/>
-        <el-table-column prop="plcId" label="PlcId" width="150px" align="center" show-overflow-tooltip/>
-        <el-table-column prop="controlModel" label="控制方式" width="250px" align="center" >
+        <el-table-column prop="plcId" label="PlcId" width="200px" align="center" show-overflow-tooltip/>
+        <el-table-column prop="controlModel" label="控制方式" width="150px" align="center" >
           <template #default="scope">
             <el-tag class="ml-2" :type=formatterStackerControlModel(scope.row.controlModel).type>
               {{formatterStackerControlModel(scope.row.controlModel).label}}</el-tag>
@@ -33,8 +33,14 @@
         <el-table-column prop="line" label="列" align="center" width="60px"/>
         <el-table-column prop="layer" label="层" align="center" width="60px"/>
         <el-table-column prop="depth" label="深" align="center" width="60px"/>
-        <el-table-column prop="code" label="料箱码" align="center"  width="150px"/>
-        <el-table-column prop="errCode" label="报警编号" align="center" width="130px" show-overflow-tooltip/>
+        <el-table-column prop="code" label="料箱码" align="center"  width="250px"/>
+        <el-table-column prop="errCode" label="报警编号" align="center" width="130px" show-overflow-tooltip>
+          <template #default="scope">
+            <el-button size="small" @click="showErr(scope.row)" :type="(scope.row.errCode === 0 ? 'success' : 'danger')">
+              {{scope.row.errCode}}
+            </el-button>
+          </template>
+        </el-table-column>
 <!--        <el-table-column fixed="right" label="操作" align="center" width="80">-->
 <!--          <template #default="scope">-->
 <!--            <el-button-group class="ml-4">-->
@@ -109,6 +115,10 @@ export default {
         })
         loading.close()
       })
+    },
+    // 显示故障
+    showErr(row) {
+
     }
   },
   // 组合式 API