From 3f985b84995416a9276287d975b10aa11d672929 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 21 Apr 2022 15:33:22 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=8B=86=E5=88=86=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=8A=A5=E5=91=8A=E5=92=8Cui=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/automation/report/ApiReportList.vue     | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/frontend/src/business/components/api/automation/report/ApiReportList.vue b/frontend/src/business/components/api/automation/report/ApiReportList.vue
index 7aad3deaa6..f22d5ce896 100644
--- a/frontend/src/business/components/api/automation/report/ApiReportList.vue
+++ b/frontend/src/business/components/api/automation/report/ApiReportList.vue
@@ -5,7 +5,7 @@
         <template v-slot:header>
           <ms-table-header :condition.sync="condition" @search="search" :show-create="false">
             <template v-slot:button>
-              <el-button-group v-if="!isUI">
+              <el-button-group>
 
                 <el-tooltip class="item" effect="dark" content="left" :disabled="true" placement="left">
                   <el-button plain :class="{active: leftActive}" @click="changeTab('left')">{{$t('commons.scenario')}}</el-button>
@@ -124,10 +124,7 @@
               <div>
                 <ms-table-operator-button :tip="$t('api_report.detail')" icon="el-icon-s-data"
                                           @exec="handleView(scope.row)" type="primary"/>
-                <ms-table-operator-button v-if="isUI" :tip="$t('api_report.delete')"
-                                          v-permission="['PROJECT_UI_REPORT:READ+DELETE']"
-                                          icon="el-icon-delete" @exec="handleDelete(scope.row)" type="danger"/>
-                <ms-table-operator-button v-else :tip="$t('api_report.delete')"
+                <ms-table-operator-button :tip="$t('api_report.delete')"
                                           v-permission="['PROJECT_API_REPORT:READ+DELETE']"
                                           icon="el-icon-delete" @exec="handleDelete(scope.row)" type="danger"/>
               </div>
@@ -246,9 +243,6 @@ export default {
     rightActive() {
       return this.trashActiveDom === 'right';
     },
-    isUI() {
-      return this.reportType && this.reportType === 'UI';
-    }
   },
   methods: {
     search() {
@@ -266,10 +260,6 @@ export default {
       if(this.trashActiveDom==='left'){
         this.reportTypeFilters =this.reportScenarioFilters;
         url = "/api/scenario/report/list/" + this.currentPage + "/" + this.pageSize;
-        this.condition.isUi = false;
-        if (this.isUI) {
-          this.condition.isUi = true;
-        }
       }else{
         this.reportTypeFilters =this.reportCaseFilters;
         url = "/api/execute/result/list/" + this.currentPage + "/" + this.pageSize;
@@ -327,7 +317,7 @@ export default {
         confirmButtonText: this.$t('commons.confirm'),
         callback: (action) => {
           if (action === 'confirm') {
-            this.result = this.$post("/api/scenario/report/delete", {id: report.id, isUi: this.isUI}, () => {
+            this.result = this.$post("/api/scenario/report/delete", {id: report.id}, () => {
               this.$success(this.$t('commons.delete_success'));
               this.search();
             });
@@ -382,7 +372,6 @@ export default {
             sendParam.selectAllDate = this.isSelectAllDate;
             sendParam.unSelectIds = this.unSelection;
             sendParam = Object.assign(sendParam, this.condition);
-            sendParam.isUi = this.isUI;
             this.$post('/api/scenario/report/batch/delete', sendParam, () => {
               this.selectRows.clear();
               this.$success(this.$t('commons.delete_success'));