bug修改
This commit is contained in:
parent
3c43224045
commit
d51bc6a4dc
@ -90,7 +90,7 @@ const formLoading = ref(false) // 表单的加载中:1)修改时的数据加
|
|||||||
const title = ref('新建') // form表单
|
const title = ref('新建') // form表单
|
||||||
const formData = ref({
|
const formData = ref({
|
||||||
robotModelId: undefined, //车辆类型id
|
robotModelId: undefined, //车辆类型id
|
||||||
robotNo: undefined, //AGV编号
|
robotNo: undefined, //车辆编号
|
||||||
macAddress: undefined, //mac地址
|
macAddress: undefined, //mac地址
|
||||||
floorAreaJson: [],
|
floorAreaJson: [],
|
||||||
autoCharge: undefined
|
autoCharge: undefined
|
||||||
@ -135,7 +135,7 @@ const floorAreaChange = (value) => {
|
|||||||
|
|
||||||
const formRules = reactive({
|
const formRules = reactive({
|
||||||
robotModelId: [{ required: true, message: '车辆类型不能为空', trigger: 'change' }],
|
robotModelId: [{ required: true, message: '车辆类型不能为空', trigger: 'change' }],
|
||||||
robotNo: [{ required: true, message: 'AGV编号不能为空', trigger: 'change' }],
|
robotNo: [{ required: true, message: '车辆编号不能为空', trigger: 'change' }],
|
||||||
macAddress: [{ required: true, message: 'Mac地址不能为空', trigger: 'change' }],
|
macAddress: [{ required: true, message: 'Mac地址不能为空', trigger: 'change' }],
|
||||||
autoCharge: [{ required: true, message: '自动充电电量不能为空', trigger: 'change' }]
|
autoCharge: [{ required: true, message: '自动充电电量不能为空', trigger: 'change' }]
|
||||||
})
|
})
|
||||||
@ -244,7 +244,7 @@ const takeRemoteMethod = async (query, item) => {
|
|||||||
const resetForm = () => {
|
const resetForm = () => {
|
||||||
formData.value = {
|
formData.value = {
|
||||||
robotModelId: undefined, //车辆类型id
|
robotModelId: undefined, //车辆类型id
|
||||||
robotNo: undefined, //AGV编号
|
robotNo: undefined, //车辆编号
|
||||||
macAddress: undefined, //mac地址
|
macAddress: undefined, //mac地址
|
||||||
floorAreaJson: [],
|
floorAreaJson: [],
|
||||||
autoCharge: undefined
|
autoCharge: undefined
|
||||||
|
@ -85,7 +85,7 @@ const formLoading = ref(false) // 表单的加载中:1)修改时的数据加
|
|||||||
const title = ref('新建') // form表单
|
const title = ref('新建') // form表单
|
||||||
const formData = ref({
|
const formData = ref({
|
||||||
deviceType: undefined, //设备类型
|
deviceType: undefined, //设备类型
|
||||||
deviceNo: undefined, //AGV编号
|
deviceNo: undefined, //车辆编号
|
||||||
macAddress: undefined, //mac地址
|
macAddress: undefined, //mac地址
|
||||||
mapImageUrl: undefined, //设备在地图上图标
|
mapImageUrl: undefined, //设备在地图上图标
|
||||||
pictureConfig: undefined, // 图片设置(1:默认图片、2:上传图片、 3:不显示图片)
|
pictureConfig: undefined, // 图片设置(1:默认图片、2:上传图片、 3:不显示图片)
|
||||||
@ -217,7 +217,7 @@ const takeRemoteMethod = async (query, item) => {
|
|||||||
const resetForm = () => {
|
const resetForm = () => {
|
||||||
formData.value = {
|
formData.value = {
|
||||||
deviceType: undefined, //车辆类型id
|
deviceType: undefined, //车辆类型id
|
||||||
deviceNo: undefined, //AGV编号
|
deviceNo: undefined, //车辆编号
|
||||||
macAddress: undefined, //mac地址
|
macAddress: undefined, //mac地址
|
||||||
mapImageUrl: undefined, //设备在地图上图标
|
mapImageUrl: undefined, //设备在地图上图标
|
||||||
pictureConfig: undefined, // 图片设置(1:默认图片、2:上传图片、 3:不显示图片)
|
pictureConfig: undefined, // 图片设置(1:默认图片、2:上传图片、 3:不显示图片)
|
||||||
|
@ -17,10 +17,10 @@
|
|||||||
class="!w-240px"
|
class="!w-240px"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="AGV编号" prop="robotNo">
|
<el-form-item label="车辆编号" prop="robotNo">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.robotNo"
|
v-model="queryParams.robotNo"
|
||||||
placeholder="请输入AGV编号"
|
placeholder="请输入车辆编号"
|
||||||
clearable
|
clearable
|
||||||
@keyup.enter="handleQuery"
|
@keyup.enter="handleQuery"
|
||||||
class="!w-240px"
|
class="!w-240px"
|
||||||
@ -67,7 +67,7 @@
|
|||||||
:header-cell-style="{ backgroundColor: '#EBF1FF', padding: '13px 0' }"
|
:header-cell-style="{ backgroundColor: '#EBF1FF', padding: '13px 0' }"
|
||||||
>
|
>
|
||||||
<el-table-column label="序号" align="center" type="index" width="80" />
|
<el-table-column label="序号" align="center" type="index" width="80" />
|
||||||
<el-table-column label="AGV编号" align="center" prop="robotNo" />
|
<el-table-column label="车辆编号" align="center" prop="robotNo" />
|
||||||
<el-table-column label="告警等级(1-4)" align="center" prop="warnLevel" />
|
<el-table-column label="告警等级(1-4)" align="center" prop="warnLevel" />
|
||||||
<el-table-column label="告警/异常ID" align="center" prop="warnCode" />
|
<el-table-column label="告警/异常ID" align="center" prop="warnCode" />
|
||||||
<el-table-column label="告警/异常信息" align="center" prop="warnMsg" />
|
<el-table-column label="告警/异常信息" align="center" prop="warnMsg" />
|
||||||
|
@ -177,7 +177,7 @@ const formData = ref({
|
|||||||
releaseList: [], //放货的名称的列表
|
releaseList: [], //放货的名称的列表
|
||||||
takeId: undefined, //取货位置的id
|
takeId: undefined, //取货位置的id
|
||||||
takeList: [], //取货位置的名称列表
|
takeList: [], //取货位置的名称列表
|
||||||
robotNo: undefined, //AGV编号
|
robotNo: undefined, //车辆编号
|
||||||
needLock: 0, //停车后锁定(0:否、1:是)
|
needLock: 0, //停车后锁定(0:否、1:是)
|
||||||
electricity: undefined //所选车辆电量(充电模式)
|
electricity: undefined //所选车辆电量(充电模式)
|
||||||
}
|
}
|
||||||
@ -359,7 +359,7 @@ const resetForm = () => {
|
|||||||
releaseList: [], //放货的名称的列表
|
releaseList: [], //放货的名称的列表
|
||||||
takeId: undefined, //取货位置的id
|
takeId: undefined, //取货位置的id
|
||||||
takeList: [], //取货位置的名称列表
|
takeList: [], //取货位置的名称列表
|
||||||
robotNo: undefined, //AGV编号
|
robotNo: undefined, //车辆编号
|
||||||
needLock: 0, //停车后锁定(0:否、1:是)
|
needLock: 0, //停车后锁定(0:否、1:是)
|
||||||
electricity: undefined //所选车辆电量(充电模式)
|
electricity: undefined //所选车辆电量(充电模式)
|
||||||
}
|
}
|
||||||
|
@ -1268,7 +1268,7 @@ const state = reactive({
|
|||||||
macAddress: '', // mac地址
|
macAddress: '', // mac地址
|
||||||
markProperty: '', //标记属性
|
markProperty: '', //标记属性
|
||||||
originalNode: '', //原节点
|
originalNode: '', //原节点
|
||||||
robotNo: '' //AGV编号
|
robotNo: '' //车辆编号
|
||||||
}, //标记的表单
|
}, //标记的表单
|
||||||
mapMarkCarList: [], //标记的车辆列表
|
mapMarkCarList: [], //标记的车辆列表
|
||||||
popoverVisible: false, //标记弹窗
|
popoverVisible: false, //标记弹窗
|
||||||
|
@ -747,7 +747,7 @@ const formData = ref({
|
|||||||
releaseList: [], //放货的名称的列表
|
releaseList: [], //放货的名称的列表
|
||||||
takeId: undefined, //取货位置的id
|
takeId: undefined, //取货位置的id
|
||||||
takeList: [], //取货位置的名称列表
|
takeList: [], //取货位置的名称列表
|
||||||
robotNo: undefined, //AGV编号
|
robotNo: undefined, //车辆编号
|
||||||
needLock: 0, //停车后锁定(0:否、1:是)
|
needLock: 0, //停车后锁定(0:否、1:是)
|
||||||
electricity: undefined, //所选车辆电量(充电模式)
|
electricity: undefined, //所选车辆电量(充电模式)
|
||||||
taskTypeList: [
|
taskTypeList: [
|
||||||
@ -790,7 +790,7 @@ const resetFormData = () => {
|
|||||||
releaseList: [], //放货的名称的列表
|
releaseList: [], //放货的名称的列表
|
||||||
takeId: undefined, //取货位置的id
|
takeId: undefined, //取货位置的id
|
||||||
takeList: [], //取货位置的名称列表
|
takeList: [], //取货位置的名称列表
|
||||||
robotNo: undefined, //AGV编号
|
robotNo: undefined, //车辆编号
|
||||||
needLock: 0, //停车后锁定(0:否、1:是)
|
needLock: 0, //停车后锁定(0:否、1:是)
|
||||||
electricity: undefined, //所选车辆电量(充电模式)
|
electricity: undefined, //所选车辆电量(充电模式)
|
||||||
taskTypeList: [
|
taskTypeList: [
|
||||||
@ -965,27 +965,48 @@ const doMoveAllChange = (e) => {
|
|||||||
const montageNumberChange = (currentValue: number, oldValue: number) => {
|
const montageNumberChange = (currentValue: number, oldValue: number) => {
|
||||||
if (currentValue > oldValue) {
|
if (currentValue > oldValue) {
|
||||||
//增加
|
//增加
|
||||||
|
let oldItem = formData.value.taskDetailList[oldValue - 1]
|
||||||
let addLength = currentValue - formData.value.taskDetailList.length
|
let addLength = currentValue - formData.value.taskDetailList.length
|
||||||
|
let taskTypeList
|
||||||
|
|
||||||
|
if (oldItem.taskType === 1) {
|
||||||
|
taskTypeList = [
|
||||||
|
{ label: '取放货', value: 1 },
|
||||||
|
{ label: '移动', value: 4 },
|
||||||
|
{ label: '仅取货', value: 5 }
|
||||||
|
]
|
||||||
|
} else if (oldItem.taskType === 4) {
|
||||||
|
taskTypeList = [
|
||||||
|
{ label: '取放货', value: 1 },
|
||||||
|
{ label: '移动', value: 4 },
|
||||||
|
{ label: '仅取货', value: 5 }
|
||||||
|
]
|
||||||
|
} else if (oldItem.taskType === 5) {
|
||||||
|
taskTypeList = [
|
||||||
|
{ label: '移动', value: 4 },
|
||||||
|
{ label: '仅放货', value: 6 }
|
||||||
|
]
|
||||||
|
} else if (oldItem.taskType === 6) {
|
||||||
|
taskTypeList = [
|
||||||
|
{ label: '取放货', value: 1 },
|
||||||
|
{ label: '移动', value: 4 },
|
||||||
|
{ label: '仅取货', value: 5 }
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
for (let index = 0; index < addLength; index++) {
|
for (let index = 0; index < addLength; index++) {
|
||||||
formData.value.taskDetailList.push({
|
formData.value.taskDetailList.push({
|
||||||
taskType: 1, //任务类型(1:取放货、2:停车、 3:充电、4:移动、5:仅取货、6:仅放货、7:扫描码、8:检测托盘类型)
|
taskType: undefined, //任务类型(1:取放货、2:停车、 3:充电、4:移动、5:仅取货、6:仅放货、7:扫描码、8:检测托盘类型)
|
||||||
releaseType: 1, //放货类型 1:库位、2:线库、 3:区域
|
releaseType: 1, //放货类型 1:库位、2:线库、 3:区域
|
||||||
takeType: 1, //取货类型(1:库位、2:线库、 3:区域)
|
takeType: 1, //取货类型(1:库位、2:线库、 3:区域)
|
||||||
releaseId: undefined, //放货位置的id
|
releaseId: undefined, //放货位置的id
|
||||||
releaseList: [], //放货的名称的列表
|
releaseList: [], //放货的名称的列表
|
||||||
takeId: undefined, //取货位置的id
|
takeId: undefined, //取货位置的id
|
||||||
takeList: [], //取货位置的名称列表
|
takeList: [], //取货位置的名称列表
|
||||||
robotNo: undefined, //AGV编号
|
robotNo: undefined, //车辆编号
|
||||||
needLock: 0, //停车后锁定(0:否、1:是)
|
needLock: 0, //停车后锁定(0:否、1:是)
|
||||||
electricity: undefined, //所选车辆电量(充电模式)
|
electricity: undefined, //所选车辆电量(充电模式)
|
||||||
taskTypeList: [
|
taskTypeList: taskTypeList
|
||||||
{ label: '取放货', value: 1 },
|
|
||||||
{ label: '停车', value: 2 },
|
|
||||||
{ label: '充电', value: 3 },
|
|
||||||
{ label: '移动', value: 4 },
|
|
||||||
{ label: '仅取货', value: 5 },
|
|
||||||
{ label: '仅放货', value: 6 }
|
|
||||||
]
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
Reference in New Issue
Block a user