合并

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/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

@@ -1218,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
@@ -1237,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