暂存导航栏调整

src/views/home/components/Navbar.vue

@@ -16,7 +16,7 @@
 
 		<top-nav id="homemenu-container" class="homemenu-container" v-if="topNav" />
 
-		<div style="padding-top: 5px; padding-right: 38px">
+		<div style="padding-top: 5px; padding-right: 24px">
 			<navbar-right :blackTitle="true" />
 		</div>
 	</div>

src/views/home/components/NavbarRight.vue

@@ -8,7 +8,7 @@
 			<svg-icon
 				icon-class="home-alarm-white"
 				style="font-size: 24px; cursor: pointer"
-				@click="toHome" />
+				@click="toAlarm" />
 		</div>
 		<!-- <div class="time-msg">
         <div class="line1">{{timeZone}}&nbsp;&nbsp;&nbsp;&nbsp;{{topTime}}</div>
@@ -70,9 +70,9 @@ export default {
 		this.getUserMsg();
 		// this.getTime();
 	},
-	beforeDestroy() {
-		clearInterval(this.timer);
-	},
+	// beforeDestroy() {
+	// 	clearInterval(this.timer);
+	// },
 	methods: {
 		// getTime() {
 		// 	let _this = this;
@@ -99,8 +99,8 @@ export default {
 				})
 				.catch(() => {});
 		},
-		toHome() {
-			this.$router.push({ path: '/' });
+		toAlarm() {
+			this.$router.push({ path: '/abnormalWarning' });
 		},
 	},
 };

src/views/home/components/TopNav.vue

@@ -204,6 +204,9 @@ export default {
 </script>
 
 <style lang="scss">
+.homemenu-container.el-menu.el-menu--horizontal > .el-submenu.is-active {
+	--theme: none !important;
+}
 .homemenu-container.el-menu--horizontal > .el-menu-item {
 	float: left;
 	height: 84px !important;

src/views/home/index.vue

@@ -20,8 +20,10 @@
 			</el-tabs>
 			<div class="current-date">(6.13-6.20)</div>
 			<div class="current-time">
-				<span style="display: inline-block; margin-right: 16px">03:12AM</span>
-				<span>2020.12.24</span>
+				<span style="display: inline-block; margin-right: 16px">
+					{{ topTime + timeZone }}
+				</span>
+				<span>{{ topDate }}</span>
 			</div>
 		</div>
 		<el-row class="main-top" :gutter="16">
@@ -169,6 +171,9 @@ export default {
 	data() {
 		return {
 			activeName: '日',
+			topDate: '',
+			topTime: '',
+			timeZone: '',
 			middleMenu: [
 				{ name: '工单管理', url: '', icon: 'home-work-menu' },
 				{ name: '订单管理', url: '', icon: 'home-order-menu' },
@@ -226,8 +231,23 @@ export default {
 			],
 		};
 	},
-	created() {},
-	methods: {},
+	created() {
+		this.getTime();
+	},
+	beforeDestroy() {
+		clearInterval(this.timer);
+	},
+	methods: {
+		getTime() {
+			let _this = this;
+			this.timer = setInterval(function () {
+				_this.topDate = moment().format('YYYY.MM.DD');
+				let temp = moment().format('A-hh:mm').split('-');
+				_this.timeZone = temp[0];
+				_this.topTime = temp[1];
+			}, 1000);
+		},
+	},
 };
 </script>
 
@@ -241,7 +261,7 @@ export default {
 	width: 100%;
 }
 .date-tabs {
-	padding-left: 24px;
+	padding-left: 40px;
 	padding-top: 20px;
 	position: relative;
 }
@@ -279,12 +299,12 @@ export default {
 	color: #fff;
 	font-size: 18px;
 	position: absolute;
-	right: 24px;
+	right: 38px;
 	top: 14px;
 }
 .main-top {
 	width: 100%;
-	padding: 0 8px 0 24px;
+	padding: 0 20px 0 40px;
 	.title {
 		position: absolute;
 		left: 34px;
@@ -328,7 +348,7 @@ export default {
 	background-color: #fff;
 	border-radius: 24px;
 	height: 133px;
-	margin: 16px 24px;
+	margin: 16px 38px 16px 40px;
 	padding-top: 15px;
 	.item {
 		width: 20%;
@@ -374,7 +394,7 @@ export default {
 }
 .main-bottom {
 	width: 100%;
-	padding: 0 8px 0 24px;
+	padding: 0 20px 0 40px;
 	.box {
 		background-color: #fff;
 		border-radius: 24px;