Compare commits
11 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
7053fe9c14 | ||
![]() |
bd9d3fd2de | ||
![]() |
a2b5c7a33a | ||
![]() |
ef8975fcb7 | ||
![]() |
4950513ed4 | ||
![]() |
57dcdab406 | ||
![]() |
6035ddfae1 | ||
![]() |
2670a85f4e | ||
![]() |
9fe9d3eeb0 | ||
![]() |
6e13f318e5 | ||
![]() |
5fdd0f6cd1 |
@ -184,6 +184,7 @@ const queryParams = reactive({
|
|||||||
|
|
||||||
const activeName = ref('-1')
|
const activeName = ref('-1')
|
||||||
const handleClick = (tab, event) => {
|
const handleClick = (tab, event) => {
|
||||||
|
loading.value = true // 切换标签时显示loading
|
||||||
queryParams.deviceType = tab.props.name != -1 ? tab.props.name : undefined
|
queryParams.deviceType = tab.props.name != -1 ? tab.props.name : undefined
|
||||||
getCarList()
|
getCarList()
|
||||||
}
|
}
|
||||||
|
@ -297,6 +297,8 @@ const getAllNodeList = async () => {
|
|||||||
})
|
})
|
||||||
allMapPointInfo.value = []
|
allMapPointInfo.value = []
|
||||||
list.forEach((item) => {
|
list.forEach((item) => {
|
||||||
|
item.locationX = convertActualToBrowser(item.actualLocationX, item.actualLocationY).x
|
||||||
|
item.locationY = convertActualToBrowser(item.actualLocationX, item.actualLocationY).y
|
||||||
//只要库位
|
//只要库位
|
||||||
if (locationTypeNumber.value == 1 && item.type === 2) {
|
if (locationTypeNumber.value == 1 && item.type === 2) {
|
||||||
item.locationX = Number(item.locationX) * (imgBgObj.showWidth / imgBgObj.width)
|
item.locationX = Number(item.locationX) * (imgBgObj.showWidth / imgBgObj.width)
|
||||||
|
@ -608,7 +608,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<!-- 1 路径点和取放货点 -->
|
<!-- 1 路径点和取放货点 -->
|
||||||
<div
|
<div
|
||||||
v-if="item.type === 1 && item.layerSelectionShow"
|
v-if="(item.type === 1 || item.type === 8) && item.layerSelectionShow"
|
||||||
:style="{
|
:style="{
|
||||||
width: item.locationWidePx + 'px',
|
width: item.locationWidePx + 'px',
|
||||||
height: item.locationDeepPx + 'px',
|
height: item.locationDeepPx + 'px',
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
import indexPage from './components/indexPage.vue'
|
import indexPage from './components/indexPage.vue'
|
||||||
import createTaskDialog from './components/createTaskDialog.vue'
|
import createTaskDialog from './components/createTaskDialog.vue'
|
||||||
import { ref, defineComponent, reactive, nextTick, onMounted } from 'vue'
|
import { ref, defineComponent, reactive, nextTick, onMounted, watch } from 'vue'
|
||||||
import * as MapApi from '@/api/map/map'
|
import * as MapApi from '@/api/map/map'
|
||||||
import download from '@/utils/download'
|
import download from '@/utils/download'
|
||||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||||
|
@ -689,6 +689,7 @@
|
|||||||
import { reactive } from 'vue'
|
import { reactive } from 'vue'
|
||||||
import { RefreshRight, Position } from '@element-plus/icons-vue'
|
import { RefreshRight, Position } from '@element-plus/icons-vue'
|
||||||
import * as MapTaskAPi from '@/api/map/mapTask'
|
import * as MapTaskAPi from '@/api/map/mapTask'
|
||||||
|
import * as DeviceApi from '@/api/device/index'
|
||||||
import locationSelectionDialog from '../components/locationSelectionDialog.vue'
|
import locationSelectionDialog from '../components/locationSelectionDialog.vue'
|
||||||
|
|
||||||
defineOptions({ name: 'TaskManagementCreateTask' })
|
defineOptions({ name: 'TaskManagementCreateTask' })
|
||||||
@ -1217,7 +1218,7 @@ const locationSelectionDialogSuccess = (item) => {
|
|||||||
console.log(item)
|
console.log(item)
|
||||||
if (chooseLocationType.value == 'take') {
|
if (chooseLocationType.value == 'take') {
|
||||||
//取货
|
//取货
|
||||||
if (locationTypeNumber.value == 1) {
|
if (locationTypeNumber.value == 1 || locationTypeNumber.value == 4) {
|
||||||
// 1库位
|
// 1库位
|
||||||
takeRemoteMethod(item.locationNo, formData.value.taskDetailList[currentItemIndex.value])
|
takeRemoteMethod(item.locationNo, formData.value.taskDetailList[currentItemIndex.value])
|
||||||
formData.value.taskDetailList[currentItemIndex.value].takeId = item.id
|
formData.value.taskDetailList[currentItemIndex.value].takeId = item.id
|
||||||
@ -1236,7 +1237,7 @@ const locationSelectionDialogSuccess = (item) => {
|
|||||||
}
|
}
|
||||||
} else if (chooseLocationType.value == 'release') {
|
} else if (chooseLocationType.value == 'release') {
|
||||||
//放货
|
//放货
|
||||||
if (locationTypeNumber.value == 1) {
|
if (locationTypeNumber.value == 1 || locationTypeNumber.value == 4) {
|
||||||
// 1库位
|
// 1库位
|
||||||
releaseRemoteMethod(item.locationNo, formData.value.taskDetailList[currentItemIndex.value])
|
releaseRemoteMethod(item.locationNo, formData.value.taskDetailList[currentItemIndex.value])
|
||||||
formData.value.taskDetailList[currentItemIndex.value].releaseId = item.id
|
formData.value.taskDetailList[currentItemIndex.value].releaseId = item.id
|
||||||
|
Loading…
Reference in New Issue
Block a user