<point>[important]可用初版

This commit is contained in:
葛林强 2024-08-01 16:20:35 +08:00
parent 30e589a14d
commit ce6eaa02e5
4 changed files with 28 additions and 18 deletions

View File

@ -1,7 +1,7 @@
import axios from "axios"; import axios from "axios";
if(process.env.NODE_ENV === 'development') { if(process.env.NODE_ENV === 'development') {
axios.defaults.baseURL = 'http://localhost:890'; axios.defaults.baseURL = 'http://localhost:18990';
}else { }else {
axios.defaults.baseURL = 'http://192.168.103.200:18990'; axios.defaults.baseURL = 'http://192.168.103.200:18990';
} }
@ -11,7 +11,7 @@ axios.defaults.timeout = 5000
axios.interceptors.request.use(function (config) { 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') const token = window.sessionStorage.getItem('token')
token?config.headers.Authorization = token:null; token?config.headers.Authorization = token:null;
return config; return config;

View File

@ -14,52 +14,52 @@ export const stackerControlModel = {
acceptTask: { acceptTask: {
value: 2, value: 2,
label: '任务接收', label: '任务接收',
type: 'Info' type: 'info'
}, },
getMove: { getMove: {
value: 3, value: 3,
label: '取货移动', label: '取货移动',
type: 'Info' type: 'info'
}, },
getting: { getting: {
value: 4, value: 4,
label: '取货中', label: '取货中',
type: 'Info' type: 'info'
}, },
getComplete: { getComplete: {
value: 5, value: 5,
label: '取货完成', label: '取货完成',
type: 'Info' type: 'info'
}, },
setMove: { setMove: {
value: 6, value: 6,
label: '卸货移动', label: '卸货移动',
type: 'Info' type: 'info'
}, },
setting: { setting: {
value: 7, value: 7,
label: '卸货中', label: '卸货中',
type: 'Info' type: 'info'
}, },
setComplete: { setComplete: {
value: 8, value: 8,
label: '卸货完成', label: '卸货完成',
type: 'Info' type: 'info'
}, },
taskComplete: { taskComplete: {
value: 9, value: 9,
label: '任务完成', label: '任务完成',
type: 'Info' type: 'info'
}, },
deleteTask: { deleteTask: {
value: 10, value: 10,
label: '删除任务', label: '删除任务',
type: 'Info' type: 'info'
}, },
checking: { checking: {
value: 11, value: 11,
label: '盘点中', label: '盘点中',
type: 'Info' type: 'info'
}, },
applyTask: { applyTask: {
value: 12, value: 12,

View File

@ -13,8 +13,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="orderId" label="订单号" width="100px" align="center" show-overflow-tooltip/> <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="vehicleNo" label="载具号" width="120px" align="center" show-overflow-tooltip/>
<el-table-column prop="goodsId" label="物料编号" width="100px" 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="goodsName" label="物料名称" width="100px" align="center" show-overflow-tooltip/>
<el-table-column prop="taskStatus" label="任务状态" width="140px" align="center"> <el-table-column prop="taskStatus" label="任务状态" width="140px" align="center">
<template #default="scope"> <template #default="scope">

View File

@ -16,8 +16,8 @@
</el-table-column> </el-table-column>
<el-table-column prop="forkStatus" label="货叉状态(系统)" align="center" width="150px"/> <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="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="plcId" label="PlcId" width="200px" align="center" show-overflow-tooltip/>
<el-table-column prop="controlModel" label="控制方式" width="250px" align="center" > <el-table-column prop="controlModel" label="控制方式" width="150px" align="center" >
<template #default="scope"> <template #default="scope">
<el-tag class="ml-2" :type=formatterStackerControlModel(scope.row.controlModel).type> <el-tag class="ml-2" :type=formatterStackerControlModel(scope.row.controlModel).type>
{{formatterStackerControlModel(scope.row.controlModel).label}}</el-tag> {{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="line" label="列" align="center" width="60px"/>
<el-table-column prop="layer" 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="depth" label="深" align="center" width="60px"/>
<el-table-column prop="code" label="料箱码" align="center" width="150px"/> <el-table-column prop="code" label="料箱码" align="center" width="250px"/>
<el-table-column prop="errCode" label="报警编号" align="center" width="130px" show-overflow-tooltip/> <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">--> <!-- <el-table-column fixed="right" label="操作" align="center" width="80">-->
<!-- <template #default="scope">--> <!-- <template #default="scope">-->
<!-- <el-button-group class="ml-4">--> <!-- <el-button-group class="ml-4">-->
@ -109,6 +115,10 @@ export default {
}) })
loading.close() loading.close()
}) })
},
//
showErr(row) {
} }
}, },
// API // API