ak/zn-admin-vue3-wcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: ak:b0347e9bd126c0a0cbc55cb9be22874e53de8afe
Branches Tags
ak:master
ak:dev
..
compare: ak:285a1cc8f573eb9c8785f0d75d647c2b603a555e
Branches Tags
ak:dev
ak:master

No commits in common. "b0347e9bd126c0a0cbc55cb9be22874e53de8afe" and "285a1cc8f573eb9c8785f0d75d647c2b603a555e" have entirely different histories.
b0347e9bd1 ... 285a1cc8f5

5 changed files with 35 additions and 58 deletions
Show Stats Expand all files Collapse all files

3
src/views/mapPage/components/locationSelectionDialog.vue
View File

@ -127,6 +127,7 @@ const props = defineProps({
const locationTypeNumber = ref(1)
const open = (locationTypeNum) => {
console.log(props.positionMapId)
dialogFormVisible.value = true
currentItem.value = null
locationTypeNumber.value = locationTypeNum
@ -279,8 +280,6 @@ const getAllNodeList = async () => {
}
allMapPointInfo.value.push(item)
}
item.dataList = item.dataList.reverse()
})
}
//将节点实际宽高cm转换成px

4
src/views/mapPage/realTimeMap/components-tool/editMapRouteDialog.vue
View File

@ -317,9 +317,9 @@ const submitForm = async (formEl) => {
)
let actualEndControl = disposeEventPoint(form.value.endControlX, form.value.endControlY)
form.value.actualBeginControlX = actualBeginControl.actualLocationX //实际开始控制点x轴
form.value.actualBeginControlY = actualBeginControl.actualLocationY //实际开始控制点y轴
form.value.actualBeginControlY = actualBeginControl.actualLocationX //实际开始控制点y轴
form.value.actualEndControlX = actualEndControl.actualLocationX //实际结束控制点x轴
form.value.actualEndControlY = actualEndControl.actualLocationY //实际结束控制点y轴
form.value.actualEndControlY = actualEndControl.actualLocationX //实际结束控制点y轴
} else {
form.value.beginControlX = 0
form.value.beginControlY = 0

5
src/views/mapPage/realTimeMap/editMap copy.vue
View File

@ -840,7 +840,8 @@ const resizeEnd = (locationX, locationY, w, h, item, index) => {
route.endPointY = y
route.endHigh = Number(item.locationDeepPx)
route.endWidth = Number(item.locationWidePx)
route.actualEndPointX = actualPoint.route.actualEndPointY = actualPoint.actualLocationY
route.actualEndPointX = actualPoint.actualLocationX
route.actualEndPointY = actualPoint.actualLocationY
}
})
addEditHistory()
@ -2335,7 +2336,7 @@ const editMapRouteDialogSubmit = (form) => {
item.locationX = form.endPointX
item.locationY = form.endPointY
item.actualLocationX = disposeEventPoint(form.endPointX, form.endPointY).actualLocationX
item.actualLocationY = disposeEventPoint(form.endPointX, form.endPointY).actualLocationY
item.actualLocationY = disposeEventPoint(form.endPointX, form.endPointY).actualLocationX
}
})
//增加一条历史记录

4
src/views/mapPage/realTimeMap/editMap.vue
View File

@ -60,7 +60,7 @@
<el-input-number
v-model="state.rotationForm.angle"
:min="0"
:max="259"
:max="360"
controls-position="right"
/>
</el-form-item>
@ -2375,7 +2375,7 @@ const editMapRouteDialogSubmit = (form) => {
item.locationX = form.endPointX
item.locationY = form.endPointY
item.actualLocationX = disposeEventPoint(form.endPointX, form.endPointY).actualLocationX
item.actualLocationY = disposeEventPoint(form.endPointX, form.endPointY).actualLocationY
item.actualLocationY = disposeEventPoint(form.endPointX, form.endPointY).actualLocationX
}
})
//增加一条历史记录

77
src/views/mapPage/taskManagement/createTask.vue
View File

@ -48,7 +48,7 @@
:disabled="montageNumberDisable"
class="!w-220px"
v-model="formData.montageNumber"
:min="0"
:min="1"
:max="10"
@change="montageNumberChange"
/>
@ -155,6 +155,7 @@
:rules="{ required: true, message: '任务类型不能为空', trigger: 'change' }"
>
<el-select
:disabled="formData.doCycle == 1 || formData.doMoveAll == 1"
v-model="detailItem.taskType"
placeholder="请选择"
@change="taskTypeChange(detailItem, index)"
@ -968,53 +969,29 @@ const montageNumberChange = (currentValue: number, oldValue: number) => {
let addLength = currentValue - formData.value.taskDetailList.length
let taskTypeList
//搬空线库
if (formData.value.doMoveAll === 1) {
taskTypeList = [{ label: '取放货', value: 1 }]
} else {
//开启了任务循环
if (formData.value.doCycle === 1) {
taskTypeList = [
{ label: '取放货', value: 1 },
{ label: '移动', value: 4 }
]
} else {
if (oldItem) {
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 }
]
}
} else {
taskTypeList = [
{ label: '取放货', value: 1 },
{ label: '停车', value: 2 },
{ label: '充电', value: 3 },
{ label: '移动', value: 4 },
{ label: '仅取货', value: 5 },
{ label: '仅放货', value: 6 }
]
}
}
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++) {
@ -1054,7 +1031,7 @@ const doCycleChange = () => {
resolve(true)
} else {
try {
ElMessageBox.confirm('开启循环任务，任务类型只能选择取放货和移动，是否切换?', '提示', {
ElMessageBox.confirm('开启循环任务，任务类型只能选择取放货，是否切换?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
@ -1063,7 +1040,7 @@ const doCycleChange = () => {
resolve(true)
formData.value.cycleNumber = 1 //循环次数
formData.value.taskDetailList = formData.value.taskDetailList.filter(
(item, index) => item.taskType === 1 || item.taskType === 4
(item, index) => item.taskType === 1
)
formData.value.montageNumber = formData.value.taskDetailList.length //拼接任务数量
})