From 94c83b44bcd922dff63ccff94f62ca33e17fc9d2 Mon Sep 17 00:00:00 2001
From: sige <sige@sige.com>
Date: Fri, 22 Mar 2024 09:07:09 +0800
Subject: [PATCH] ~

---
 src/web/src/pages/main/Page.vue                    |  2 ++
 .../main/contents/OperationTubeRackAcidAdd.vue     |  9 ++++++--
 .../pages/main/contents/OperationTubeRackAdd.vue   | 17 ++++++---------
 .../main/contents/OperationTubeRackTakeShot.vue    | 25 +++++++---------------
 4 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/src/web/src/pages/main/Page.vue b/src/web/src/pages/main/Page.vue
index 8f7d862..30284db 100644
--- a/src/web/src/pages/main/Page.vue
+++ b/src/web/src/pages/main/Page.vue
@@ -63,6 +63,7 @@
   <noti-handler-task-sample-add-tube-rack-put-in />
   <noti-handler-task-sample-add-tube-rack-status-confirm />
   <noti-handler-task-start-reset-error-tube-rack-take-out />
+  <noti-handler-task-sample-take-out-tube-rack />
 </template>
 <script setup>
 import { ref,onMounted, onUnmounted } from 'vue';
@@ -81,6 +82,7 @@ import NotiHandlerTaskStartResetErrorTubeRackPutIn from './contents/notification
 import NotiHandlerTaskSampleAddTubeRackPutIn from './contents/notification/TaskSampleAddTubeRackPutIn.vue';
 import NotiHandlerTaskSampleAddTubeRackStatusConfirm from './contents/notification/TaskSampleAddTubeRackStatusConfirm.vue';
 import NotiHandlerTaskStartResetErrorTubeRackTakeOut from './contents/notification/TaskStartResetErrorTubeRackTakeOut.vue';
+import NotiHandlerTaskSampleTakeOutTubeRack from './contents/notification/TaskSampleTakeOutTubeRack.vue';
 /** @var {AppStore} */
 const appStore = useAppStore();
 /** @var {Ref<string>} */
diff --git a/src/web/src/pages/main/contents/OperationTubeRackAcidAdd.vue b/src/web/src/pages/main/contents/OperationTubeRackAcidAdd.vue
index 61fbd61..0e34991 100644
--- a/src/web/src/pages/main/contents/OperationTubeRackAcidAdd.vue
+++ b/src/web/src/pages/main/contents/OperationTubeRackAcidAdd.vue
@@ -22,6 +22,7 @@
 <script setup>
 import ApiClient from '@/utils/ApiClient';
 import { ref } from 'vue';
+import { Modal } from 'ant-design-vue';
 /** @var {Object} */
 const props = defineProps({
     activeSlot: Object,
@@ -63,12 +64,16 @@ async function actionAcidAdd() {
 async function acidAddOk() {
     enable.value = false;
     let client = ApiClient.getClient();
-    await client.taskAppend('LiquidAdd',{
+    try {
+      await client.taskAppend('LiquidAdd',{
         slotIndex : props.activeSlot.index * 1,
         liquidType : acidAdd.value.liquidType,
         liquidVolume : acidAdd.value.liquidVolume * 1,
         shakeTimes : acidAdd.value.shakeTimes * 1,
-    });
+      });
+    } catch ( e ) {
+      Modal.error({title: '任务执行失败',content: e.message});
+    }
 }
 
 // 加酸取消
diff --git a/src/web/src/pages/main/contents/OperationTubeRackAdd.vue b/src/web/src/pages/main/contents/OperationTubeRackAdd.vue
index a4a44ad..ea814aa 100644
--- a/src/web/src/pages/main/contents/OperationTubeRackAdd.vue
+++ b/src/web/src/pages/main/contents/OperationTubeRackAdd.vue
@@ -10,25 +10,18 @@
     cancel-text="取消"
     @ok="actionOk"
   >
-    <a-form label-align="left" :label-col="{span:4}" :wrapper-col="{span:20}">
-      <a-form-item label="ID">
-        <a-input v-model:value="digestion.eid" />
-      </a-form-item>
-    </a-form>
+    <p>是否添加新的消解样本？</p>
   </a-modal>
 </template>
 <script setup>
 import { ref } from 'vue';
+import { Modal } from 'ant-design-vue';
 import ApiClient from '@/utils/ApiClient';
 /** @var {Boolean} */
 const enable = ref(false);
-/** @var {String} */
-const digestion = ref(null);
 
 // 添加样本
 function actionEnable() {
-    digestion.value = {};
-    digestion.value.eid = null;
     enable.value = true;
 }
 
@@ -36,6 +29,10 @@ function actionEnable() {
 async function actionOk() {
     enable.value = false;
     let client = ApiClient.getClient();
-    await client.taskAppend('SampleAdd', digestion.value);
+    try {
+        await client.taskAppend('SampleAdd');
+    } catch ( e ) {
+        Modal.error({title: '任务执行失败',content: e.message});
+    }
 }
 </script>
\ No newline at end of file
diff --git a/src/web/src/pages/main/contents/OperationTubeRackTakeShot.vue b/src/web/src/pages/main/contents/OperationTubeRackTakeShot.vue
index 6c4a186..e87382f 100644
--- a/src/web/src/pages/main/contents/OperationTubeRackTakeShot.vue
+++ b/src/web/src/pages/main/contents/OperationTubeRackTakeShot.vue
@@ -19,23 +19,14 @@ const appStore = useAppStore();
 
 // 移至观察区
 async function actionMoveToLiquidPlate() {
-    appStore.setCameraEnable(true);
-    let client = ApiClient.getClient();
-    let task = await client.taskAppend('SampleMoveToLiquidPlate',{
-        slotIndex : props.activeSlot.index * 1,
-    });
-    let taskId = task.id;
-
-    while( true ) {
-        task = await client.taskExecutionGet(taskId);
-        if ( 'ERROR' === task.status ) {
-            Modal.error({title: '失败', content: task.message});
-            break ;
-        } else if ( 'FINISHED' === task.status ) {
-            appStore.setCameraEnable(true);
-            break ;
-        }
-        await Common.delay(1000);
+    try {
+        appStore.setCameraEnable(true);
+        let client = ApiClient.getClient();
+        await client.taskAppend('SampleMoveToLiquidPlate',{
+            slotIndex : props.activeSlot.index * 1,
+        });
+    } catch ( e ) {
+        Modal.error({title: '任务执行失败',content: e.message});
     }
 }
 </script>
\ No newline at end of file