首页修改

src/components/home/HomeList.vue

@@ -97,6 +97,10 @@ export default {
       default () {
         return []
       }
+    },
+    loading: {
+      type: Boolean,
+      default: false
     }
   },
   computed: {
@@ -122,8 +126,7 @@ export default {
       tipText: '',
       btnText: '',
       haskey: false,
-      isSubCount: false,
-      loading: true
+      isSubCount: false
     }
   },
   created () {
@@ -194,7 +197,7 @@ export default {
       .el-card__body{
         display: flex;
         flex-direction: column;
-        justify-content: center;
+        justify-content: flex-start;
         align-items: center;
         padding: 0;
         height: 100%;

src/components/home/HomePotenList.vue

@@ -82,6 +82,10 @@ export default {
     BmEmpty
   },
   props: {
+    loading: {
+      type: Boolean,
+      default: true
+    },
     getlist: {
       type: Array,
       default () {
@@ -108,13 +112,6 @@ export default {
       default: 'C'
     }
   },
-  watch: {
-    getlist (newval) {
-      if (newval.length !== 0) {
-        this.loading = false
-      }
-    }
-  },
   computed: {
     getListData () {
       return this.getlist.map(v => {
@@ -145,8 +142,7 @@ export default {
       },
       selectItem: {},
       tipText: '',
-      btnText: '',
-      loading: true
+      btnText: ''
     }
   },
   created () {
@@ -172,7 +168,6 @@ export default {
       this.$emit('addSet', this.model)
     },
     changeFollow (item) {
-      this.loading = true
       this.selectItem = item
       this.cur.fid = item.entId
       if (this.model === 'R') {
@@ -190,7 +185,6 @@ export default {
       }
     },
     changeDelete (item) {
-      this.loading = true
       item.remove = true
       this.$forceUpdate()
       this.$emit('delete', item)

src/views/work-desktop/WorkDesktop.vue

@@ -9,34 +9,33 @@
         <UserInfo></UserInfo>
         <CommonUse></CommonUse>
         <div class="d-con-flex">
-          <HomeList ref="sublist1" @getDetail="getDetail" @addSet="addSet" @linkMore="linkMore" :getlist="getList" model="model-1">
+          <HomeList ref="sublist1" :loading="setload.loading1" @getDetail="getDetail" @addSet="addSet" @linkMore="linkMore" :getlist="getList" model="model-1">
             <span slot="header">订阅信息</span>
           </HomeList>
-          <HomeList ref="sublist2" @getDetail="getDetail" @addSet="addSet" @linkMore="linkMore" :getlist="entList" model="model-2">
+          <HomeList :loading="setload.loading2" ref="sublist2" @getDetail="getDetail" @addSet="addSet" @linkMore="linkMore" :getlist="entList" model="model-2">
             <span slot="header">企业情报监控</span>
           </HomeList>
-          <HomeList ref="sublist3" @getDetail="getDetail" @addSet="addSet" @linkMore="linkMore" :getlist="collectionList" model="model-3">
+          <HomeList :loading="setload.loading3" ref="sublist3" @getDetail="getDetail" @addSet="addSet" @linkMore="linkMore" :getlist="collectionList" model="model-3">
             <span slot="header">最近收藏的标讯</span>
           </HomeList>
-          <HomeList ref="sublist4" @getDetail="getDetail" :stepList="stepList" @thisAnnouncement="thisAnnouncement" @addSet="addSet" @linkMore="linkMore" :getlist="followList" model="model-4">
+          <HomeList :loading="setload.loading4" ref="sublist4" @getDetail="getDetail" :stepList="stepList" @thisAnnouncement="thisAnnouncement" @addSet="addSet" @linkMore="linkMore" :getlist="followList" model="model-4">
             <span slot="header">项目关注</span>
           </HomeList>
-          <HomeList ref="sublist5" v-if="info.power.indexOf(10) !== -1" @getDetail="getDetail" @addSet="addSet" @linkMore="linkMore" :getlist="weekList" model="model-week">
+          <HomeList :loading="setload.loading5" ref="sublist5" v-if="info.power.indexOf(10) !== -1" @getDetail="getDetail" @addSet="addSet" @linkMore="linkMore" :getlist="weekList" model="model-week">
             <span slot="header">周报</span>
           </HomeList>
-          <HomeList ref="sublist6" v-if="info.power.indexOf(10) !== -1" @getDetail="getDetail" @addSet="addSet" @linkMore="linkMore" :getlist="monthList" model="model-month">
+          <HomeList :loading="setload.loading6" ref="sublist6" v-if="info.power.indexOf(10) !== -1" @getDetail="getDetail" @addSet="addSet" @linkMore="linkMore" :getlist="monthList" model="model-month">
             <span slot="header">月报</span>
           </HomeList>
         </div>
         <div>
           <HomePotenList
           v-if="info.power.indexOf(7) !== -1"
-          ref="homelist"
+          :loading="setload.loading7"
           :getlist="potenEntListOne"
           model="C"
           @goDetail="goDetail"
           @follow="changeFollow"
-          @remove="changeRemove"
           @delete="changeDelete"
           @addSet="addSet">
             <span slot="header">潜在客户推荐</span>
@@ -48,11 +47,11 @@
           <HomePotenList
           v-if="info.power.indexOf(8) !== -1"
           ref="homelist"
+          :loading="setload.loading8"
           :getlist="potenPerListOne"
           model="R"
           @goDetail="goDetail"
           @follow="changeFollow"
-          @remove="changeRemove"
           @delete="changeDelete"
           @addSet="addSet">
             <span slot="header">潜在竞争对手/合作伙伴推荐</span>
@@ -95,7 +94,17 @@ export default {
       weekList: [],
       potenEntListOne: [],
       potenPerListOne: [],
-      model: 'C'
+      model: 'C',
+      setload: {
+        loading1: true,
+        loading2: true,
+        loading3: true,
+        loading4: true,
+        loading5: true,
+        loading6: true,
+        loading7: true,
+        loading8: true
+      }
     }
   },
   computed: {
@@ -120,7 +129,7 @@ export default {
           this.$refs.sublist1.isSubCount = this.info.isSubCount
         }
         setTimeout(() => {
-          this.$refs.sublist1.loading = false
+          this.setload.loading1 = false
         }, 1000)
       })
       // 企业情报监控
@@ -140,7 +149,7 @@ export default {
           }
         }
         setTimeout(() => {
-          this.$refs.sublist2.loading = false
+          this.setload.loading2 = false
         }, 1000)
       })
       // 最新收藏的标讯
@@ -163,7 +172,7 @@ export default {
           })
         }
         setTimeout(() => {
-          this.$refs.sublist3.loading = false
+          this.setload.loading3 = false
         }, 1000)
       })
       // 项目关注
@@ -184,7 +193,7 @@ export default {
           })
         }
         setTimeout(() => {
-          this.$refs.sublist4.loading = false
+          this.setload.loading4 = false
         }, 1000)
       })
       // 周报/月报
@@ -219,13 +228,14 @@ export default {
           }
         }
         setTimeout(() => {
-          this.$refs.sublist5.loading = false
-          this.$refs.sublist6.loading = false
+          this.setload.loading5 = false
+          this.setload.loading6 = false
         }, 1000)
       })
     },
     initPotenList () {
       // 潜在竞争对手
+      this.setload.loading8 = true
       getIndexCorList({
         business: {},
         business_scope: [],
@@ -267,11 +277,14 @@ export default {
           }
           this.potenPerListOne = potenlist
         }
-        this.$refs.homelist.loading = false
+        setTimeout(() => {
+          this.setload.loading8 = false
+        }, 1000)
       })
     },
     initPotenPerList () {
       // 潜在客户挖掘
+      this.setload.loading7 = true
       getIndexCorList({
         business: {},
         business_scope: [],
@@ -314,7 +327,9 @@ export default {
           this.potenEntListOne = potenlist
         }
       })
-      this.$refs.homelist.loading = false
+      setTimeout(() => {
+        this.setload.loading7 = false
+      }, 1000)
     },
     // 鼠标悬浮展示项目公告
     thisAnnouncement (items) {
@@ -452,40 +467,16 @@ export default {
             this.$toast('“不再推荐”操作成功')
           }
           this.initPotenPerList()
-          this.$refs.homelist.loading = false
         })
       } else if (item.model === 'R') {
         // 不是我的竞争对手/合作伙伴
         setRemoveEnt({ entId: item.entId }).then(res => {
           if (!(res && res.error_code === 0 && res.data && res.data.success)) {
-            // this.$refs.homelist.doQuery(this.filters)
             this.$toast(res.error_msg)
           } else {
             this.$toast('“不再推荐”操作成功')
           }
           this.initPotenList()
-          this.$refs.homelist.loading = false
-        })
-      }
-    },
-    changeRemove (item) {
-      if (item.model === 'C') {
-        // 潜在客户挖掘--取消关注
-        setStatusCustomer({ name: item.Buyer, province: item.WProvince, city: item.WCity, b: true }).then(res => {
-          if (!(res && res.error_code === 0 && res.data)) {
-            this.$toast(res.error_msg)
-            this.$refs.homelist.doQuery(this.filters)
-          } else {
-            this.$toast('取消关注成功')
-          }
-        })
-      } else {
-        setCancelEnt({ entId: item.entId }).then(res => {
-          if (!(res && res.error_code === 0 && res.data === 'success')) {
-            this.$refs.homelist.doQuery(this.filters)
-          } else {
-            this.$toast('取消关注成功')
-          }
         })
       }
     },