diff --git a/src/views/board/carBoard/createEditDialog.vue b/src/views/board/carBoard/createEditDialog.vue index b9b883a2..5ee8f87d 100644 --- a/src/views/board/carBoard/createEditDialog.vue +++ b/src/views/board/carBoard/createEditDialog.vue @@ -90,7 +90,7 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加 const title = ref('新建') // form表单 const formData = ref({ robotModelId: undefined, //车辆类型id - robotNo: undefined, //AGV编号 + robotNo: undefined, //车辆编号 macAddress: undefined, //mac地址 floorAreaJson: [], autoCharge: undefined @@ -135,7 +135,7 @@ const floorAreaChange = (value) => { const formRules = reactive({ 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' }], autoCharge: [{ required: true, message: '自动充电电量不能为空', trigger: 'change' }] }) @@ -244,7 +244,7 @@ const takeRemoteMethod = async (query, item) => { const resetForm = () => { formData.value = { robotModelId: undefined, //车辆类型id - robotNo: undefined, //AGV编号 + robotNo: undefined, //车辆编号 macAddress: undefined, //mac地址 floorAreaJson: [], autoCharge: undefined diff --git a/src/views/board/device/createEditDialog.vue b/src/views/board/device/createEditDialog.vue index cf3d361d..ca09693f 100644 --- a/src/views/board/device/createEditDialog.vue +++ b/src/views/board/device/createEditDialog.vue @@ -85,7 +85,7 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加 const title = ref('新建') // form表单 const formData = ref({ deviceType: undefined, //设备类型 - deviceNo: undefined, //AGV编号 + deviceNo: undefined, //车辆编号 macAddress: undefined, //mac地址 mapImageUrl: undefined, //设备在地图上图标 pictureConfig: undefined, // 图片设置（1：默认图片、2：上传图片、 3：不显示图片） @@ -217,7 +217,7 @@ const takeRemoteMethod = async (query, item) => { const resetForm = () => { formData.value = { deviceType: undefined, //车辆类型id - deviceNo: undefined, //AGV编号 + deviceNo: undefined, //车辆编号 macAddress: undefined, //mac地址 mapImageUrl: undefined, //设备在地图上图标 pictureConfig: undefined, // 图片设置（1：默认图片、2：上传图片、 3：不显示图片） diff --git a/src/views/carError/index.vue b/src/views/carError/index.vue index e8c2fc4c..64203760 100644 --- a/src/views/carError/index.vue +++ b/src/views/carError/index.vue @@ -17,10 +17,10 @@ class="!w-240px" /> - + - + diff --git a/src/views/mapPage/realTimeMap/components/createTaskDialog.vue b/src/views/mapPage/realTimeMap/components/createTaskDialog.vue index e74f6550..52cbd2a9 100644 --- a/src/views/mapPage/realTimeMap/components/createTaskDialog.vue +++ b/src/views/mapPage/realTimeMap/components/createTaskDialog.vue @@ -177,7 +177,7 @@ const formData = ref({ releaseList: [], //放货的名称的列表 takeId: undefined, //取货位置的id takeList: [], //取货位置的名称列表 - robotNo: undefined, //AGV编号 + robotNo: undefined, //车辆编号 needLock: 0, //停车后锁定(0:否、1:是) electricity: undefined //所选车辆电量(充电模式) } @@ -359,7 +359,7 @@ const resetForm = () => { releaseList: [], //放货的名称的列表 takeId: undefined, //取货位置的id takeList: [], //取货位置的名称列表 - robotNo: undefined, //AGV编号 + robotNo: undefined, //车辆编号 needLock: 0, //停车后锁定(0:否、1:是) electricity: undefined //所选车辆电量(充电模式) } diff --git a/src/views/mapPage/realTimeMap/editMap.vue b/src/views/mapPage/realTimeMap/editMap.vue index e194feb1..eeeffc3f 100644 --- a/src/views/mapPage/realTimeMap/editMap.vue +++ b/src/views/mapPage/realTimeMap/editMap.vue @@ -1268,7 +1268,7 @@ const state = reactive({ macAddress: '', // mac地址 markProperty: '', //标记属性 originalNode: '', //原节点 - robotNo: '' //AGV编号 + robotNo: '' //车辆编号 }, //标记的表单 mapMarkCarList: [], //标记的车辆列表 popoverVisible: false, //标记弹窗 diff --git a/src/views/mapPage/taskManagement/createTask.vue b/src/views/mapPage/taskManagement/createTask.vue index 90cf0d5b..d1629410 100644 --- a/src/views/mapPage/taskManagement/createTask.vue +++ b/src/views/mapPage/taskManagement/createTask.vue @@ -747,7 +747,7 @@ const formData = ref({ releaseList: [], //放货的名称的列表 takeId: undefined, //取货位置的id takeList: [], //取货位置的名称列表 - robotNo: undefined, //AGV编号 + robotNo: undefined, //车辆编号 needLock: 0, //停车后锁定(0:否、1:是) electricity: undefined, //所选车辆电量(充电模式) taskTypeList: [ @@ -790,7 +790,7 @@ const resetFormData = () => { releaseList: [], //放货的名称的列表 takeId: undefined, //取货位置的id takeList: [], //取货位置的名称列表 - robotNo: undefined, //AGV编号 + robotNo: undefined, //车辆编号 needLock: 0, //停车后锁定(0:否、1:是) electricity: undefined, //所选车辆电量(充电模式) taskTypeList: [ @@ -965,27 +965,48 @@ const doMoveAllChange = (e) => { const montageNumberChange = (currentValue: number, oldValue: number) => { if (currentValue > oldValue) { //增加 + let oldItem = formData.value.taskDetailList[oldValue - 1] 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++) { 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：区域 takeType: 1, //取货类型（1：库位、2：线库、 3：区域） releaseId: undefined, //放货位置的id releaseList: [], //放货的名称的列表 takeId: undefined, //取货位置的id takeList: [], //取货位置的名称列表 - robotNo: undefined, //AGV编号 + robotNo: undefined, //车辆编号 needLock: 0, //停车后锁定(0:否、1:是) electricity: undefined, //所选车辆电量(充电模式) - taskTypeList: [ - { label: '取放货', value: 1 }, - { label: '停车', value: 2 }, - { label: '充电', value: 3 }, - { label: '移动', value: 4 }, - { label: '仅取货', value: 5 }, - { label: '仅放货', value: 6 } - ] + taskTypeList: taskTypeList }) } } else {