From eb84f1eb1253df3fea8a0a495d98f1a82db356b5 Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期一, 20 一月 2020 15:37:04 +0800
Subject: [PATCH] 日历

---
 src/views/Overview.vue |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/views/Overview.vue b/src/views/Overview.vue
index 9a2e724..a7a4ac1 100644
--- a/src/views/Overview.vue
+++ b/src/views/Overview.vue
@@ -15,12 +15,12 @@
 			
 		</div>
 		<div style="float: left; margin-left: 1%; width: 69%; height: 80vh; ">
-			<div style="float: left; margin: 10px;  width: 46%; height: 43%; border: 1px solid #42B983;"></div>
-			<div style="float: left; margin: 10px; width: 46%; height: 43%; border: 1px solid #42B983;"></div>
-			<div style="float: left; margin: 10px; width: 46%; height: 43%; border: 1px solid #42B983;"></div>
-			<div style="float: left; margin: 10px; width: 46%; height: 43%; border: 1px solid #42B983;"></div>
+			<div class="z_shadow" style="float: left; margin: 10px; margin-top: 0px; width: 46%; height: 43%; border: 1px solid #e4eef9;"></div>
+			<div class="z_shadow" style="float: left; margin: 10px; margin-top: 0px; width: 46%; height: 43%; border: 1px solid #e4eef9;"></div>
+			<div class="z_shadow" style="float: left; margin: 10px; width: 46%; height: 43%; border: 1px solid #e4eef9;"></div>
+			<div class="z_shadow" style="float: left; margin: 10px; width: 46%; height: 43%; border: 1px solid #e4eef9;"></div>
 		</div>
-		<div style="float: right; margin-right: 1%; width: 28%; height: 80vh; border: 1px solid #42B983;"></div>
+		<div class="z_shadow" style="float: right; margin-right: 1%; width: 28%; height: 70vh; border: 1px solid #e4eef9;"></div>
 		
 		
 		<el-dialog @close="Cancel" width="70%" top="50px" :visible.sync="dialog_1" append-to-body>
@@ -42,19 +42,19 @@
 				options: [
 					{
 						value: '閫夐」1',
-						label: '榛勯噾绯�'
+						label: '椤圭洰1'
 					}, {
 						value: '閫夐」2',
-						label: '鍙岀毊濂�'
+						label: '椤圭洰2'
 					}, {
 						value: '閫夐」3',
-						label: '铓典粩鐓�'
+						label: '椤圭洰3'
 					}, {
 						value: '閫夐」4',
-						label: '榫欓』闈�'
+						label: '椤圭洰4'
 					}, {
 						value: '閫夐」5',
-						label: '鍖椾含鐑ら腑'
+						label: '椤圭洰5'
 					}
 				],
 				value: '',
@@ -83,5 +83,4 @@
 		text-align: left;
 		background-color: #dee0e2;
 	}
-	
 </style>

--
Gitblit v1.8.0