拆分状态组件

frontend/src/business/components/api/report/ApiReportList.vue

@@ -3,70 +3,28 @@
     <ms-main-container>
       <el-card class="table-card" v-loading="result.loading">
         <template v-slot:header>
-          <ms-table-header :condition.sync="condition" @search="search" :title="$t('commons.test')"
+          <ms-table-header :condition.sync="condition" @search="search" :title="$t('api_report.title')"
                            :show-create="false"/>
         </template>
         <el-table :data="tableData" class="table-content">
-          <el-table-column
-            prop="name"
-            :label="$t('commons.name')"
-            width="150"
-            show-overflow-tooltip>
+          <el-table-column prop="name" :label="$t('commons.name')" width="150" show-overflow-tooltip>
           </el-table-column>
-<!--          <el-table-column-->
-<!--            prop="description"-->
-<!--            :label="$t('commons.description')"-->
-<!--            show-overflow-tooltip>-->
-<!--          </el-table-column>-->
-          <el-table-column
-            width="250"
-            :label="$t('commons.create_time')">
+          <el-table-column width="250" :label="$t('commons.create_time')">
             <template v-slot:default="scope">
               <span>{{ scope.row.createTime | timestampFormatDate }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            width="250"
-            :label="$t('commons.update_time')">
+          <el-table-column width="250" :label="$t('commons.update_time')">
             <template v-slot:default="scope">
               <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="status"
-            :label="$t('commons.status')">
+          <el-table-column prop="status" :label="$t('commons.status')">
             <template v-slot:default="{row}">
-              <el-tag size="mini" type="info" v-if="row.status === 'Saved'">
-                {{ row.status }}
-              </el-tag>
-              <el-tag size="mini" type="primary" v-else-if="row.status === 'Starting'">
-                {{ row.status }}
-              </el-tag>
-              <el-tag size="mini" type="success" v-else-if="row.status === 'Running'">
-                {{ row.status }}
-              </el-tag>
-              <el-tag size="mini" type="warning" v-else-if="row.status === 'Reporting'">
-                {{ row.status }}
-              </el-tag>
-              <el-tag size="mini" type="info" v-else-if="row.status === 'Completed'">
-                {{ row.status }}
-              </el-tag>
-              <el-tooltip placement="top" v-else-if="row.status === 'Error'" effect="light">
-                <template v-slot:content>
-                  <div>{{row.description}}</div>
-                </template>
-                <el-tag size="mini" type="danger">
-                  {{ row.status }}
-                </el-tag>
-              </el-tooltip>
-              <span v-else>
-                {{ row.status }}
-              </span>
+              <ms-api-report-status :row="row"/>
             </template>
           </el-table-column>
-          <el-table-column
-            width="150"
-            :label="$t('commons.operating')">
+          <el-table-column width="150" :label="$t('commons.operating')">
             <template v-slot:default="scope">
               <el-button @click="handleView(scope.row)" type="primary" icon="el-icon-s-data" size="mini" circle/>
               <el-button @click="handleDelete(scope.row)" type="danger" icon="el-icon-delete" size="mini" circle/>
@@ -85,14 +43,14 @@
   import MsTableHeader from "../../common/components/MsTableHeader";
   import MsContainer from "../../common/components/MsContainer";
   import MsMainContainer from "../../common/components/MsMainContainer";
+  import MsApiReportStatus from "./ApiReportStatus";
 
   export default {
-    components: {MsMainContainer, MsContainer, MsTableHeader, MsTablePagination},
+    components: {MsApiReportStatus, MsMainContainer, MsContainer, MsTableHeader, MsTablePagination},
     data() {
       return {
         result: {},
         condition: {name: ""},
-        projectId: null,
         tableData: [],
         multipleSelection: [],
         currentPage: 1,

frontend/src/business/components/api/report/ApiReportStatus.vue

+<template>
+  <div>
+    <el-tag size="mini" type="primary" v-if="row.status === 'Starting'">
+      {{ row.status }}
+    </el-tag>
+    <el-tag size="mini" type="success" v-else-if="row.status === 'Running'">
+      {{ row.status }}
+    </el-tag>
+    <el-tag size="mini" type="warning" v-else-if="row.status === 'Reporting'">
+      {{ row.status }}
+    </el-tag>
+    <el-tooltip placement="top" v-else-if="row.status === 'Error'" effect="light">
+      <template v-slot:content>
+        <div>{{row.description}}</div>
+      </template>
+      <el-tag size="mini" type="danger">
+        {{ row.status }}
+      </el-tag>
+    </el-tooltip>
+    <el-tag size="mini" type="info">
+      {{ row.status }}
+    </el-tag>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: "MsApiReportStatus",
+
+    props: {
+      row: Object
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

frontend/src/business/components/api/test/ApiTestList.vue

@@ -3,76 +3,30 @@
     <ms-main-container>
       <el-card class="table-card" v-loading="result.loading">
         <template v-slot:header>
-          <ms-table-header :condition.sync="condition" @search="search" :title="$t('commons.test')"
+          <ms-table-header :condition.sync="condition" @search="search" :title="$t('api_test.title')"
                            @create="create" :createTip="$t('load_test.create')"/>
         </template>
         <el-table :data="tableData" class="table-content">
-          <el-table-column
-            prop="name"
-            :label="$t('commons.name')"
-            width="150"
-            show-overflow-tooltip>
+          <el-table-column prop="name" :label="$t('commons.name')" width="150" show-overflow-tooltip>
           </el-table-column>
-<!--          <el-table-column-->
-<!--            prop="description"-->
-<!--            :label="$t('commons.description')"-->
-<!--            show-overflow-tooltip>-->
-<!--          </el-table-column>-->
-          <el-table-column
-            prop="projectName"
-            :label="$t('load_test.project_name')"
-            width="150"
-            show-overflow-tooltip>
+          <el-table-column prop="projectName" :label="$t('load_test.project_name')" width="150" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column
-            width="250"
-            :label="$t('commons.create_time')">
+          <el-table-column width="250" :label="$t('commons.create_time')">
             <template v-slot:default="scope">
               <span>{{ scope.row.createTime | timestampFormatDate }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            width="250"
-            :label="$t('commons.update_time')">
+          <el-table-column width="250" :label="$t('commons.update_time')">
             <template v-slot:default="scope">
               <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="status"
-            :label="$t('commons.status')">
+          <el-table-column prop="status" :label="$t('commons.status')">
             <template v-slot:default="{row}">
-              <el-tag size="mini" type="info" v-if="row.status === 'Saved'">
-                {{ row.status }}
-              </el-tag>
-              <el-tag size="mini" type="primary" v-else-if="row.status === 'Starting'">
-                {{ row.status }}
-              </el-tag>
-              <el-tag size="mini" type="success" v-else-if="row.status === 'Running'">
-                {{ row.status }}
-              </el-tag>
-              <el-tag size="mini" type="warning" v-else-if="row.status === 'Reporting'">
-                {{ row.status }}
-              </el-tag>
-              <el-tag size="mini" type="info" v-else-if="row.status === 'Completed'">
-                {{ row.status }}
-              </el-tag>
-              <el-tooltip placement="top" v-else-if="row.status === 'Error'" effect="light">
-                <template v-slot:content>
-                  <div>{{row.description}}</div>
-                </template>
-                <el-tag size="mini" type="danger">
-                  {{ row.status }}
-                </el-tag>
-              </el-tooltip>
-              <span v-else>
-                {{ row.status }}
-              </span>
+              <ms-api-test-status :row="row"/>
             </template>
           </el-table-column>
-          <el-table-column
-            width="150"
-            :label="$t('commons.operating')">
+          <el-table-column width="150" :label="$t('commons.operating')">
             <template v-slot:default="scope">
               <ms-table-operator @editClick="handleEdit(scope.row)" @deleteClick="handleDelete(scope.row)"/>
             </template>
@@ -91,9 +45,10 @@
   import MsTableOperator from "../../common/components/MsTableOperator";
   import MsContainer from "../../common/components/MsContainer";
   import MsMainContainer from "../../common/components/MsMainContainer";
+  import MsApiTestStatus from "./ApiTestStatus";
 
   export default {
-    components: {MsMainContainer, MsContainer, MsTableHeader, MsTablePagination, MsTableOperator},
+    components: {MsApiTestStatus, MsMainContainer, MsContainer, MsTableHeader, MsTablePagination, MsTableOperator},
     data() {
       return {
         result: {},

frontend/src/business/components/api/test/ApiTestStatus.vue

+<template>
+  <div>
+    <el-tag size="mini" type="primary" v-if="row.status === 'Starting'">
+      {{ row.status }}
+    </el-tag>
+    <el-tag size="mini" type="success" v-else-if="row.status === 'Running'">
+      {{ row.status }}
+    </el-tag>
+    <el-tag size="mini" type="warning" v-else-if="row.status === 'Reporting'">
+      {{ row.status }}
+    </el-tag>
+    <el-tooltip placement="top" v-else-if="row.status === 'Error'" effect="light">
+      <template v-slot:content>
+        <div>{{row.description}}</div>
+      </template>
+      <el-tag size="mini" type="danger">
+        {{ row.status }}
+      </el-tag>
+    </el-tooltip>
+    <el-tag size="mini" type="info">
+      {{ row.status }}
+    </el-tag>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: "MsApiTestStatus",
+
+    props: {
+      row: Object
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>