Sample Add

src/src/main/java/com/my/graphiteDigesterBg/diframe/model/DiMdbTaskExecution.java

@@ -0,0 +1,33 @@
+package com.my.graphiteDigesterBg.diframe.model;
+import com.my.graphiteDigesterBg.diframe.ActiveRecordField;
+import com.my.graphiteDigesterBg.diframe.DiActiveRecord;
+public class DiMdbTaskExecution extends DiActiveRecord {
+    @ActiveRecordField
+    public Integer id;
+
+    @ActiveRecordField
+    public Integer userId;
+
+    @ActiveRecordField
+    public String name;
+
+    @ActiveRecordField
+    public String uuid;
+
+    @ActiveRecordField
+    public String status;
+
+    @ActiveRecordField
+    public String runtimeStatus;
+
+    @ActiveRecordField
+    public String message;
+
+    @ActiveRecordField
+    public Integer createdAt;
+
+    // get table name
+    public static String getTableName() {
+        return "app_task_executions";
+    }
+}

src/web/src/pages/main/contents/OperationSampleAdd.vue

@@ -1,8 +1,12 @@
 <template>
-  <a-button class="ml-1" @click="actionAdd"><PlusCircleOutlined /></a-button>
+  <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="enable" v-model:open="enable" 
+  <a-modal v-if="puttingConfirmEnable" v-model:open="puttingConfirmEnable" 
     title="添加样本" 
     ok-text="确认" 
     cancel-text="取消"
@@ -14,31 +18,49 @@
 </template>
 <script setup>
 import ApiClient from '@/utils/ApiClient';
-import { ref } from 'vue';
+import { nextTick, ref } from 'vue';
+import { Modal } from 'ant-design-vue';
+import Common from '@/utils/Common';
 /** @var {Object} */
-const enable = ref(false);
+const puttingConfirmEnable = ref(false);
 /** @var {String} */
 let taskId = null;
 
 // 样本添加
-async function actionAdd() {
-    enable.value = true;
-    let client = ApiClient.getClient();
-    let response = await client.taskAppend('SampleAdd');
-    taskId = response.id;
+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() {
-    enable.value = false;
     let client = ApiClient.getClient();
     await client.taskActionExecute(taskId, 'done');
+    puttingConfirmEnable.value = false;
 }
 
 // 样本添加取消
 async function actionSampleAddCancel() {
-    enable.value = false;
     let client = ApiClient.getClient();
     await client.taskActionExecute(taskId, 'cancel');
+    puttingConfirmEnable.value = false;
 }
 </script>