Jelajahi Sumber

测试执行停止和统计接口。

jiaxiaoqiang 3 bulan lalu
induk
melakukan
b69923d65f
2 mengubah file dengan 61 tambahan dan 4 penghapusan
  1. 22 0
      src/api/project/excute.ts
  2. 39 4
      src/views/modules/runTest/run-test.vue

+ 22 - 0
src/api/project/excute.ts

@@ -73,3 +73,25 @@ export function startExecuteProjects(data: object): AxiosPromise {
     data: data,
   });
 }
+
+//停止正在执行的项目
+export function stopExecuteProjects(id: string): AxiosPromise {
+  return request({
+    url: "/api/v1/test/engrExecute/endExecute",
+    method: "post",
+    data: {
+      id: id,
+    },
+  });
+}
+
+// 查询执行统计数据  测试执行页面下边
+export function searchExecuteStatistics(id?: string): AxiosPromise {
+  return request({
+    url: "/api/v1/test/engrExecute/selectExecuteStatistics",
+    method: "post",
+    data: {
+      id: id,
+    },
+  });
+}

+ 39 - 4
src/views/modules/runTest/run-test.vue

@@ -9,10 +9,12 @@ import { CheckboxValueType } from "element-plus";
 import {
   searchExcutingGlobalData,
   searchExcutingInstrumentConfig,
+  searchExecuteStatistics,
   searchInstrumentStatus,
   searchTestMachineConfig,
   searhTestType,
   startExecuteProjects,
+  stopExecuteProjects,
 } from "@/api/project/excute";
 
 const route = useRoute();
@@ -37,6 +39,7 @@ onMounted(async () => {
   getAllTestTypes();
   getExcutingMachines();
   getTestProjectTopList();
+  getSattisticData();
 });
 
 const topProAllList = ref<any[]>([]);
@@ -119,6 +122,8 @@ const getExcutingGlobalData = async () => {
 const configDrawerVisible = ref(false);
 
 // 开始测试相关
+const isTesting = ref(false);
+const currentTestingProject = ref<any>();
 const startToRunTest = async () => {
   if (!checkStartEnable()) return;
 
@@ -132,6 +137,25 @@ const startToRunTest = async () => {
   };
 
   let res = await startExecuteProjects(params);
+  currentTestingProject.value = res.data;
+  isTesting.value = true;
+};
+
+const stopTesting = async () => {
+  let res = await stopExecuteProjects(currentTestingProject.value?.id);
+  isTesting.value = false;
+  currentTestingProject.value = {};
+  getSattisticData();
+};
+
+// 查询下边统计数据
+const statisticsData = ref<object>();
+const getSattisticData = () => {
+  searchExecuteStatistics(route?.params?.engineerId as string).then(
+    (result) => {
+      statisticsData.value = result.data;
+    }
+  );
 };
 
 const checkStartEnable = (): boolean => {
@@ -344,11 +368,22 @@ const checkStartEnable = (): boolean => {
       </div>
       <div class="right">
         <div>已用时:300s</div>
-        <div class="test-btn progress" @click="startToRunTest">
-          <svg-icon icon-class="start-test" />
+        <!--        <div class="test-btn progress" @click="startToRunTest">-->
+        <!--          <svg-icon icon-class="start-test" />-->
+        <!--          开始测试-->
+        <!--        </div>-->
+        <el-button
+          type="primary"
+          class="test-btn progress"
+          @click="startToRunTest"
+          :loading="isTesting"
+        >
+          <template #icon>
+            <svg-icon icon-class="start-test" />
+          </template>
           开始测试
-        </div>
-        <div class="test-btn error">
+        </el-button>
+        <div class="test-btn error" @click="stopTesting">
           <svg-icon icon-class="stop-test" />
           停止测试
         </div>