diff --git a/.env.local b/.env.local index 78a5d223..2d26cfc9 100644 --- a/.env.local +++ b/.env.local @@ -4,9 +4,9 @@ NODE_ENV=development VITE_DEV=true # 请求路径 -VITE_BASE_URL='http://192.168.0.74:48080' +# VITE_BASE_URL='http://192.168.0.74:48080' # VITE_BASE_URL='http://192.168.0.153:48080' -# VITE_BASE_URL='http://192.168.0.45:48080' +VITE_BASE_URL='http://192.168.0.45:48080' # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持 S3 服务 VITE_UPLOAD_TYPE=server diff --git a/src/views/mapPage/realTimeMap/editMap.vue b/src/views/mapPage/realTimeMap/editMap.vue index 12da6666..6570d62a 100644 --- a/src/views/mapPage/realTimeMap/editMap.vue +++ b/src/views/mapPage/realTimeMap/editMap.vue @@ -825,6 +825,12 @@ const getSortNumLocationStyle = (item, index) => { } //库位的样式 const binLocationStyle = (item, index) => { + let laneId + let areaId + if (state.currentItemIndex !== -1) { + laneId = state.allMapPointInfo[state.currentItemIndex].laneId + areaId = state.allMapPointInfo[state.currentItemIndex].areaId + } return { verticalAlign: 'top', width: item.locationWidePx + 'px', @@ -834,7 +840,9 @@ const binLocationStyle = (item, index) => { ? '1px dashed #000' : state.noLocationNumberList.includes(index) ? '1px dashed red' - : 'none' + : (laneId && item.laneId === laneId) || (areaId && item.areaId === areaId) + ? '1px dashed #ff6a00' + : 'none' } } @@ -1368,7 +1376,7 @@ const state = reactive({ allMapPointInfo: [], //当前页面上的所有节点的列表 mapRouteList: [], //当前页面上所有路线的列表 currentIndex: 0, //当前处在哪条历史记录 - currentItemIndex: -1, //当前处在哪个工具 + currentItemIndex: -1, //当前处在哪个节点上 markForm: { macAddress: '', // mac地址 markProperty: '', //标记属性 @@ -2082,8 +2090,6 @@ const clickDrawSelectionArea = () => { //所以类型的 let routeList = state.drawSelectionPointList - console.log(routeList) - let isHaveId = binLocation.every((item) => { item.id }) @@ -2095,10 +2101,12 @@ const clickDrawSelectionArea = () => { message.warning('至少选择两个库位') return } + // if (!isStraightLine(binLocation)) { // message.warning('您选择的库位不在一条直线上') // return // } + let isHaveId = binLocation.every((item) => { return item.id }) @@ -2106,6 +2114,15 @@ const clickDrawSelectionArea = () => { message.warning('您选择的库位存在未保存的') return } + + //判断线库的排序是不是一样 + const locationNumbers = binLocation.map((item) => item.locationNumber) + const uniqueLocationNumbers = new Set(locationNumbers) + if (locationNumbers.length !== uniqueLocationNumbers.size) { + message.warning('您选择的库位的序号不能重复') + return + } + removeEventListener() //移除监听 lineLibrarySettingDialogRef.value.open(binLocation) }