Merge remote-tracking branch 'origin/lxl-dev' into lxl-dev

src/views/flow/components/TestRun.vue

@@ -63,7 +63,7 @@
 import { ref, watch } from 'vue'
 import { getStartNodeFormData, formatTableData } from '@/utils/flow'
 // import { Plus, Minus } from '@element-plus/icons-vue'
-import { flowExecuteTrial } from '@/api/device/flow'
+import { flowExecuteTrial } from '@/api/flow/flow'
 import { emitter } from '@/utils/eventBus';
 import { ElMessage } from 'element-plus';
 import { getRobotList } from '@/api/inspection/robot'

src/views/flow/components/params/BasicNodeParams.vue

@@ -106,7 +106,7 @@ import { Plus, Minus } from '@element-plus/icons-vue'
 import FormItemRecursive from '../FormItemRecursive.vue'
 import { getInput } from '@/utils/flow'
 import { useQuote } from './useQuote.js'
-import { getArmStatus, getArmJointState, getAgvStatus, getAgvStations } from '@/api/device/flow'
+import { getArmStatus, getArmJointState, getAgvStatus, getAgvStations } from '@/api/flow/flow'
 import { ElMessage } from 'element-plus'
 
 const props = defineProps({

src/views/flow/index.vue

@@ -267,7 +267,7 @@ import {
   flowStop,
   flowAction,
   getAgvStations,
-} from "@/api/device/flow";
+} from "@/api/flow/flow";
 import { getDetect } from "@/api/test/detect";
 import { getRobotList } from '@/api/inspection/robot'
 import {

src/views/test/configs/index.vue

@@ -343,7 +343,7 @@ import {
   updateConfig,
 } from "@/api/test/config";
 
-import { flowExecute } from "@/api/device/flow";
+import { flowExecute } from "@/api/flow/flow";
 import TableSearch from "@/components/TableSearch/index.vue";
 import draggable from "vuedraggable";
 import { listDetect } from "@/api/test/detect.js";