From 1409823b9761dc3642cbaa0acdecfb6825b9a449 Mon Sep 17 00:00:00 2001 From: LiLongLong <13717757313@163.com> Date: Sun, 11 May 2025 17:44:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0XYZ=E5=9B=9E=E5=8E=9F?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apis/crafts.ts | 2 + src/assets/images/close-device.svg | 22 ++++ src/assets/images/init-device.svg | 23 ++++ src/assets/images/user-cancel.svg | 22 ++++ src/assets/images/user-logout.svg | 22 ++++ src/assets/images/x.svg | 1 + src/assets/images/y.svg | 1 + src/assets/images/z.svg | 1 + src/components/craft/AddCraftDialog.vue | 2 +- src/components/craft/CraftStatus.vue | 54 ++++++++-- src/components/craft/TransferRight.vue | 43 ++++++-- src/components/exit/index.vue | 184 ++++++++++++++++++++++++++++++++ src/layouts/default.vue | 34 ++---- src/types/craft.d.ts | 2 +- src/types/exit.d.ts | 12 +++ src/types/user.d.ts | 8 +- src/views/container/index.vue | 2 +- src/views/craft/index.vue | 9 +- src/views/user/index.vue | 153 ++++++++++++++++++-------- 19 files changed, 502 insertions(+), 95 deletions(-) create mode 100644 src/assets/images/close-device.svg create mode 100644 src/assets/images/init-device.svg create mode 100644 src/assets/images/user-cancel.svg create mode 100644 src/assets/images/user-logout.svg create mode 100644 src/assets/images/x.svg create mode 100644 src/assets/images/y.svg create mode 100644 src/assets/images/z.svg create mode 100644 src/components/exit/index.vue create mode 100644 src/types/exit.d.ts diff --git a/src/apis/crafts.ts b/src/apis/crafts.ts index 85080e6..89caeeb 100644 --- a/src/apis/crafts.ts +++ b/src/apis/crafts.ts @@ -18,6 +18,8 @@ export const delCraft = (ids: string): Promise => http.delete(`/crafts/${i // 开始执行工艺 export const startCraft = (params: { heatId: string }): Promise => http.post(`/crafts/start`, params) +export const stopCraft = (params: { heatId: string }): Promise => http.post(`/crafts/stop`, params) + // 加热区配置工艺 export const setCraft = (params: { heatId?: string | number, craftId?: string | number }): Promise => http.post(`/crafts/set`, params) diff --git a/src/assets/images/close-device.svg b/src/assets/images/close-device.svg new file mode 100644 index 0000000..8325ca5 --- /dev/null +++ b/src/assets/images/close-device.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/init-device.svg b/src/assets/images/init-device.svg new file mode 100644 index 0000000..e6cca36 --- /dev/null +++ b/src/assets/images/init-device.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/user-cancel.svg b/src/assets/images/user-cancel.svg new file mode 100644 index 0000000..0d642fa --- /dev/null +++ b/src/assets/images/user-cancel.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/user-logout.svg b/src/assets/images/user-logout.svg new file mode 100644 index 0000000..a070a8a --- /dev/null +++ b/src/assets/images/user-logout.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/x.svg b/src/assets/images/x.svg new file mode 100644 index 0000000..fb9ca10 --- /dev/null +++ b/src/assets/images/x.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/y.svg b/src/assets/images/y.svg new file mode 100644 index 0000000..f4c975e --- /dev/null +++ b/src/assets/images/y.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/z.svg b/src/assets/images/z.svg new file mode 100644 index 0000000..590709e --- /dev/null +++ b/src/assets/images/z.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/craft/AddCraftDialog.vue b/src/components/craft/AddCraftDialog.vue index 07bed27..f7b0f54 100644 --- a/src/components/craft/AddCraftDialog.vue +++ b/src/components/craft/AddCraftDialog.vue @@ -224,7 +224,7 @@ defineExpose({ 取消 - + 确定 diff --git a/src/components/craft/CraftStatus.vue b/src/components/craft/CraftStatus.vue index 6e4403a..a027804 100644 --- a/src/components/craft/CraftStatus.vue +++ b/src/components/craft/CraftStatus.vue @@ -1,5 +1,6 @@ diff --git a/src/layouts/default.vue b/src/layouts/default.vue index fffed23..86399d7 100644 --- a/src/layouts/default.vue +++ b/src/layouts/default.vue @@ -1,8 +1,6 @@ @@ -47,22 +44,12 @@ const logoutHandle = () => { {{ currentTime }}
- -
+
+
{{ systemStore.systemUser.username }}
- - +
@@ -75,7 +62,7 @@ const logoutHandle = () => { :class="{ 'aside-item-active': router.currentRoute.value.path.includes(item.path) }" @click="router.push(item.path)" > - + {{ item.meta!.title }} @@ -105,6 +92,7 @@ const logoutHandle = () => { + diff --git a/src/types/craft.d.ts b/src/types/craft.d.ts index 6170bdb..77c815d 100644 --- a/src/types/craft.d.ts +++ b/src/types/craft.d.ts @@ -36,7 +36,7 @@ declare namespace CraftTypes { interface StartHeatingStepStruct { method: 'startHeating' params: { - temperature: number, + temperature: number second: number } } diff --git a/src/types/exit.d.ts b/src/types/exit.d.ts new file mode 100644 index 0000000..4fdc6cd --- /dev/null +++ b/src/types/exit.d.ts @@ -0,0 +1,12 @@ +declare namespace Exit { + interface ExitModal { + openModal: () => void + } + + interface Axis { + name: string + icon: string + value: 'x' | 'y' | 'z' + color: string + } +} diff --git a/src/types/user.d.ts b/src/types/user.d.ts index 9f2c8cf..0ceac4f 100644 --- a/src/types/user.d.ts +++ b/src/types/user.d.ts @@ -1,14 +1,14 @@ declare namespace User { interface User { id: number - createTime: string - updateTime: string + createTime?: string + updateTime?: string username: string nickname: string - password: string | null + password?: string | null role: string deleted: string - fixedUser: string + fixedUser?: string } interface AddUser { diff --git a/src/views/container/index.vue b/src/views/container/index.vue index ef46af6..11e6010 100644 --- a/src/views/container/index.vue +++ b/src/views/container/index.vue @@ -52,7 +52,7 @@ const queryContainerList = () => { v-for="(item, index) in chemicalList" :key="index" :item-index="index" - :solutionItem="item" + :solution-item="item" @ok="queryContainerList" /> diff --git a/src/views/craft/index.vue b/src/views/craft/index.vue index f989ad0..566a342 100644 --- a/src/views/craft/index.vue +++ b/src/views/craft/index.vue @@ -39,13 +39,17 @@ const heatList = [{ id: 'heat_module_06', name: '加热区_06', }] + +const loading = ref(false) const queryCrafList = () => { const params = { oresId, } + loading.value = true getCraftList(params).then((res) => { - console.log('res---', res) tableData.value = res + }).catch(() => { + loading.value = false }) } @@ -124,7 +128,6 @@ const onStart = () => { heatId: heatId.value, } setCraft(params).then(() => { - console.log('配置成功==') startCraft({ heatId: heatId.value }).then(() => { console.log('开始执行') ElMessage.success('工艺已开始执行') @@ -143,7 +146,7 @@ const returnOre = () => {