From 7e685f47ccd6c51afc05dd494b9e091da09eab2e Mon Sep 17 00:00:00 2001
From: sige <sige@sige.com>
Date: Thu, 22 Feb 2024 17:02:13 +0800
Subject: [PATCH] q

---
 .../src/pages/main/contents/OperationSampleAdd.vue | 66 ----------------------
 .../pages/main/contents/OperationTubeRackAdd.vue   | 66 ++++++++++++++++++++++
 .../main/contents/OperationTubeRackTakeOut.vue     | 60 ++++++++++++++++++++
 3 files changed, 126 insertions(+), 66 deletions(-)
 delete mode 100644 src/web/src/pages/main/contents/OperationSampleAdd.vue
 create mode 100644 src/web/src/pages/main/contents/OperationTubeRackAdd.vue
 create mode 100644 src/web/src/pages/main/contents/OperationTubeRackTakeOut.vue

diff --git a/src/web/src/pages/main/contents/OperationSampleAdd.vue b/src/web/src/pages/main/contents/OperationSampleAdd.vue
deleted file mode 100644
index 9a6e4f7..0000000
--- a/src/web/src/pages/main/contents/OperationSampleAdd.vue
+++ /dev/null
@@ -1,66 +0,0 @@
-<template>
-  <a-popconfirm title="是否添加样本？" ok-text="确认" cancel-text="取消" @confirm="actionAdd">
-    <a-button class="ml-1" 
-      style="background: transparent;border: solid 1px #becfe7;color: #7c92b1;"
-    ><PlusCircleOutlined /></a-button>
-  </a-popconfirm>
-  
-  <!-- 添加样品弹框 -->
-  <a-modal v-if="puttingConfirmEnable" v-model:open="puttingConfirmEnable" 
-    title="添加样本" 
-    ok-text="确认" 
-    cancel-text="取消"
-    @ok="actionOk" 
-    @cancel="actionSampleAddCancel" 
-  >
-    <p>放入样本后点击确认完成添加</p>
-  </a-modal>
-</template>
-<script setup>
-import ApiClient from '@/utils/ApiClient';
-import { nextTick, ref } from 'vue';
-import { Modal } from 'ant-design-vue';
-import Common from '@/utils/Common';
-/** @var {Object} */
-const puttingConfirmEnable = ref(false);
-/** @var {String} */
-let taskId = null;
-
-// 样本添加
-function actionAdd() {
-    nextTick(async () => {
-        let client = ApiClient.getClient();
-        let response = await client.taskAppend('SampleAdd');
-        taskId = response.id;
-
-        do {
-            let task = await client.taskExecutionGet(taskId);
-            if ( 'RUNNING' === task.status ) {
-                if ( 'WAIT_FOR_PUTTING_CONFIRM' === task.runtimeStatus ) {
-                    puttingConfirmEnable.value = true;
-                }
-            } else if ( 'ERROR' === task.status ) {
-                Modal.error({title: '添加失败', content: task.message});
-                break ;
-            } else if ( 'FINISHED' === task.status ) {
-                break ;
-            }
-            await Common.delay(1000);
-        } while( true );
-    });
-}
-
-// 样本添加完成
-async function actionOk() {
-    let client = ApiClient.getClient();
-    await client.taskActionExecute(taskId, 'done');
-    puttingConfirmEnable.value = false;
-}
-
-// 样本添加取消
-async function actionSampleAddCancel() {
-    let client = ApiClient.getClient();
-    await client.taskActionExecute(taskId, 'cancel');
-    puttingConfirmEnable.value = false;
-}
-</script>
\ No newline at end of file
diff --git a/src/web/src/pages/main/contents/OperationTubeRackAdd.vue b/src/web/src/pages/main/contents/OperationTubeRackAdd.vue
new file mode 100644
index 0000000..9a6e4f7
--- /dev/null
+++ b/src/web/src/pages/main/contents/OperationTubeRackAdd.vue
@@ -0,0 +1,66 @@
+<template>
+  <a-popconfirm title="是否添加样本？" ok-text="确认" cancel-text="取消" @confirm="actionAdd">
+    <a-button class="ml-1" 
+      style="background: transparent;border: solid 1px #becfe7;color: #7c92b1;"
+    ><PlusCircleOutlined /></a-button>
+  </a-popconfirm>
+  
+  <!-- 添加样品弹框 -->
+  <a-modal v-if="puttingConfirmEnable" v-model:open="puttingConfirmEnable" 
+    title="添加样本" 
+    ok-text="确认" 
+    cancel-text="取消"
+    @ok="actionOk" 
+    @cancel="actionSampleAddCancel" 
+  >
+    <p>放入样本后点击确认完成添加</p>
+  </a-modal>
+</template>
+<script setup>
+import ApiClient from '@/utils/ApiClient';
+import { nextTick, ref } from 'vue';
+import { Modal } from 'ant-design-vue';
+import Common from '@/utils/Common';
+/** @var {Object} */
+const puttingConfirmEnable = ref(false);
+/** @var {String} */
+let taskId = null;
+
+// 样本添加
+function actionAdd() {
+    nextTick(async () => {
+        let client = ApiClient.getClient();
+        let response = await client.taskAppend('SampleAdd');
+        taskId = response.id;
+
+        do {
+            let task = await client.taskExecutionGet(taskId);
+            if ( 'RUNNING' === task.status ) {
+                if ( 'WAIT_FOR_PUTTING_CONFIRM' === task.runtimeStatus ) {
+                    puttingConfirmEnable.value = true;
+                }
+            } else if ( 'ERROR' === task.status ) {
+                Modal.error({title: '添加失败', content: task.message});
+                break ;
+            } else if ( 'FINISHED' === task.status ) {
+                break ;
+            }
+            await Common.delay(1000);
+        } while( true );
+    });
+}
+
+// 样本添加完成
+async function actionOk() {
+    let client = ApiClient.getClient();
+    await client.taskActionExecute(taskId, 'done');
+    puttingConfirmEnable.value = false;
+}
+
+// 样本添加取消
+async function actionSampleAddCancel() {
+    let client = ApiClient.getClient();
+    await client.taskActionExecute(taskId, 'cancel');
+    puttingConfirmEnable.value = false;
+}
+</script>
\ No newline at end of file
diff --git a/src/web/src/pages/main/contents/OperationTubeRackTakeOut.vue b/src/web/src/pages/main/contents/OperationTubeRackTakeOut.vue
new file mode 100644
index 0000000..ffa25a7
--- /dev/null
+++ b/src/web/src/pages/main/contents/OperationTubeRackTakeOut.vue
@@ -0,0 +1,60 @@
+<template>
+  <a-popconfirm title="是否取出样本？" ok-text="确认" cancel-text="取消" @confirm="actionTakeOut">
+    <a-button class="ml-1" 
+      style="background: transparent;border: solid 1px #becfe7;color: #7c92b1;"
+    ><MinusCircleOutlined /></a-button>
+  </a-popconfirm>
+</template>
+<script setup>
+import ApiClient from '@/utils/ApiClient';
+import Common from '@/utils/Common';
+import { Modal } from 'ant-design-vue';
+import { nextTick } from 'vue';
+/** @var {Object} */
+const props = defineProps({
+    activeSlot: Object,
+});
+/** @var {String} */
+let taskId = null;
+
+// 样本取出确认
+async function takeOutConfirm( resolve ) {
+    let client = ApiClient.getClient();
+    await client.taskActionExecute(taskId, 'done');
+}
+
+// 显示取出确认
+function showTakeOutConfirm() {
+    return new Promise( resolve => {
+        Modal.info({
+            title: '请取出样本后点击确认',
+            onOk: () => takeOutConfirm(resolve),
+        });
+    });
+}
+
+// 样本取出
+async function takeOut() {
+    let client = ApiClient.getClient();
+    let task = await client.taskAppend('SampleTakeOut',{slotIndex:props.activeSlot.index * 1});
+    taskId = task.id;
+
+    while( true ) {
+        task = await client.taskExecutionGet(taskId);
+        if ( 'RUNNING' === task.status ) {
+            await showTakeOutConfirm();
+        } else if ( 'ERROR' === task.status ) {
+            Modal.error({title: '取出失败', content: task.message});
+            break ;
+        } else if ( 'FINISHED' === task.status ) {
+            break ;
+        }
+        await Common.delay(1000);
+    }
+}
+
+// 样本取出确认
+async function actionTakeOut() {
+    nextTick(takeOut);
+}
+</script>
\ No newline at end of file