Merge branch 'xhf' of http://git.znkjfw.com/ak/zn-admin-vue3-wcs into xhf

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

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：不显示图片）

src/views/carError/index.vue

@@ -17,10 +17,10 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="AGV编号" prop="robotNo">
+      <el-form-item label="车辆编号" prop="robotNo">
         <el-input
           v-model="queryParams.robotNo"
-          placeholder="请输入AGV编号"
+          placeholder="请输入车辆编号"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
@@ -67,7 +67,7 @@
       :header-cell-style="{ backgroundColor: '#EBF1FF', padding: '13px 0' }"
     >
       <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="告警/异常ID" align="center" prop="warnCode" />
       <el-table-column label="告警/异常信息" align="center" prop="warnMsg" />

src/views/mapPage/logList/index.vue

@@ -148,10 +148,10 @@
               :inline="true"
               label-width="68px"
             >
-              <el-form-item label="任务编号" prop="taskNo">
+              <el-form-item label="任务号" prop="taskNo">
                 <el-input
                   v-model="taskLogParams.taskNo"
-                  placeholder="请输入任务编号"
+                  placeholder="请输入任务号"
                   clearable
                   @keyup.enter="handleQuery"
                   class="!w-240px"
@@ -243,7 +243,7 @@
               v-loading="loading"
             >
               <el-table-column label="序号" type="index" width="80" align="center" />
-              <el-table-column prop="taskNo" label="任务编号" align="center" />
+              <el-table-column prop="taskNo" label="任务号" align="center" />
               <el-table-column prop="taskType" label="任务类型" align="center" width="120">
                 <template #default="scope">
                   <el-text v-if="scope.row.taskType == 1">取放货</el-text>
@@ -345,7 +345,7 @@ const getCarLogList = async () => {
 const taskLogParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  taskNo: null, //任务编号
+  taskNo: null, //任务号
   taskType: null, //任务类型
   taskStatus: null, //任务状态
   startTime: null, //开始时间

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

@@ -26,12 +26,12 @@
     </el-table>
     <!-- 分页 -->
     <div class="pagination">
-      <el-pagination
+      <Pagination
-        size="small"
-        background
-        layout="prev, pager, next"
-        :total="total"
         class="mt-4"
+        :total="total"
+        v-model:page="queryParams.pageNo"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getWareHouseList"
       />
     </div>
   </Dialog>

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

@@ -25,12 +25,12 @@
     </el-table>
     <!-- 分页 -->
     <div class="pagination">
-      <el-pagination
+      <Pagination
-        size="small"
-        background
-        layout="prev, pager, next"
-        :total="total"
         class="mt-4"
+        :total="total"
+        v-model:page="queryParams.pageNo"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getLineLibraryList"
       />
     </div>
   </Dialog>

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 //所选车辆电量(充电模式)
       }

src/views/mapPage/realTimeMap/editMap.vue

@@ -1268,7 +1268,7 @@ const state = reactive({
     macAddress: '', //	mac地址
     markProperty: '', //标记属性
     originalNode: '', //原节点
-    robotNo: '' //AGV编号
+    robotNo: '' //车辆编号
   }, //标记的表单
   mapMarkCarList: [], //标记的车辆列表
   popoverVisible: false, //标记弹窗

src/views/mapPage/taskManagement/createTask.vue

@@ -28,11 +28,7 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <div
+          <div>
-            v-if="
-              formData.taskDetailList[0].taskType !== 2 && formData.taskDetailList[0].taskType !== 3
-            "
-          >
             <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item required label="是否拼接任务" prop="montageTask" label-width="146">
@@ -49,6 +45,7 @@
               <el-col :span="12" v-if="formData.montageTask === 1">
                 <el-form-item required label="任务拼接数量" prop="montageNumber" label-width="146">
                   <el-input-number
+                    :disabled="montageNumberDisable"
                     class="!w-220px"
                     v-model="formData.montageNumber"
                     :min="1"
@@ -58,13 +55,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <div
+            <div>
-              v-if="
-                formData.taskDetailList[0].taskType === 1 ||
-                formData.taskDetailList[0].taskType === 5 ||
-                formData.taskDetailList[0].taskType === 6
-              "
-            >
               <el-row :gutter="24">
                 <el-col :span="12">
                   <el-form-item
@@ -77,7 +68,7 @@
                       v-model="formData.doMoveAll"
                       :active-value="1"
                       :inactive-value="0"
-                      @change="doMoveAllChange"
+                      :before-change="doMoveAllChange.bind()"
                     />
                   </el-form-item>
                 </el-col>
@@ -155,7 +146,6 @@
             class="task-item"
           >
             <div class="index-logo">{{ index + 1 }}</div>
-
             <el-row :gutter="24">
               <el-col :span="24">
                 <el-form-item
@@ -170,14 +160,12 @@
                     placeholder="请选择"
                     @change="taskTypeChange(detailItem, index)"
                   >
-                    <el-option label="取放货" :value="1" />
+                    <el-option
-                    <el-option label="停车" :value="2" />
+                      v-for="item in detailItem.taskTypeList"
-                    <el-option label="充电" :value="3" />
+                      :key="item.value"
-                    <el-option label="移动" :value="4" />
+                      :label="item.label"
-                    <el-option label="仅取货" :value="5" />
+                      :value="item.value"
-                    <el-option label="仅放货" :value="6" />
+                    />
-                    <!-- <el-option label="扫描码" :value="7" />
-                    <el-option label="检测托盘类型" :value="8" /> -->
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -306,6 +294,7 @@
                 <el-col :span="12">
                   <el-form-item label="指定车辆">
                     <el-select
+                      clearable
                       v-model="detailItem.robotNo"
                       placeholder="请选择车辆"
                       @change="chooseCarErrorMsg"
@@ -758,9 +747,17 @@ const formData = ref({
       releaseList: [], //放货的名称的列表
       takeId: undefined, //取货位置的id
       takeList: [], //取货位置的名称列表
-      robotNo: undefined, //AGV编号
+      robotNo: undefined, //车辆编号
       needLock: 0, //停车后锁定(0:否、1:是)
-      electricity: undefined //所选车辆电量(充电模式)
+      electricity: undefined, //所选车辆电量(充电模式)
+      taskTypeList: [
+        { label: '取放货', value: 1 },
+        { label: '停车', value: 2 },
+        { label: '充电', value: 3 },
+        { label: '移动', value: 4 },
+        { label: '仅取货', value: 5 },
+        { label: '仅放货', value: 6 }
+      ]
     }
   ], //任务列表
   skuInfo: undefined, //物料信息
@@ -793,9 +790,17 @@ const resetFormData = () => {
         releaseList: [], //放货的名称的列表
         takeId: undefined, //取货位置的id
         takeList: [], //取货位置的名称列表
-        robotNo: undefined, //AGV编号
+        robotNo: undefined, //车辆编号
         needLock: 0, //停车后锁定(0:否、1:是)
-        electricity: undefined //所选车辆电量(充电模式)
+        electricity: undefined, //所选车辆电量(充电模式)
+        taskTypeList: [
+          { label: '取放货', value: 1 },
+          { label: '停车', value: 2 },
+          { label: '充电', value: 3 },
+          { label: '移动', value: 4 },
+          { label: '仅取货', value: 5 },
+          { label: '仅放货', value: 6 }
+        ]
       }
     ], //任务列表
     skuInfo: undefined, //物料信息
@@ -866,204 +871,142 @@ const robotNoChange = (e, detailItem) => {
 }
 
 //任务类型切换
+const montageNumberDisable = computed(() =>
+  formData.value.taskDetailList.some((item) => {
+    return item.taskType == 2 || item.taskType == 3
+  })
+)
 const taskTypeChange = (item, index) => {
   item.releaseType = 1
   item.takeType = 1
-  item.releaseId = undefined
-  item.releaseList = []
-  item.takeId = undefined
-  item.takeList = []
-  item.robotNo = undefined
   item.needLock = 0
+  item.releaseId = undefined
+  item.takeId = undefined
+  item.robotNo = undefined
   item.electricity = undefined
   item.otherMsg = undefined
+  item.releaseList = []
+  item.takeList = []
 
-  let lastItem = formData.value.taskDetailList[index - 1]
+  let nextItem = formData.value.taskDetailList[index + 1]
-  // let nextItem = formData.value.taskDetailList[index + 1]
+  if (!nextItem) return
 
-  if (index === 0) {
+  if (item.taskType === 1) {
-    formData.value.doCycle = 0
+    nextItem.taskTypeList = [
-    formData.value.cycleNumber = 0
+      { label: '取放货', value: 1 },
-
+      { label: '移动', value: 4 },
-    if (item.taskType === 2) {
+      { label: '仅取货', value: 5 }
-      formData.value.montageTask = 0
+    ]
-      formData.value.montageNumber = 1
+  } else if (item.taskType === 2) {
-      formData.value.taskDetailList = formData.value.taskDetailList.slice(0, 1)
+    formData.value.taskDetailList = formData.value.taskDetailList.slice(0, index + 1)
-      message.warning('任务1为停车不可拼接任务')
+    formData.value.montageNumber = formData.value.taskDetailList.length
-    }
+  } else if (item.taskType === 3) {
-    if (item.taskType === 3) {
+    formData.value.taskDetailList = formData.value.taskDetailList.slice(0, index + 1)
-      formData.value.montageTask = 0
+    formData.value.montageNumber = formData.value.taskDetailList.length
-      formData.value.montageNumber = 1
+  } else if (item.taskType === 4) {
-      formData.value.taskDetailList = formData.value.taskDetailList.slice(0, 1)
+    nextItem.taskTypeList = [
-      message.warning('任务1为充电不可拼接任务')
+      { label: '取放货', value: 1 },
-    }
+      { label: '移动', value: 4 },
-  } else {
+      { label: '仅取货', value: 5 }
-    //先判断前一个是什么
+    ]
-    if (lastItem.taskType === 1) {
+  } else if (item.taskType === 5) {
-      if (item.taskType === 2) {
+    nextItem.taskTypeList = [
-        message.warning('取放货后不可连接停车')
+      { label: '移动', value: 4 },
-        item.taskType = undefined
+      { label: '仅放货', value: 6 }
-        return
+    ]
-      }
+  } else if (item.taskType === 6) {
-      if (item.taskType === 3) {
+    nextItem.taskTypeList = [
-        message.warning('取放货后不可连接充电')
+      { label: '取放货', value: 1 },
-        item.taskType = undefined
+      { label: '移动', value: 4 },
-        return
+      { label: '仅取货', value: 5 }
-      }
+    ]
-      if (item.taskType === 6) {
-        message.warning('取放货后不可连接仅放货')
-        item.taskType = undefined
-        return
-      }
-      if (item.taskType === 7) {
-        message.warning('取放货后不可连接扫描码')
-        item.taskType = undefined
-        return
-      }
-      if (item.taskType === 8) {
-        message.warning('取放货后不可连接检测托盘类型')
-        item.taskType = undefined
-        return
-      }
-    } else if (lastItem.taskType === 2) {
-      //不能拼接任务
-    } else if (lastItem.taskType === 3) {
-      //不能拼接任务
-    } else if (lastItem.taskType === 4) {
-      if (item.taskType === 2) {
-        message.warning('移动后不可连接停车')
-        item.taskType = undefined
-        return
-      }
-      if (item.taskType === 3) {
-        message.warning('移动后不可连接充电')
-        item.taskType = undefined
-        return
-      }
-      if (item.taskType === 6) {
-        message.warning('移动后不可连接仅放货')
-        item.taskType = undefined
-        return
-      }
-    } else if (lastItem.taskType === 5) {
-      if (item.taskType === 1) {
-        message.warning('仅取货后不可连接取放货')
-        item.taskType = undefined
-        return
-      }
-      if (item.taskType === 2) {
-        message.warning('仅取货后不可连接停车')
-        item.taskType = undefined
-        return
-      }
-      if (item.taskType === 3) {
-        message.warning('仅取货后不可连接充电')
-        item.taskType = undefined
-        return
-      }
-      if (item.taskType === 5) {
-        message.warning('仅取货后不可连接仅取货')
-        item.taskType = undefined
-        return
-      }
-      if (item.taskType === 7) {
-        message.warning('仅取货后不可连接扫描码')
-        item.taskType = undefined
-        return
-      }
-      if (item.taskType === 8) {
-        message.warning('仅取货后不可连接检测托盘类型')
-        item.taskType = undefined
-        return
-      }
-    } else if (lastItem.taskType === 6) {
-      if (item.taskType === 2) {
-        message.warning('仅放货后不可连接停车')
-        item.taskType = undefined
-        return
-      }
-      if (item.taskType === 3) {
-        message.warning('仅放货后不可连接充电')
-        item.taskType = undefined
-        return
-      }
-      if (item.taskType === 6) {
-        message.warning('仅放货后不可连接仅放货')
-        item.taskType = undefined
-        return
-      }
-      if (item.taskType === 7) {
-        message.warning('仅放货后不可连接扫描码')
-        item.taskType = undefined
-        return
-      }
-    } else if (lastItem.taskType === 7) {
-      if (item.taskType === 2) {
-        message.warning('扫描码后不可连接停车')
-        item.taskType = undefined
-        return
-      }
-      if (item.taskType === 3) {
-        message.warning('扫描码后不可连接充电')
-        item.taskType = undefined
-        return
-      }
-      if (item.taskType === 6) {
-        message.warning('扫描码后不可连接仅放货')
-        item.taskType = undefined
-        return
-      }
-      if (item.taskType === 7) {
-        message.warning('扫描码后不可连接扫描码')
-        item.taskType = undefined
-        return
-      }
-    } else if (lastItem.taskType === 8) {
-      if (item.taskType === 2) {
-        message.warning('检测托盘类型后不可连接停车')
-        item.taskType = undefined
-        return
-      }
-      if (item.taskType === 3) {
-        message.warning('检测托盘类型后不可连接充电')
-        item.taskType = undefined
-        return
-      }
-      if (item.taskType === 6) {
-        message.warning('检测托盘类型后不可连接仅放货')
-        item.taskType = undefined
-        return
-      }
-    }
   }
 }
 
 //搬空区域改变
 const doMoveAllChange = (e) => {
-  if (e === 1) {
+  return new Promise((resolve, reject) => {
-    formData.value.taskDetailList.forEach((item) => {
+    if (formData.value.doMoveAll === 1) {
-      item.taskType = 1
+      resolve(true)
-    })
+    } else {
-  }
+      try {
+        ElMessageBox.confirm('开启搬空所选线库/区域，任务类型只能选择取放货，是否切换?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(async () => {
+            resolve(true)
+            formData.value.taskDetailList = formData.value.taskDetailList.filter((item) => {
+              return item.taskType === 1
+            })
+            formData.value.montageNumber = formData.value.taskDetailList.length //拼接任务数量
+          })
+          .catch(() => {
+            ElMessage({
+              type: 'info',
+              message: '取消成功'
+            })
+            reject(false)
+          })
+      } catch (err) {
+        reject(false)
+      }
+    }
+  })
+  // if (e === 1) {
+  //   formData.value.taskDetailList.forEach((item) => {
+  //     item.taskType = 1
+  //   })
+  // }
 }
 
 //拼接的任务数量改变
 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 //所选车辆电量(充电模式)
+        electricity: undefined, //所选车辆电量(充电模式)
+        taskTypeList: taskTypeList
       })
     }
   } else {
@@ -1088,7 +1031,7 @@ const doCycleChange = () => {
       resolve(true)
     } else {
       try {
-        ElMessageBox.confirm('开启循环任务任务类型只能选择取放货，是否切换?', '提示', {
+        ElMessageBox.confirm('开启循环任务，任务类型只能选择取放货，是否切换?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'

src/views/mapPage/taskManagement/taskList.vue

@@ -290,7 +290,7 @@ const cancelTask = async (mainItem, item) => {
 //人工完成
 const finishTask = async (mainItem, item) => {
   try {
-    await message.delConfirm('请确认是否取消所有任务？')
+    await message.delConfirm('请确认是否人工完成任务？')
     await MapTaskAPi.updateTask({
       id: mainItem.id,
       priority: mainItem.priority,