合并

.env.local

@@ -4,9 +4,9 @@ NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-# VITE_BASE_URL='http://10.10.7.132:48080'
+VITE_BASE_URL='http://10.10.7.132:48080'
 # VITE_BASE_URL='http://10.10.100.15:48080'
-VITE_BASE_URL='http://10.10.5.5:48080'
+# VITE_BASE_URL='http://10.10.5.5:48080'
 
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务
 VITE_UPLOAD_TYPE=server

src/views/board/device/index.vue

@@ -184,6 +184,7 @@ const queryParams = reactive({
 
 const activeName = ref('-1')
 const handleClick = (tab, event) => {
+  loading.value = true // 切换标签时显示loading
   queryParams.deviceType = tab.props.name != -1 ? tab.props.name : undefined
   getCarList()
 }

src/views/mapPage/realTimeMap/editMap.vue

@@ -608,7 +608,7 @@
                   </div>
                   <!-- 1 路径点和取放货点  -->
                   <div
-                    v-if="item.type === 1 && item.layerSelectionShow"
+                    v-if="(item.type === 1 || item.type === 8) && item.layerSelectionShow"
                     :style="{
                       width: item.locationWidePx + 'px',
                       height: item.locationDeepPx + 'px',

src/views/mapPage/realTimeMap/index.vue

@@ -34,7 +34,7 @@
 <script setup>
 import indexPage from './components/indexPage.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 download from '@/utils/download'
 import { ElMessage, ElMessageBox } from 'element-plus'

src/views/mapPage/taskManagement/createTask.vue

@@ -689,6 +689,7 @@
 import { reactive } from 'vue'
 import { RefreshRight, Position } from '@element-plus/icons-vue'
 import * as MapTaskAPi from '@/api/map/mapTask'
+import * as DeviceApi from '@/api/device/index'
 import locationSelectionDialog from '../components/locationSelectionDialog.vue'
 
 defineOptions({ name: 'TaskManagementCreateTask' })
@@ -1217,7 +1218,7 @@ const locationSelectionDialogSuccess = (item) => {
   console.log(item)
   if (chooseLocationType.value == 'take') {
     //取货
-    if (locationTypeNumber.value == 1) {
+    if (locationTypeNumber.value == 1 || locationTypeNumber.value == 4) {
       // 1库位
       takeRemoteMethod(item.locationNo, formData.value.taskDetailList[currentItemIndex.value])
       formData.value.taskDetailList[currentItemIndex.value].takeId = item.id
@@ -1236,7 +1237,7 @@ const locationSelectionDialogSuccess = (item) => {
     }
   } else if (chooseLocationType.value == 'release') {
     //放货
-    if (locationTypeNumber.value == 1) {
+    if (locationTypeNumber.value == 1 || locationTypeNumber.value == 4) {
       // 1库位
       releaseRemoteMethod(item.locationNo, formData.value.taskDetailList[currentItemIndex.value])
       formData.value.taskDetailList[currentItemIndex.value].releaseId = item.id