SmartBench/CMVR-IOT-UI
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
lixiaolong 2026-08-04 17:29:32 +08:00
commit d55f95e7d3
5 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/api/device/flow.js → src/api/flow/flow.js
View File

2
src/views/flow/components/TestRun.vue
View File

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

2
src/views/flow/components/params/BasicNodeParams.vue
View File

@ -106,7 +106,7 @@ import { Plus, Minus } from '@element-plus/icons-vue'
import FormItemRecursive from '../FormItemRecursive.vue' import FormItemRecursive from '../FormItemRecursive.vue'
import { getInput } from '@/utils/flow' import { getInput } from '@/utils/flow'
import { useQuote } from './useQuote.js' 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' import { ElMessage } from 'element-plus'
const props = defineProps({ const props = defineProps({

2
src/views/flow/index.vue
View File

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

2
src/views/test/configs/index.vue
View File

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