From 81a9e4484f1eb62bef475378b244146f3c44eda1 Mon Sep 17 00:00:00 2001
From: LiLongLong <13717757313@163.com>
Date: Tue, 18 Feb 2025 20:03:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=8A=A0=E7=83=AD=EF=BC=8C?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=8A=A0=E7=83=AD=E5=8C=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/services/task/index.ts                     |  0
 src/views/graphite/components/HeatPosition.vue |  4 +--
 src/views/graphite/components/mock.ts          |  5 +++
 src/views/graphite/index.vue                   | 44 ++++++++++++++++++++------
 vite.config.ts                                 |  2 +-
 5 files changed, 43 insertions(+), 12 deletions(-)
 create mode 100644 src/services/task/index.ts
 create mode 100644 src/views/graphite/components/mock.ts

diff --git a/src/services/task/index.ts b/src/services/task/index.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/views/graphite/components/HeatPosition.vue b/src/views/graphite/components/HeatPosition.vue
index 3a9e7a2..3a4cf70 100644
--- a/src/views/graphite/components/HeatPosition.vue
+++ b/src/views/graphite/components/HeatPosition.vue
@@ -210,13 +210,13 @@ const onHandleTube = (tubeInfo: any) => {
   border-radius: 0.5rem;
 
   .craft_executing_modal {
-    position: absolute;
+    position: relative;
     width: 10rem;
     height: 18rem;
     background: rgba(2, 86, 255, 0.12);
     opacity: 0.5;
     z-index: 9999;
-    margin-top: -2rem;
+    margin-top: -11rem;
     .loading {
       margin-left: 4.2rem;
       margin-top: 4rem;
diff --git a/src/views/graphite/components/mock.ts b/src/views/graphite/components/mock.ts
new file mode 100644
index 0000000..dc056af
--- /dev/null
+++ b/src/views/graphite/components/mock.ts
@@ -0,0 +1,5 @@
+export const graphiteMock = {
+
+    heatAreaStatus : [true, false,true, false,true, false],//加热区状态
+
+}
\ No newline at end of file
diff --git a/src/views/graphite/index.vue b/src/views/graphite/index.vue
index 164ab0a..6d636df 100644
--- a/src/views/graphite/index.vue
+++ b/src/views/graphite/index.vue
@@ -2,7 +2,7 @@
 	<div class="graphite_home component-page overflow-auto" id="heatArea">
 		<div class="heat_area" >
 			<div v-for="(item, index) in heatList" :key="item">
-				<HeatPosition :heatInfo="item" :tubeIndex="index + 1" @onSelectedTray="onSelectedTray"></HeatPosition>
+				<HeatPosition :heatInfo="{...item, index}" :tubeIndex="index + 1" @onSelectedTray="onSelectedTray"></HeatPosition>
 			</div>
 			<!--执行中状态的遮罩层-->
 		</div>
@@ -18,7 +18,7 @@
 				<van-button size="large" class="btn_size op_exec_craft">执行工艺</van-button>
 				<van-button size="large" class="btn_size op_add_liquid" @click="onAddLiquid">添加溶液</van-button>
 				<van-button size="large" class="btn_size op_shake_up">摇匀</van-button>
-				<van-button size="large" class="btn_size op_move_heat">移至加热</van-button>
+				<van-button size="large" class="btn_size op_move_heat" @click="onMoveToHeat">移至加热</van-button>
 				<van-button size="large" class="btn_size op_move_act">移至加液</van-button>
 				<van-button size="large" class="btn_size op_move_exception">移至特殊</van-button>
 				<van-button size="large" class="btn_size op_start_heat">开始加热</van-button>
@@ -40,24 +40,30 @@
 </template>
 <script lang="ts" setup>
 import { ref, onMounted } from "vue";
+import { ElMessage } from "element-plus";
 import { HeatPosition, TakePickture, AddLiquid } from "./components";
 import OverlayModal from "@/components/OverlayModal.vue";
 import CraftList from "@/views/graphite/components/CraftList.vue";
+import { graphiteMock } from './components/mock'
+import { useStatusStore } from "@/stores/status";
+import { getConfig } from "@/services/sysConfig/sysConfig";
+import { useSettingStore } from "@/stores/setting";
+const settingStore = useSettingStore();
+console.log('settingStore---', settingStore.heatAreaConfig)
+
+//设备的全局状态
+const useStatus = useStatusStore()
 const heatList: any = ref([]);
 const craftVisible = ref(false);
 const tubeRackList = ['A-1','A-2', 'A-3','A-4','A-5','A-5']
 onMounted(() => {
-	for(let i = 0; i < 6; i++){
-		heatList.value.push({
-			id: i + 1,
-			state:i == 0 ? 1 : null,
-			name: tubeRackList[i]
-		});
-	}
+	//6个加热区数据
+	heatList.value = settingStore.heatAreaConfig
 
 });
 //选择的托盘
 const selectedTrayList = ref<any>([]);
+const currentIndex = ref();
 const selectedTrayObj:any = {}
 const onSelectedTray = (data:any) => {
 	if(selectedTrayObj[data.id]){
@@ -82,6 +88,26 @@ const changeVisible = () => {
 const onChooseCaft = () => {
 	craftVisible.value = true;
 };
+
+//移至加热
+const onMoveToHeat = () => {
+	//1、是否选择了加热区，且只能选择一个加热区
+	if(selectedTrayList.value.length != 1){
+		ElMessage.error('只能选择一个加热区')
+		return;
+	}
+	let selectedData = selectedTrayList.value[0]
+
+	//2、判断加液区是否有试管
+	let heatAearStatus:any = useStatus.status || graphiteMock.heatAreaStatus
+	if(!heatAearStatus[selectedData.index]){
+		ElMessage.error('选择的加热区已有试管架，重新选择加热区')
+		return;
+	}
+	//调用移至加热接口
+
+
+}
 </script>
 <style lang="scss" scoped>
 @use "@/assets/style/mixin.scss" as *;
diff --git a/vite.config.ts b/vite.config.ts
index 11f87f0..ad98a7a 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -18,7 +18,7 @@ export default defineConfig({
 		port: 5174,
 		proxy: {
 			'/api': {
-			  target: 'http://192.168.1.200:8080',
+			  target: 'http://192.168.1.119:8080',
 			  changeOrigin: true,
 			  // rewrite: (path) => path.replace(/^\/api/, ''),
 			},