瀏覽代碼

针对不同项目显示不同名字 如果没有数据 第三屏不显示

zhaojijng 2 年之前
父節點
當前提交
0de96b9cca
共有 3 個文件被更改,包括 45 次插入8 次删除
  1. 18 1
      src/views/horizontalScreen.vue
  2. 7 3
      src/views/valueDelivery/pageHead.vue
  3. 20 4
      src/views/verticalScreen.vue

+ 18 - 1
src/views/horizontalScreen.vue

@@ -94,6 +94,7 @@ export default {
             lastMonthTotal: require("@/assets/horImg/hor_lastMonthTotal.png"),
             nowPage: null,
             horiInterval: null,
+            //showAllPage: 3,
         };
     },
     mounted() {
@@ -104,7 +105,11 @@ export default {
         doneTowPage() {
             //第二屏刷新结束 通知
             //debugger;
-            this.nowPage = 3;
+            if (this.showAllPage == 3) {
+                this.nowPage = 3;
+            } else if (this.showAllPage == 2) {
+                this.nowPage = 1;
+            }
             this.timePageShow();
         },
         timePageShow() {
@@ -134,8 +139,20 @@ export default {
                 lastAllEnergy.energyCompare = lastAllEnergy.energyCompare
                     ? Number((lastAllEnergy.energyCompare * 100).toFixed(0))
                     : lastAllEnergy.energyCompare;
+                console.log("lastAllEnergy", lastAllEnergy);
                 return lastAllEnergy;
             },
+            showAllPage: function() {
+                console.log("lastAllEnergy", this.lastAllEnergy);
+                if (
+                    this.lastAllEnergy.energyTotal === undefined &&
+                    this.lastAllEnergy.energyCompare === undefined
+                ) {
+                    return 2;
+                } else {
+                    return 3;
+                }
+            },
         }),
     },
 };

+ 7 - 3
src/views/valueDelivery/pageHead.vue

@@ -1,15 +1,15 @@
 <template>
     <div class="horHead horSty">
         <div class="horHead-content">
-            <div v-if="projectId == 'Pj3301100002'">
+            <div>
                 <div class="firtitle">
-                    之江实验室一期西区
+                    {{ projectObj.localName }}
                 </div>
                 <div class="sectitle">
                     懂空间,更懂办公
                 </div>
             </div>
-            <img :src="title" v-else />
+            <!-- <img :src="title" v-else /> -->
         </div>
         <div class="horHead-left">
             <img :src="logo" alt="" style="height:60px;" />
@@ -83,6 +83,10 @@ export default Vue.extend({
             projectId: (state: any) => {
                 return state.projectId;
             },
+            projectObj: (state: any) => {
+                //debugger;
+                return state.projectObj;
+            },
         }),
         logo: function(): any {
             //console.log("this", this);

+ 20 - 4
src/views/verticalScreen.vue

@@ -74,6 +74,7 @@ export default {
             nowPage: null,
             verticalInterval: null,
             ver_big_bg: require("@/assets/ver_big_bg.png"),
+            // showAllPage: 3,
         };
     },
     mounted() {
@@ -95,6 +96,17 @@ export default {
                     : lastAllEnergy.energyCompare;
                 return lastAllEnergy;
             },
+            showAllPage: function() {
+                console.log("lastAllEnergy", this.lastAllEnergy);
+                if (
+                    this.lastAllEnergy.energyTotal === undefined &&
+                    this.lastAllEnergy.energyCompare === undefined
+                ) {
+                    return 2;
+                } else {
+                    return 3;
+                }
+            },
         }),
     },
     methods: {
@@ -105,14 +117,18 @@ export default {
         },
         doneTowPage() {
             //第二屏刷新结束 通知
-            this.nowPage = 3;
+            if (this.showAllPage == 3) {
+                this.nowPage = 3;
+            } else if (this.showAllPage == 2) {
+                this.nowPage = 1;
+            }
         },
         timePageShow() {
             var timeoutsign = setTimeout(() => {
                 this.nowPage = this.nowPage + 1;
-                if (this.nowPage == 4) {
-                    this.nowPage = 1;
-                }
+                // if (this.nowPage == 4) {
+                //     this.nowPage = 1;
+                // }
             }, 6000);
         },
     },