Merge branch 'tj-user' into test

src/views/notice/mynotice/dataStatistics/notices.vue

@@ -11,7 +11,7 @@
 			</div>
 		</div>
 	</div>
-	<div v-show="list.length < 1"  style="display: flex;justify-content: center;">
+	<div v-if="list.length < 1"  style="display: flex;justify-content: center;">
 			<label style="color: darkgray;"> 暂无新通知</label>
 	</div>
 	<el-dialog draggable v-model="centerDialogVisible" :title="notice.title" width="30%" center>
@@ -61,6 +61,7 @@
 </script>
 
 <style lang="scss" scoped>
+	
 	.msg{
 		width: 100%;
 		display: flex;
@@ -78,7 +79,7 @@
 	}
 	.notice-item{
 		display: flex;
-		margin-top: 5px;
+		margin-top: 18px;
 	}
 	.notices{
 		margin-left: 10px;

src/views/notice/mynotice/index.vue

@@ -1,12 +1,12 @@
 <template>
 	
 	<div v-show="showAll == false"> 
-		<el-card style="padding: 5px; 15px">
+		<el-card style="padding: 5px; 15px;height: calc(24vh);">
 			<div class="header-title"> <h3>最新通知 </h3> <h4  @click="go2page">查看全部</h4></div>
 			<noticeBlock></noticeBlock>
 		</el-card>
 
-		<el-card shadow="always"  v-action="'statistic.HomeStatistics.statistics'"  v-ac style="margin-top: 20px;">
+		<el-card shadow="always"  v-action="'statistic.HomeStatistics.statistics'"  v-ac style="margin-top: 20px;height: calc(70vh);">
 			<todayData></todayData>
 		</el-card>
 	</div>