bug修改

src/views/mapPage/components/locationSelectionDialog.vue

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

src/views/mapPage/realTimeMap/components-tool/editMapRouteDialog.vue

@@ -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.actualLocationX //实际开始控制点y轴
+        form.value.actualBeginControlY = actualBeginControl.actualLocationY //实际开始控制点y轴
         form.value.actualEndControlX = actualEndControl.actualLocationX //实际结束控制点x轴
-        form.value.actualEndControlY = actualEndControl.actualLocationX //实际结束控制点y轴
+        form.value.actualEndControlY = actualEndControl.actualLocationY //实际结束控制点y轴
       } else {
         form.value.beginControlX = 0
         form.value.beginControlY = 0

src/views/mapPage/realTimeMap/editMap copy.vue

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

src/views/mapPage/realTimeMap/editMap.vue

@@ -60,7 +60,7 @@
                 <el-input-number
                   v-model="state.rotationForm.angle"
                   :min="0"
-                  :max="360"
+                  :max="259"
                   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).actualLocationX
+      item.actualLocationY = disposeEventPoint(form.endPointX, form.endPointY).actualLocationY
     }
   })
   //增加一条历史记录

src/views/mapPage/taskManagement/createTask.vue

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