xieqy 2 years ago
parent
commit
ff613cba96

+ 4 - 1
src/views/groupPage/baseMap/components/ProjectMap.vue

@@ -75,6 +75,7 @@ export default {
       immediate: true
     },
     currentProjectInfo() {
+      if (!this.show) return
       if (this.monitorTreeInfo) this.monitorTreeInfo.clearDataSource()
       this.$store.state.bigScreen.isInitViewer = false
       if (this.viewer) this.viewer.destroy(), (window.viewer = null)
@@ -82,7 +83,9 @@ export default {
       this.$nextTick(() => {
         this.initData()
           .then((result) => {
-            this.addToMap()
+            setTimeout(() => {
+              this.addToMap()
+            }, 3000)
           })
           .catch((error) => {
             console.log(error)

+ 4 - 4
src/views/groupPage/districtPageModules/commonModules/SectorToolbar.vue

@@ -2,8 +2,8 @@
   <transition
     appear
     name="animate__animated animate__move"
-    enter-active-class="animate__fadeInRightBig"
-    leave-active-class="animate__fadeOutRightBig"
+    enter-active-class="animate__fadeInUp"
+    leave-active-class="animate__fadeOutDown"
   >
     <div class="widget-SectorToolbar" ref="widget-SectorToolbar">
       <transition
@@ -490,8 +490,8 @@ export default class SectorToolbar extends Vue {
 }
 </style>
 <style lang="scss" scoped>
-.animate__fadeInRightBig,
-.animate__fadeOutRightBig {
+.animate__fadeInUp,
+.animate__fadeOutDown {
   animation-duration: 3s; //动画持续时间
   animation-delay: 0s; //动画延迟时间
 }

+ 3 - 1
src/views/groupPage/districtPageModules/projectPanoramic/ProjectProgress.vue

@@ -153,7 +153,9 @@ export default class ProjectProgress extends Vue {
   }
   @Watch('projectCode', { immediate: true })
   onChangMehod() {
-    this.getPageData()
+    setTimeout(() => {
+      this.getPageData()
+    }, 3000)
   }
   roundFun(value, n) {
     return Math.round(value * Math.pow(10, n)) / Math.pow(10, n)

+ 1 - 1
src/views/groupPage/groupPageModules/ProjectStatistic.vue

@@ -129,7 +129,7 @@ export default {
           { name: '暂停项目', num: this.prjInfo.filter((item) => item.stage === '暂停阶段').length, status: false },
           { name: '未移交项目', num: this.prjInfo.filter((item) => item.type === '未移交').length, status: false }
         ]
-        this.$store.state.bigScreen.groupProject = this.prjInfo
+        // this.$store.state.bigScreen.groupProject = this.prjInfo
       })
       // })
     }

+ 0 - 5
src/views/groupPage/index.vue

@@ -33,11 +33,6 @@ export default {
     GroupPageModules,
     DistrictPageModules
   },
-  computed: {
-    showGroupPage() {
-      return this.$store.state.bigScreen.isShowGroupPage
-    }
-  },
   data() {
     return {
       flexibleObject: null,