diff --git a/src/components/spray/sprayParams/index.vue b/src/components/spray/sprayParams/index.vue index 7b701da..36d5594 100644 --- a/src/components/spray/sprayParams/index.vue +++ b/src/components/spray/sprayParams/index.vue @@ -162,12 +162,14 @@ const handleTabsEdit = (targetName: TabPaneName | undefined, action: 'remove' | } const matrixCraftChange = async (id: number) => { + loading.value = true form.value = await getCraftById(id) console.log(form.value) await nextTick(() => { form.value.times?.forEach((item: any, index: number) => { sprayRefs.value[index].updateSelection(item.x1 * 5, item.y1 * 5, (item.x2 - item.x1) * 5, (item.y2 - item.y1) * 5) }) + loading.value = false }) } @@ -348,7 +350,7 @@ const matrixCraftChange = async (id: number) => { 确认 - + 确认并更新工艺 diff --git a/src/views/log/index.vue b/src/views/log/index.vue index f51c4b3..a5564f3 100644 --- a/src/views/log/index.vue +++ b/src/views/log/index.vue @@ -3,10 +3,8 @@ import type { logQuery } from 'apis/log' import { del, list } from 'apis/log' import { list as matrixList } from 'apis/matrix' import { list as matrixCraftList } from 'apis/matrixCraft' -import route3 from 'assets/images/route.png' -import route2 from 'assets/images/route_horizontal.png' -import route1 from 'assets/images/route_vertical.png' import FtButton from 'components/common/FTButton/index.vue' +import SprayParams from 'components/spray/sprayParams/index.vue' import { ElMessageBox } from 'element-plus' import { FtMessage } from 'libs/message' import { onMounted, ref } from 'vue' @@ -74,6 +72,13 @@ const delHandle = async () => { await getList() }) } +const selectCraftVisible = ref(false) + +const currentFormData = ref({}) +const viewParams = (row: any) => { + currentFormData.value = row + selectCraftVisible.value = true +} - + - - - - - - - - - - + + - - - - - - - - - - - - - +