From 0f2f3983bbb64f24a4bc6b8603138c99d6695f13 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 4 Jun 2021 12:22:34 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E7=9B=98=E9=A1=B5=E9=9D=A2loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/panel/panel.js               |  1 -
 frontend/src/api/panel/view.js                |  1 -
 .../SubjectSetting/PreSubject/Slider.vue      |  5 +++-
 frontend/src/views/panel/ViewSelect/index.vue | 23 +++++++++++--------
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/frontend/src/api/panel/panel.js b/frontend/src/api/panel/panel.js
index 4f78878e39..a4b0d4744d 100644
--- a/frontend/src/api/panel/panel.js
+++ b/frontend/src/api/panel/panel.js
@@ -30,7 +30,6 @@ export function querySubjectWithGroup(data) {
   return request({
     url: '/panel/subject/querySubjectWithGroup',
     method: 'post',
-    loading: true,
     data
   })
 }
diff --git a/frontend/src/api/panel/view.js b/frontend/src/api/panel/view.js
index 5f1dd33737..1c3f9c12c6 100644
--- a/frontend/src/api/panel/view.js
+++ b/frontend/src/api/panel/view.js
@@ -4,7 +4,6 @@ export function tree(data) {
   return request({
     url: '/api/panelView/tree',
     method: 'post',
-    loading: true,
     data
   })
 }
diff --git a/frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue b/frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue
index 6aa8ff5e0c..d6e965c674 100644
--- a/frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue
+++ b/frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue
@@ -1,6 +1,6 @@
 <template>
   <el-row>
-    <el-row v-loading="$store.getters.loadingMap[$store.getters.currentPath]">
+    <el-row v-loading="slidersLoading">
       <el-col :span="2">
         <span>&nbsp;</span>
         <ul class="direction">
@@ -100,6 +100,7 @@ export default {
   data() {
     return {
       sliders: [],
+      slidersLoading: false,
       sliderWidth: 240,
       imgWidth: 240,
       currentIndex: 1,
@@ -150,8 +151,10 @@ export default {
       })
     },
     querySubjectWithGroup() {
+      this.slidersLoading = true
       querySubjectWithGroup({}).then(response => {
         this.sliders = response.data
+        this.slidersLoading = false
       })
     },
     move(offset, direction, speed) {
diff --git a/frontend/src/views/panel/ViewSelect/index.vue b/frontend/src/views/panel/ViewSelect/index.vue
index b41427a96a..0b157ec6e1 100644
--- a/frontend/src/views/panel/ViewSelect/index.vue
+++ b/frontend/src/views/panel/ViewSelect/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-col>
+  <el-col v-loading="loading">
     <el-row style="margin-top: 5px">
       <el-row style="margin-left: 5px;margin-right: 5px">
         <el-input
@@ -42,14 +42,14 @@
           </span>
         </el-tree>
       </el-row>
-<!--      <el-row v-if="detailItem&&detailItem.snapshot" class="detail-class">-->
-<!--        <el-card class="filter-card-class">-->
-<!--          <div slot="header" class="button-div-class">-->
-<!--            <span>{{ detailItem.name }}</span>-->
-<!--          </div>-->
-<!--          <img draggable="false" class="view-list-thumbnails" :src="detailItem.snapshot" alt="">-->
-<!--        </el-card>-->
-<!--      </el-row>-->
+      <!--      <el-row v-if="detailItem&&detailItem.snapshot" class="detail-class">-->
+      <!--        <el-card class="filter-card-class">-->
+      <!--          <div slot="header" class="button-div-class">-->
+      <!--            <span>{{ detailItem.name }}</span>-->
+      <!--          </div>-->
+      <!--          <img draggable="false" class="view-list-thumbnails" :src="detailItem.snapshot" alt="">-->
+      <!--        </el-card>-->
+      <!--      </el-row>-->
     </el-row>
   </el-col>
 </template>
@@ -68,7 +68,8 @@ export default {
       },
       data: [],
       showdetail: false,
-      detailItem: null
+      detailItem: null,
+      loading: false
     }
   },
   watch: {
@@ -91,8 +92,10 @@ export default {
     },
     loadData() {
       const param = {}
+      this.loading = true
       tree(param).then(res => {
         this.data = res.data
+        this.loading = false
       })
     },
     handleDragStart(node, ev) {