From d76bff73aeb42e9edd680f1a3ce0322247d4a22c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=84=86=E7=9A=AE=E9=B8=AD?= <1003092440@qq.com>
Date: Wed, 16 Aug 2023 02:10:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                                |   7 ++
 .../questionBank/components/GradesChart.vue   |  68 ++++++----
 .../questionBank/components/Question.vue      |  57 ++++++++-
 src/pages/questionBank/examResult.vue         | 119 ++++++++++++++++++
 src/pages/questionBank/practiceExams.vue      |   7 +-
 5 files changed, 227 insertions(+), 31 deletions(-)
 create mode 100644 src/pages/questionBank/examResult.vue

diff --git a/src/pages.json b/src/pages.json
index 129090e..119029f 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -35,6 +35,13 @@
 				"navigationStyle": "custom",
 				"enablePullDownRefresh": false
 			}
+		},
+		{
+			"path": "pages/questionBank/examResult",
+			"style": {
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": false
+			}
 		}
 	],
 
diff --git a/src/pages/questionBank/components/GradesChart.vue b/src/pages/questionBank/components/GradesChart.vue
index 00f5b03..f95d33f 100644
--- a/src/pages/questionBank/components/GradesChart.vue
+++ b/src/pages/questionBank/components/GradesChart.vue
@@ -10,37 +10,53 @@
 
 <script>
 export default {
+	props:{
+		color:{
+			type:String,
+			default:'#05C341'
+		},
+		titleName:{
+			type:String,
+			default:'80%'
+		},
+		actualValue:{
+			type:Number,
+			default:0.8
+		}
+	},
   data() {
     return {
       chartData: {},
       //您可以通过修改 config-ucharts.js 文件中下标为 ['arcbar'] 的节点来配置全局默认参数，如都是默认参数，此处可以不传 opts 。实际应用过程中 opts 只需传入与全局默认参数中不一致的【某一个属性】即可实现同类型的图表显示不同的样式，达到页面简洁的需求。
-      opts: {
-        color: ["#1890FF","#91CB74","#FAC858","#EE6666","#73C0DE","#3CA272","#FC8452","#9A60B4","#ea7ccc"],
-        padding: undefined,
-        title: {
-          name: "80%",
-          fontSize: 35,
-          color: "#05C341"
-        },
-        subtitle: {
-          name: "",
-          fontSize: 25,
-          color: "#05C341"
-        },
-        extra: {
-          arcbar: {
-            type: "default",
-            width: 18,
-            backgroundColor: "#E9E9E9",
-            startAngle: 0.95,
-            endAngle: 0.05,
-            gap: 2
-          }
-        }
-      }
+      opts: {}
     };
   },
   onReady() {
+		this.opts={
+			color: ["#1890FF","#91CB74","#FAC858","#EE6666","#73C0DE","#3CA272","#FC8452","#9A60B4","#ea7ccc"],
+			padding: undefined,
+			title: {
+			  name: this.titleName,
+			  fontSize: 35,
+			  color: this.color
+			},
+			subtitle: {
+			  name: "",
+			  fontSize: 25,
+			  color: this.color
+			},
+			extra: {
+			  arcbar: {
+			    type: "default",
+			    width: 18,
+			    backgroundColor: "#E9E9E9",
+			    startAngle: 0.95,
+			    endAngle: 0.05,
+			    gap: 2
+			  }
+			}
+		}
+		console.log(this.opts);
     this.getServerData();
   },
   methods: {
@@ -52,8 +68,8 @@ export default {
             series: [
               {
                 name: "正确率",
-                color: "#05C341",
-                data: 0.8
+                color: this.color,
+                data: this.actualValue
               }
             ]
           };
diff --git a/src/pages/questionBank/components/Question.vue b/src/pages/questionBank/components/Question.vue
index 991b7bd..2264d21 100644
--- a/src/pages/questionBank/components/Question.vue
+++ b/src/pages/questionBank/components/Question.vue
@@ -42,8 +42,8 @@
 		<view class="wp100 flex jc-sb ai-c p14 bc-fff" style="position: fixed;bottom: 0;left: 0;">
 			<view style="width: 220rpx;">
 				<button v-if="type==='practice'" class="btn">四步学科一</button>
-				<view v-else class="btn" style="text-align: center;">
-					<u-count-down :time="1 * 60 * 60 * 1000" format="HH:mm:ss"></u-count-down>
+				<view v-else class="btn" style="text-align: center;" @tap="submitPaper">
+					<u-count-down ref="countDown_1" :time="1 * 60 * 60 * 1000" format="HH:mm:ss"></u-count-down>
 					<text>交卷</text>
 				</view>
 			</view>
@@ -81,13 +81,40 @@
         </view>
       </template>
     </u-modal>
+		<u-modal :show="isSubmit">
+			<view class="wp100">
+				<view class="text-center">
+				<text>确认交卷</text>
+				<view class="mt20 flex ai-c jc-sb">
+					<view class="text-center">
+						<text style="color:#FF6E02">99</text>
+						<view class="cor-333">未答题数</view>
+					</view>
+					<view class="text-center">
+						<u-count-down ref="countDown_3" class="balckColor" :time="1 * 60 * 60 * 1000" format="HH:mm:ss"></u-count-down>
+						<view>剩余时间</view>
+					</view>
+					<view class="text-center">
+						<text style="color:#333">9</text>
+						<view class="cor-333">考试得分</view>
+					</view>
+				</view>
+				</view>
+			</view>
+		  <template #confirmButton>
+		    <view class="p10" >
+		      <u-button :customStyle="{width:'45%',marginRight:'10px',height:'68rpx',lineHeight:'68rpx',borderRadius:'34rpx',color:'#666',border:'1px solid #666',display:'inline-block'}" @click="continueExam">继续考试</u-button>
+					<u-button :customStyle="{width:'45%',marginLeft:'10px',height:'68rpx',lineHeight:'68rpx',borderRadius:'34rpx',color:'#fff',backgroundColor:'#05C341',display:'inline-block'}" @click="toSubmit">现在交卷</u-button>
+		    </view>
+		  </template>
+		</u-modal>
 		<u-popup :show="popupShow" mode="bottom" :closeOnClickOverlay="true" @close="popupShow=false">
 			<view>
 				<view class="wp100 flex jc-sb p14 bc-fff">
 					<view style="width: 220rpx;">
 						<button v-if="type==='practice'" class="btn">四步学科一</button>
-						<view v-else class="btn" style="text-align: center;">
-							<u-count-down :time="1 * 60 * 60 * 1000" format="HH:mm:ss"></u-count-down>
+						<view v-else class="btn" style="text-align: center;" @tap="submitPaper">
+							<u-count-down ref="countDown_2" :time="1 * 60 * 60 * 1000" format="HH:mm:ss"></u-count-down>
 							<text>交卷</text>
 						</view>
 					</view>
@@ -134,6 +161,10 @@ export default {
 		type:{
 			type:String,
 			default:'practice'
+		},
+		isSubmit:{
+			type:Boolean,
+			default:false
 		}
 	},
   data() {
@@ -160,11 +191,29 @@ export default {
     this.renderSwiper(0)
   },
   methods: {
+		submitPaper(){
+			this.$refs.countDown_1.pause();
+			this.$refs.countDown_2.pause();
+			this.$refs.countDown_3.pause();
+			this.$emit('update:isSubmit',true)
+		},
+		continueExam(){
+			this.$refs.countDown_1.start();
+			this.$refs.countDown_2.start();
+			this.$refs.countDown_3.start();
+			this.$emit('update:isSubmit',false)
+		},
 		//切换题目
 		chooseQueston(index){
 			this.popupShow=false
 			this.pickerTopic(index)
 		},
+		//交卷
+		toSubmit(){
+			uni.navigateTo({
+				url:"/pages/questionBank/examResult"
+			})
+		},
 		//查看考试结果
 		toResult(){
 			uni.navigateTo({
diff --git a/src/pages/questionBank/examResult.vue b/src/pages/questionBank/examResult.vue
new file mode 100644
index 0000000..8157e1e
--- /dev/null
+++ b/src/pages/questionBank/examResult.vue
@@ -0,0 +1,119 @@
+<template>
+	<view>
+		<u-navbar title="本次成绩" @rightClick="rightClick" :autoBack="true"></u-navbar>
+		<view style="margin-top: 100px;" class="p14 wp100">
+			<GradesChart color="#FF6E02" titleName="32分" :actualValue="0.32" />
+			<view class="top_box flex jc-c" style="flex-direction: column;">
+				<view class="wp100 text-center" style="margin-top: -153rpx;">
+					<text>太棒了！正确率很高了！</text>
+					<button class="centerBtn">马上提分</button>
+					<view class="flex ai-c jc-c mt10">
+						<view class="text-center wp33">
+							<view>99</view>
+							<text>未做题</text>
+						</view>
+						<view class="text-center wp33">
+							<view>12</view>
+							<text>看错题</text>
+						</view>
+						<view class="text-center wp33 flex jc-c ai-c" style="flex-direction: column;">
+							<u-icon name="edit-pen" size="28"></u-icon>
+							<text>重新考试</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="p14">
+			<view class="bc-fff p14" style="border-radius: 20rpx;">
+				<view class="flex ai-c jc-sb">
+					<text class="fs18 cor-000 fw600">考试情况</text>
+				</view>
+				<view class="charts-box">
+					<qiun-data-charts type="line" :opts="opts" :chartData="chartData" />
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import GradesChart from "./components/GradesChart.vue"
+	export default {
+		components: {
+			GradesChart
+		},
+		data() {
+			return {
+				chartData: {},
+				//您可以通过修改 config-ucharts.js 文件中下标为 ['line'] 的节点来配置全局默认参数，如都是默认参数，此处可以不传 opts 。实际应用过程中 opts 只需传入与全局默认参数中不一致的【某一个属性】即可实现同类型的图表显示不同的样式，达到页面简洁的需求。
+				opts: {
+					color: ["#FAC858"],
+					padding: [15, 10, 0, 15],
+					enableScroll: false,
+					legend: {},
+					xAxis: {
+						disableGrid: true
+					},
+					yAxis: {
+						gridType: "dash",
+						dashLength: 2
+					},
+					extra: {
+						line: {
+							type: "straight",
+							width: 2,
+							activeType: "hollow"
+						}
+					}
+				}
+			};
+		},
+	onReady() {
+			this.getServerData();
+		},
+		methods: {
+			getServerData() {
+				//模拟从服务器获取数据时的延时
+				setTimeout(() => {
+					//模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接
+					let res = {
+						categories: [],
+						series: [{
+								data: [32]
+							},
+						]
+					};
+					this.chartData = JSON.parse(JSON.stringify(res));
+				}, 500);
+			},
+		}
+	}
+</script>
+
+<style scoped>
+	.top_box {
+		padding: 15px;
+		background-color: #fdfdfd;
+		border-radius: 20rpx;
+	}
+
+	.centerBtn {
+		width: 349rpx;
+		height: 76rpx;
+		background: #DEEFE5;
+		border-radius: 38rpx;
+		line-height: 76rpx;
+		text-align: center;
+		color: #00B74F;
+		margin-top: 10px
+	}
+
+	.charts-box {
+		width: 100%;
+		height: 346rpx;
+		background-color: #fdfdfd;
+		border-radius: 20rpx;
+		ppadding-top: 20rpx;
+	}
+</style>
diff --git a/src/pages/questionBank/practiceExams.vue b/src/pages/questionBank/practiceExams.vue
index 673132b..80a1f59 100644
--- a/src/pages/questionBank/practiceExams.vue
+++ b/src/pages/questionBank/practiceExams.vue
@@ -2,7 +2,7 @@
 	<view>
 		<u-navbar title="模拟考试" @rightClick="rightClick" :autoBack="true">
 		</u-navbar>
-		<Question :tabsList="tabsList" type="exam" />
+		<Question :tabsList="tabsList" v-model:isSubmit="isSubmit" type="exam" />
 	</view>
 </template>
 
@@ -19,6 +19,7 @@
 		},
 		data() {
 			return {
+				isSubmit:false,
 				tabsList:[{
 					label:"模拟考试",
 					value:0
@@ -52,4 +53,8 @@
 		font-size: 28rpx;
 		color:#fff !important;
 	}
+	::v-deep .balckColor .u-count-down__text{
+		font-size: 28rpx;
+		color:#333 !important;
+	}
 </style>