From 0a79537efcc18ba5187ec8e07d88a55409353c76 Mon Sep 17 00:00:00 2001
From: LiLongLong <13717757313@163.com>
Date: Tue, 25 Feb 2025 21:41:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=81=9C=E6=AD=A2=E6=89=A7=E8=A1=8C=E5=B7=A5?=
 =?UTF-8?q?=E8=89=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/services/ore/oreManage.ts                  |  6 +-
 src/services/txn.ts                            |  2 +-
 src/views/graphite/components/HeatPosition.vue |  2 +-
 src/views/graphite/index.vue                   | 84 ++++++++++++++++++--------
 4 files changed, 66 insertions(+), 28 deletions(-)

diff --git a/src/services/ore/oreManage.ts b/src/services/ore/oreManage.ts
index 92186d0..bc86a63 100644
--- a/src/services/ore/oreManage.ts
+++ b/src/services/ore/oreManage.ts
@@ -44,4 +44,8 @@ export function craftStart(params:any) {
 
 export function craftStop(params:any) {
 	return httpRequest<BaseResponse>({ url: `/api/crafts/stop`, method: "POST", params  });
-}
\ No newline at end of file
+}
+
+export function craftPause(params:any) {
+	return httpRequest<BaseResponse>({ url: `/api/crafts/pause`, method: "POST", params  });
+}
diff --git a/src/services/txn.ts b/src/services/txn.ts
index ebfa268..8708abf 100644
--- a/src/services/txn.ts
+++ b/src/services/txn.ts
@@ -63,7 +63,7 @@ export function getTxnRecord(txn: string, category: TxnRecord["category"]) {
 export function peekTxnRecord(txn: string, category: TxnRecord["category"]) {
 	const record = txnCmdMap[txn];
 	// 只有属于指定category时，才返回，且返回后删除记录，节约内存
-	if (record.category === category) {
+	if (record && record.category === category) {
 		return record;
 	}
 	return undefined;
diff --git a/src/views/graphite/components/HeatPosition.vue b/src/views/graphite/components/HeatPosition.vue
index 6d7d3db..b2175c9 100644
--- a/src/views/graphite/components/HeatPosition.vue
+++ b/src/views/graphite/components/HeatPosition.vue
@@ -39,7 +39,7 @@
       <div class="heat_temperature" @click="setTemperature">
         <template v-if="trayInfo?.id">
           <div class="target_temp">目标温度: {{ trayInfo.temperature }}℃</div>
-          <div class="heating" :style="{color:temperature_color}">{{ trayInfo.heatAearStatus.isHeating ? '加热中' : '未加热' }}</div>
+          <div class="heating" :style="{color:temperature_color}">{{ trayInfo.heatAearStatus?.isHeating ? '加热中' : '未加热' }}</div>
         </template>
         <template v-else>
           <div class="target_temp set_temp">设置目标温度</div>
diff --git a/src/views/graphite/index.vue b/src/views/graphite/index.vue
index e8ec7cc..1aa543d 100644
--- a/src/views/graphite/index.vue
+++ b/src/views/graphite/index.vue
@@ -110,7 +110,7 @@ import { injectFluid } from "@/services/task/task";
 import { setOnGoingStatus, useStatusStore } from "@/stores/status";
 import { getIngTask, saveTaskName, stopTask } from "@/services/task/task";
 import { CmdDescMap, taskCmd, type OperationCmd } from "@/services/globalCmd/globalCmd";
-import { craftStart, craftStop } from "@/services/ore/oreManage";
+import { craftStart, craftStop, craftPause } from "@/services/ore/oreManage";
 import { getTxnRecord } from "@/services/txn";
 import { useSettingStore } from "@/stores/setting";
 import { useCraftStore } from "@/stores/craft";
@@ -123,12 +123,24 @@ const craftName = ref("选择工艺");
 const exeCraftName = ref("执行工艺");
 watch(
 	() => craftStore.craftInfo,
-	newVal => {
-		craftInfo.value = newVal;
-		if (newVal?.status == 1) {
-			craftName.value = "暂停工艺";
-			exeCraftName.value = "停止工艺";
-		}
+	(newVal, oldVal) => {
+    if(newVal){
+      heatList.value.forEach((item:any) => {
+        if(item.id == newVal?.heatId){
+          item.craftInfo.status = newVal?.status
+          if(newVal?.status == 3){//停止执行
+            item.executing_craft = false;
+            craftName.value = "选择工艺";
+            exeCraftName.value = "执行工艺";
+          }else if(item.executing_craft){//正在执行
+            if (newVal?.status == 1 && item.isSelect) {
+              craftName.value = "暂停工艺";
+              exeCraftName.value = "停止工艺";
+            }
+          }
+        }
+      });
+    }
 	}
 );
 //设备的全局状态
@@ -164,6 +176,7 @@ onMounted(() => {
     if(!globeStatus){//为了只输入一行，不想后台一直打印此处日志 TODO
       console.log('globeStatus====', data)
     }
+    
     globeStatus = 1;
     if (data.type === "cmd") {
       const cmdInfo = getTxnRecord(data.data.commandId, "task");
@@ -171,7 +184,6 @@ onMounted(() => {
         const command:any = cmdInfo.command;
         //@ts-ignore
         const cmdName = CmdDescMap[command];
-        console.log('data.data--', data.data)
         const result = data.data.success
           ? "执行完毕"
           : `执行失败 ${data.data.message}`;
@@ -200,29 +212,37 @@ const onSelectedTray = (heatAreaItem: any, type: string) => {
 		//点击加热区
 		if (ids.includes(heatAreaItem.id)) {
 			heatAreaItem.isSelect = false;
+      
 			selectedTrayList.value = selectedTrayList.value.filter((selectedItem: any) => selectedItem.id != heatAreaItem.id);
 		} else {
 			heatAreaItem.isSelect = true;
 			selectedTrayList.value.push(heatAreaItem);
 		}
+    onHeadleCraft(heatAreaItem);
 	} else {
 		heatAreaItem.isSelect = true;
 	}
-	heatList.value.forEach((item: any) => {
-		if (item.id == heatAreaItem.id) {
-			item = heatAreaItem;
-			onHeadleCraft(item);
-		}
-	});
-	console.log("hasCraftInfo---", hasCraftInfo.value);
+  
+	// heatList.value.forEach((item: any) => {
+	// 	if (item.id == heatAreaItem.id) {
+	// 		item = heatAreaItem;
+			
+	// 	}
+	// });
 };
 
 //选择的加热区是否选择了工艺
 let hasCraftInfo = ref(false);
 const onHeadleCraft = (areaItem: any) => {
-	if (areaItem.craftInfo) {
+	if (areaItem.executing_craft && areaItem.isSelect) {
 		hasCraftInfo.value = true;
-	}
+    craftName.value = "暂停工艺";
+    exeCraftName.value = "停止工艺";
+	}else{
+    hasCraftInfo.value = false;
+    craftName.value = "选择工艺";
+    exeCraftName.value = "执行工艺";
+  }
 };
 
 //设置加热区温度
@@ -247,6 +267,7 @@ const onCraftStart = () => {
 	//可能会选择多个加热区执行工艺， 批量发送指令
 	let hasCraft = true;
 	let len = selectedTrayList.value.length;
+  console.log('selectedTrayList---', selectedTrayList.value)
 	for (let i = 0; i < len; i++) {
 		let item = selectedTrayList.value[i];
 		if (!item.craftInfo) {
@@ -258,11 +279,10 @@ const onCraftStart = () => {
 			craftId: null,
 			heatId: item.id,
 		};
-		if (craftInfo.value?.status == 1) {
+		if (item.craftInfo.status == 1) {
 			craftStop(params).then(res => {
 				ElMessage.success("已停止执行工艺的指令");
 			});
-			return;
 		} else {
 			params.craftId = item.craftInfo.id;
 			craftStart(params).then(res => {
@@ -336,12 +356,26 @@ const changeVisible = () => {
 
 //选择工艺
 const onChooseCaft = () => {
-	//1、是否选择了加热区
-	if (!selectedTrayList.value.length) {
-		ElMessage.error("请选择目标加热区");
-		return;
-	}
-	craftVisible.value = true;
+  //判断是选择工艺还是暂停工艺
+  let isPause = false
+  selectedTrayList.value.forEach((item:any) => {
+    //有工艺且正在执行可操作【暂停】
+    if(item.craftInfo && item.craftInfo.status == 1){
+      craftPause({heatId:item.id}).then(res => {
+        ElMessage.success('暂停指令已发送')
+      })
+      isPause = true;
+    }
+  })
+  if(!isPause){
+    //1、是否选择了加热区
+    if (!selectedTrayList.value.length) {
+      ElMessage.error("请选择目标加热区");
+      return;
+    }
+    craftVisible.value = true;
+  }
+	
 };
 
 //选择的工艺