From 2d00b3511ec42a9919eabb6ee48d2d63a5e4efa3 Mon Sep 17 00:00:00 2001
From: guoapeng <GuoAnPeng@163.com>
Date: Wed, 21 May 2025 14:45:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=B8=A9=E5=BA=A6=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/home/SetTemperature/index.vue | 18 +++++++++---------
 src/layouts/default.vue                      | 15 +++++++++++++--
 src/views/home/index.vue                     | 21 ++++++++++++++-------
 3 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/src/components/home/SetTemperature/index.vue b/src/components/home/SetTemperature/index.vue
index 5308583..467195d 100644
--- a/src/components/home/SetTemperature/index.vue
+++ b/src/components/home/SetTemperature/index.vue
@@ -3,22 +3,19 @@ import { setTargetTemperature } from 'apis/home'
 import { getOreList } from 'apis/ore'
 import { FtMessage } from 'libs/message'
 import { useSystemStore } from 'stores/systemStore'
-import { onMounted, ref } from 'vue'
+import { inject, onMounted, ref } from 'vue'
 
-const props = defineProps({
-  id: {
-    type: String,
-    default: 'heat_module_01',
-  },
-})
 const emits = defineEmits(['ok', 'cancel'])
 
+const data = inject('currentTemperatureData')
+console.log(data)
+
 onMounted(() => {
   getOres()
 })
 
 const form = ref({
-  temperature: useSystemStore().systemStatus.heatModule.find(item => item.moduleCode === props.id)?.targetTemperature,
+  temperature: useSystemStore().systemStatus.heatModule.find(item => item.moduleCode === data.value.id)?.targetTemperature,
 })
 const formRef = ref()
 
@@ -48,7 +45,7 @@ const okHandle = async () => {
     }
     await setTargetTemperature({
       ...form.value,
-      moduleCode: props.id,
+      moduleCode: data.value.id,
     })
     FtMessage.success('设置成功')
     emits('ok')
@@ -72,6 +69,9 @@ const getOres = async () => {
 <template>
   <FtDialog visible title="设置目标温度" width="40%" :ok-handle="okHandle" @cancel="cancel">
     <el-form ref="formRef" label-width="auto" :model="form" :rules="rules">
+      <el-form-item label="加热区">
+        <span>{{ data?.label }}</span>
+      </el-form-item>
       <el-form-item label="目标温度" prop="temperature">
         <el-input v-model.number="form.temperature" type="number" placeholder="请输入温度">
           <template #append>
diff --git a/src/layouts/default.vue b/src/layouts/default.vue
index c99920a..4354c11 100644
--- a/src/layouts/default.vue
+++ b/src/layouts/default.vue
@@ -2,6 +2,7 @@
 import logoutIcon from 'assets/images/logout.svg'
 import Check from 'components/check/index.vue'
 import Stop from 'components/home/Stop/index.vue'
+import { ElMessageBox } from 'element-plus'
 import { useActivateDebug } from 'hooks/useActivateDebug'
 import { isClose } from 'libs/socket'
 import { formatDateTime } from 'libs/utils'
@@ -21,9 +22,19 @@ const timeInterval = setInterval(() => {
   currentTime.value = formatDateTime()
 }, 1000)
 
-onMounted(() => {
+onMounted(async () => {
   if (!systemStore.systemStatus.selfTest && systemStore.systemStatus.currentUser?.username !== 'test') {
-    isCheck.value = true
+    ElMessageBox.confirm('设备转运机械臂x、y、z需进行初始化，请确认机械臂行进路径是否有杂物，夹爪是否正在夹取物品', '提示', {
+      confirmButtonText: '是',
+      cancelButtonText: '否',
+      showClose: false,
+      closeOnClickModal: false,
+      type: 'warning',
+    }).then(() => {
+
+    }).catch(() => {
+
+    })
   }
 })
 
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 4aad9ea..dcfd0ed 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -12,7 +12,7 @@ import { FtMessage } from 'libs/message'
 import { socket } from 'libs/socket'
 import { useHomeStore } from 'stores/homeStore'
 import { useSystemStore } from 'stores/systemStore'
-import { onMounted, onUnmounted, ref } from 'vue'
+import { onMounted, onUnmounted, provide, ref } from 'vue'
 
 const homeStore = useHomeStore()
 const systemStore = useSystemStore()
@@ -87,13 +87,20 @@ const executeCraftHandle = async () => {
 }
 
 const setTemperatureVisible = ref(false)
-const currentTemperatureId = ref('')
-const setTemperature = (id: string) => {
-  const craft = systemStore.systemStatus.tray?.find(item => item.heatModuleId === id)?.crafts
+const currentTemperatureData = ref<{ id: string, label: string | undefined }>({
+  id: '',
+  label: 'A-1',
+})
+provide('currentTemperatureData', currentTemperatureData)
+const setTemperature = (data: System.HeatArea) => {
+  const craft = systemStore.systemStatus.tray?.find(item => item.heatModuleId === data.moduleCode)?.crafts
   if (craft?.craft) {
     FtMessage.warning(`当前加热区已绑定工艺`)
   }
-  currentTemperatureId.value = id
+  currentTemperatureData.value = {
+    id: data.moduleCode,
+    label: homeStore.heatAreaList.find(item => item.value === data.moduleCode)?.label,
+  }
   setTemperatureVisible.value = true
 }
 
@@ -482,7 +489,7 @@ const take_photo = async () => {
     <el-row :gutter="10">
       <el-col :span="15">
         <div class="page-left">
-          <Tube v-for="(item, index) in systemStore.systemStatus.heatModule" :key="item.moduleCode" :data="item" @select-change="homeStore.selectChange(index)" @set-temperature="setTemperature" />
+          <Tube v-for="(item, index) in systemStore.systemStatus.heatModule" :key="item.moduleCode" :data="item" @select-change="homeStore.selectChange(index)" @set-temperature="setTemperature(item)" />
         </div>
       </el-col>
       <el-col :span="9">
@@ -603,7 +610,7 @@ const take_photo = async () => {
 
     <StartExperiment v-if="startVisible" @ok="startVisible = false" @cancel="startVisible = false" />
     <SelectCraft v-if="selectCraftVisible" @ok="selectCraftVisible = false" @cancel="selectCraftVisible = false" />
-    <SetTemperature v-if="setTemperatureVisible" :id="currentTemperatureId" @ok="setTemperatureVisible = false" @cancel="setTemperatureVisible = false" />
+    <SetTemperature v-if="setTemperatureVisible" @ok="setTemperatureVisible = false" @cancel="setTemperatureVisible = false" />
     <AddLiquid v-if="addLiquidVisible" @ok="addLiquidVisible = false" @cancel="addLiquidVisible = false" />
     <FillSolution v-if="fillSolutionVisible" @ok="fillSolutionVisible = false" @cancel="fillSolutionVisible = false" />
   </div>