3.11-4

components/analysis-box/analysis-box.vue

@@ -106,7 +106,7 @@
 		display: flex;
 		flex-direction: column;
 		justify-content: space-between;
-		width: 347rpx;
+		width: 100%;
 		height: 345rpx;
 
 		.item-container {
@@ -115,7 +115,7 @@
 			border-radius: 16rpx;
 			background-color: #FFFFFF;
 			box-shadow: 0 4rpx 8rpx rgba(0, 0, 0, 0.05);
-			width: 347rpx;
+			width: 100%;
 			height: 100rpx;
 
 			.analysis-name {

components/todaydata-box/todaydata-box.vue

@@ -141,14 +141,14 @@
 		justify-content: space-between;
 
 		.module-item {
-			margin: 10rpx 0;
+			margin: 2% 0;
 			display: flex;
 			flex-direction: column;
 			justify-content: space-between;
 			background-color: #FFFFFF;
 			box-shadow: 0 4rpx 8rpx rgba(0, 0, 0, 0.05);
 			border-radius: 16rpx;
-			width: 347rpx;
+			width: 48%;
 			height: 230rpx;
 			background-color: #5b7cff;
 			overflow: hidden;

pages/grade/grade.vue

@@ -6,7 +6,7 @@
 		<!-- 缩略图区域 -->
 		<view class="mini-chart-list">
 
-			<view class="mini-chart-item">
+			<view class="mini-chart-item" style="width: 100%;">
 				<view class="mainchart-container">
 					<view class="mainchart-name">
 						<view class="t-icon t-icon-xtubiao-4"></view>
@@ -69,17 +69,21 @@
 				<analysis-box></analysis-box>
 			</view>
 
-
-		</view>
-		<!-- 成绩表单 -->
-		<view class="table-card">
-			<view class="table-name">
-				<view class="t-icon t-icon-xtubiao-5"></view>
-				<text class="table-name-text">成绩概览</text>
+			<!-- 成绩表单 -->
+			<view class="mini-chart-item" style="width: 100%; height: 500rpx;">
+				<view class="chart-container" style="height: 1000rpx">
+					<view class="chart-name">
+						<view class="t-icon t-icon-xtubiao-5"></view>
+						<text class="chart-name-text">成绩概览</text>
+					</view>
+					<z-table class="table" :tableData="gradeData.tableData" :columns="gradeData.columns"
+						stickSide="true">
+					</z-table>
+				</view>
 			</view>
-			<z-table class="table" :tableData="gradeData.tableData" :columns="gradeData.columns" stickSide="true">
-			</z-table>
+
 		</view>
+
 	</view>
 </template>
 
@@ -147,7 +151,7 @@
 	.chart-list-container {
 		width: 100%;
 		height: 100%;
-		overflow-x:hidden; //隐藏多余的页面
+		overflow-x: hidden; //隐藏多余的页面
 
 		.home-topinfo {
 			background: linear-gradient(#ff8caf, #f1f3f5);
@@ -162,7 +166,8 @@
 			justify-content: space-between;
 
 			.mini-chart-item {
-				margin: 10rpx 0;
+				margin: 2% 0;
+				width: 48%;
 				display: flex;
 				flex-direction: column;
 			}
@@ -195,7 +200,6 @@
 		}
 
 		.mainchart-box {
-			width: 710rpx;
 			height: 300rpx;
 		}
 	}
@@ -209,7 +213,7 @@
 		flex-direction: column;
 		background-color: #FFFFFF;
 		box-shadow: 0 4rpx 8rpx rgba(0, 0, 0, 0.05);
-		width: 347rpx;
+		width: 100%;
 		height: 345rpx;
 
 		.chart-name {
@@ -233,36 +237,9 @@
 		}
 	}
 
-	//表格
-	.table-card {
-		margin: 10rpx 20rpx;
-		border-radius: 16rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		flex-direction: column;
-		background-color: #FFFFFF;
-		box-shadow: 0 4rpx 8rpx rgba(0, 0, 0, 0.05);
-
-		.table-name {
-			width: 100%;
-			text-align: left;
-			margin: 20rpx 0 0 50rpx;
-			display: flex;
-			align-items: center;
-			font-weight: bold;
-			color: #3B4144;
-
-			.table-name-text {
-				font-size: 30rpx;
-				margin-left: 20rpx;
-			}
-		}
-
-		.table {
-			margin: 20rpx;
-			width: 92%;
-		}
+	.table {
+		margin-bottom: 20rpx;
+		width: 93%;
 	}
 
 	//图标

pages/home/home.vue

@@ -84,7 +84,7 @@
 					<view class="card-content">{{questionnaire}}%</view>
 				</view>
 				<view style="padding: 0rpx 20rpx 10rpx 20rpx;">
-					<u-line-progress :showText="false" :percentage="questionnaire" activeColor="#6495ed" height="15">
+					<u-line-progress :showText="false" :percentage="questionnaire" activeColor="#5b7cff" height="15">
 					</u-line-progress>
 				</view>
 				<!-- 内容 -->
@@ -93,7 +93,7 @@
 					<view class="card-content">{{vote}}%</view>
 				</view>
 				<view style="padding: 0rpx 20rpx 10rpx 20rpx;">
-					<u-line-progress :showText="false" :percentage="vote" activeColor="#fd7193" height="15">
+					<u-line-progress :showText="false" :percentage="vote" activeColor="#ff9db2" height="15">
 					</u-line-progress>
 				</view>
 			</view>
@@ -226,14 +226,14 @@
 			justify-content: space-between;
 
 			.card-item {
-				margin: 10rpx 0;
+				margin: 2% 0;
 				display: flex;
 				flex-direction: column;
 				justify-content: space-between;
 				background-color: #FFFFFF;
 				box-shadow: 0 4rpx 8rpx rgba(0, 0, 0, 0.05);
 				border-radius: 16rpx;
-				width: 347rpx;
+				width: 48%;
 				height: auto;
 
 				.card-info {