From d2e37360daa554814ddb96dc8edc4b0c8cef3eca Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Tue, 5 Jul 2022 11:43:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8A=A5=E5=91=8A=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85=20loading=20=E5=8A=A8=E7=94=BB=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=88=B7=E6=96=B0=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/report/builtinReport.scss           |  1 +
 .../table/report/reportTestTable.vue          | 19 +++++++++++++++++--
 src/views/report/reportTest.vue               | 11 +++++++++--
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/assets/css/components/views/report/builtinReport.scss b/src/assets/css/components/views/report/builtinReport.scss
index e5bb732f..c5faf0f6 100644
--- a/src/assets/css/components/views/report/builtinReport.scss
+++ b/src/assets/css/components/views/report/builtinReport.scss
@@ -8,6 +8,7 @@
     width: 288px;
     height: 100%;
     border-right: 1px solid  #E7EAED;
+    position: relative;
     .cn-builtin-left-title {
       padding: 28px 0 26px 13px;
       font-size: 16px;
diff --git a/src/components/table/report/reportTestTable.vue b/src/components/table/report/reportTestTable.vue
index 562fbb6d..d0834c5f 100644
--- a/src/components/table/report/reportTestTable.vue
+++ b/src/components/table/report/reportTestTable.vue
@@ -6,6 +6,7 @@
       :height="height"
       :expand-row-keys="expandedIds"
       row-key="id"
+      v-loading="toolsLoading"
       border
       tooltip-effect="light"
       @header-dragend="dragend"
@@ -107,6 +108,11 @@
         <span v-if="item.prop === 'timeLimit'">
           {{handleTimeRange(scope.row)}}
         </span>
+        <span v-else-if="item.prop === 'categoryId'">
+          <span v-for="item in categoryList">
+            <span v-if="scope.row.categoryId === item.id">{{item.name}}</span>
+          </span>
+        </span>
         <span v-else-if="item.prop === 'timePlan'">
           <template v-if="scope.row.config.isScheduler === 0">
              {{$t('report.always')}}
@@ -217,6 +223,10 @@ export default {
     Loading,
     chartDetectionPagination
   },
+  props: {
+    categoryList: Array,
+    toolsLoading: Boolean
+  },
   inject: ['reload'],
   data () {
     return {
@@ -227,7 +237,12 @@ export default {
           label: 'ID',
           prop: 'id',
           show: true,
-          width: 40
+          width: 50
+        }, {
+          label: this.$t('report.categoryType'),
+          prop: 'categoryId',
+          show: true,
+          minWidth: 180
         }, {
           label: this.$t('config.user.name'),
           prop: 'name',
@@ -384,7 +399,7 @@ export default {
           })
         }
         this.loadingDown = false
-        const showInterval = this.downDataList.find(item => item.percent !== 1)
+        const showInterval = this.downDataList.find(item => item.percent !== 1 && item.state !== 2)
         if (this.downDataList && showInterval) {
           this.intervalChange(param)
         }
diff --git a/src/views/report/reportTest.vue b/src/views/report/reportTest.vue
index c8f4334d..04ac48fb 100644
--- a/src/views/report/reportTest.vue
+++ b/src/views/report/reportTest.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="cn-builtin">
     <div class="cn-builtin-left">
+      <loading :loading="builtinLeftLoading"></loading>
       <div class="cn-builtin-left-title">
         {{$t('report.category')}}
       </div>
@@ -34,9 +35,10 @@
         <template #default>
           <builtin-report-table
               ref="dataTable"
-              v-loading="tools.loading"
+              :tools-loading="tools.loading"
               :api="url"
               :custom-table-title="tools.customTableTitle"
+              :category-list="builtinReportLeftMenu"
               :height="mainTableHeight"
               :table-data="tableData"
               @delete="del"
@@ -75,6 +77,7 @@ import cnDataList from '@/components/table/CnDataList'
 import dataListMixin from '@/mixins/data-list'
 import { api } from '@/utils/api'
 import ReportBox from '@/components/rightBox/report/ReportBox'
+import Loading from '@/components/common/Loading'
 
 export default {
   name: 'Report',
@@ -141,17 +144,20 @@ export default {
         'report.november',
         'report.december'
       ],
-      tableId: 'builtinReportTable'
+      tableId: 'builtinReportTable',
+      builtinLeftLoading: false
     }
   },
   mixins: [dataListMixin],
   components: {
+    Loading,
     cnDataList,
     builtinReportTable,
     ReportBox
   },
   methods: {
     queryGetTempData () {
+      this.builtinLeftLoading = true
       get(api.reportCategory).then(res => {
         if (res.code === 200) {
           this.builtinReportLeftMenu = res.data.list.map(c => {
@@ -161,6 +167,7 @@ export default {
             }
           })
         }
+        this.builtinLeftLoading = false
       })
     },
     getTableData (params) {