瀏覽代碼

解决样式冲突

zqwang 1 年之前
父節點
當前提交
a0ee38cb7d
共有 2 個文件被更改,包括 17 次插入5 次删除
  1. 1 1
      src/views/dashboard/dataStatistics/todayData.vue
  2. 16 4
      src/views/dashboard/index.vue

+ 1 - 1
src/views/dashboard/dataStatistics/todayData.vue

@@ -124,7 +124,7 @@ const go2tj=()=>{
 }
 </script>
 
-<style>
+<style  lang="scss" scoped>
 .data-line{
   display: flex;   /* flex布局 */
   justify-content: space-between;   /* 左对齐 */

+ 16 - 4
src/views/dashboard/index.vue

@@ -1,9 +1,12 @@
 <template>
-	<el-card>
-		111111
+	<el-card style="padding: 5px; 15px">
+		<div class="header-title"> <h3>最新通知 </h3> <h4>查看全部</h4></div>
+		<div class="noticebody">
+			
+		</div>
 	</el-card>
 	
-	<el-card shadow="always">
+	<el-card shadow="always" style="margin-top: 20px;">
 		<todayData></todayData>
 	</el-card>
 
@@ -22,6 +25,7 @@ console.log('path', path)
 </script>
 
 <style lang="scss" scoped>
+
 .welcome {
   display: flex;
   flex-direction: column;
@@ -30,10 +34,15 @@ console.log('path', path)
   height: 100%;
 }
 
-.header {
+.header-title {
   display: flex;
   align-items: center;
+  justify-content:space-between;
   margin-bottom: 40px;
+  h4{
+	  margin-right: 50px;
+	  color: #29d;;
+  }
 }
 
 .logo {
@@ -79,4 +88,7 @@ p {
 .button:hover {
   background-color: #32a673;
 }
+.noticebody{
+	
+}
 </style>