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 @@
-
-
+
+
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 @@
-
-
+
+
{{formatterStackerControlModel(scope.row.controlModel).label}}
@@ -33,8 +33,14 @@
-
-
+
+
+
+
+ {{scope.row.errCode}}
+
+
+
@@ -109,6 +115,10 @@ export default {
})
loading.close()
})
+ },
+ // 显示故障
+ showErr(row) {
+
}
},
// 组合式 API