diff --git a/src/App.vue b/src/App.vue index 84a722b..8cf6819 100644 --- a/src/App.vue +++ b/src/App.vue @@ -3,7 +3,9 @@ - + + + diff --git a/src/components/header.vue b/src/components/header.vue index 99b2480..855a5ae 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -48,49 +48,50 @@ export default { title: "首页", path: "/" }, - { - index: "2", - title: "营销", - path: "/marketing" - }, { index: "3", title: "长者", path: "/elder" }, { - index: "4", - title: "居住", - path: "/live" - }, - { - index: "5", - title: "综合管理", - path: "/05" - } - ], - menuList1: [ - { - index: "6", - title: "财务", - path: "/06" + index: "9", + title: "智能设备", + path: "/09" }, { index: "7", title: "人力资源", path: "/07" }, + { + index: "4", + title: "居住", + path: "/live" + }, + ], + menuList1: [ + { + index: "2", + title: "营销", + path: "/marketing" + }, + { + index: "5", + title: "综合管理", + path: "/05" + }, + { + index: "6", + title: "财务", + path: "/06" + }, { index: "8", title: "活动管理", path: "/08" }, - { - index: "9", - title: "智能设备", - path: "/09" - } - ] + ], + timeout: undefined, }; }, props: { @@ -106,6 +107,7 @@ export default { }, mounted() { this.getTime(); + // this.carousel(); }, methods: { getTime: function () { @@ -148,7 +150,21 @@ export default { this.headerObj.index = item.index this.$router.push({ path: item.path }); } - } + }, + carousel(){ + let menus = this.menuList.concat(this.menuList1) + let index = this.headerObj.index == 9 ? 0 : this.headerObj.index + this.timeout = setTimeout(() => { + for (var i = 0; i < menus.length; i++) { + if(index == i){ + this.jumpPage(menus[i]) + } + }; + },3000) + }, + }, + beforeDestroy() { + clearTimeout(this.timeout) }, }; diff --git a/src/pages/elder/home.vue b/src/pages/elder/home.vue index 9a5df55..88c3714 100644 --- a/src/pages/elder/home.vue +++ b/src/pages/elder/home.vue @@ -75,16 +75,16 @@
长者总数
-
1761
+
1760
男性长者
-
1761人
+
980人
女性长者
-
1761人
+
780人
-
+
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index e000d03..6b36d59 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -3,7 +3,7 @@ -
+
diff --git a/src/pages/live/index.vue b/src/pages/live/index.vue index 838cc6f..ad22250 100644 --- a/src/pages/live/index.vue +++ b/src/pages/live/index.vue @@ -3,7 +3,7 @@ -
+
diff --git a/src/pages/marketing/index.vue b/src/pages/marketing/index.vue index 56cc841..1c37155 100644 --- a/src/pages/marketing/index.vue +++ b/src/pages/marketing/index.vue @@ -3,7 +3,7 @@ -
+
diff --git a/src/pages/page/05.vue b/src/pages/page/05.vue index 10cf818..2f5869d 100644 --- a/src/pages/page/05.vue +++ b/src/pages/page/05.vue @@ -1,6 +1,6 @@ diff --git a/src/pages/page/06.vue b/src/pages/page/06.vue index 3785712..05101b8 100644 --- a/src/pages/page/06.vue +++ b/src/pages/page/06.vue @@ -1,6 +1,6 @@ diff --git a/src/pages/page/07.vue b/src/pages/page/07.vue index 554548e..a1019ef 100644 --- a/src/pages/page/07.vue +++ b/src/pages/page/07.vue @@ -1,6 +1,6 @@ diff --git a/src/pages/page/08.vue b/src/pages/page/08.vue index 3b3e966..c8b0394 100644 --- a/src/pages/page/08.vue +++ b/src/pages/page/08.vue @@ -1,6 +1,6 @@ diff --git a/src/pages/page/09.vue b/src/pages/page/09.vue index 5cacc65..6e89bb3 100644 --- a/src/pages/page/09.vue +++ b/src/pages/page/09.vue @@ -1,6 +1,6 @@