3.18

components/todaydata-box/todaydata-box.vue

@@ -142,6 +142,7 @@
 			pickerConfirm(e) {
 				// this.setTimePicker = false
 				// 闭包的运用
+				
 				let that = this
 				setTimeout(function () {
 					uni.$showMsg('记录完成',1000)
@@ -194,7 +195,7 @@
 
 	.module-item-text {
 		color: #FFF;
-		font-size: 40rpx;
+		font-size: 28rpx;
 		font-weight: bold;
 		z-index: 5;
 	}
@@ -205,7 +206,7 @@
 
 		.module-item-num {
 			color: #FFF;
-			font-size: 30rpx;
+			font-size: 42rpx;
 			font-weight: bold;
 		}
 	}

components/top-box/top-box.vue

@@ -62,7 +62,8 @@
 				setSemesterPicker: false,
 				//下边界坐标
 				capsuleBottom: 0,
-				capsuleMiddle: 0
+				capsuleMiddle: 0,
+				temp: '',
 			};
 		},
 		computed: {
@@ -73,16 +74,23 @@
 			...mapMutations('m_children', ['updateChildrenInfo', 'updateChildrenSemester']),
 			changeHandler(e){
 				//更新学期存储与显示
-				this.updateChildrenSemester(e.value[0])
+				this.temp = e.value[0]
 			},
 			//学期选择
 			pickerConfirm(e) {
 				//拼接图表数据
-				let that = this
-				setTimeout(function (){
-					uni.$showMsg('切换完成',1000)
-					that.setSemesterPicker = false
-				},100)
+				this.updateChildrenSemester(this.temp)
+				if(this.semester == e.value[0]){
+					let that = this
+					setTimeout(function (){
+						uni.$showMsg('切换完成',1000)
+						that.setSemesterPicker = false
+					},100)
+				}else{
+					this.updateChildrenSemester(e.value[0])
+					this.setSemesterPicker = false
+				}
+				
 			},
 			//取消选择
 			pickerCancel() {

gradepkg/area-chart/area-chart.vue

@@ -42,44 +42,48 @@
 				</view>
 			</view>
 			<!-- 图表 -->
-			<view class="charts-box" v-if="scoreTypeCurrent == '得分对比'">
+			<view class="charts-box" v-if="scoreTypeCurrent == '主科得分'">
 				<qiun-data-charts type="area" :chartData="gradeData.subjectAreaChart.majorSubjectComparison"
 					:loadingType="4" tooltipFormat='tooltipScore' :canvas2d="true" canvasId="canvasId99998" />
 			</view>
-			<view class="charts-box" v-if="scoreTypeCurrent == '得分率对比'">
+			<view class="charts-box" v-if="scoreTypeCurrent == '主科得分率'">
 				<qiun-data-charts type="area" :chartData="gradeData.subjectAreaChart.majorSubjectComparison"
 					:loadingType="4" tooltipFormat='tooltipScoreShort' :canvas2d="true" canvasId="canvasId991398" />
 			</view>
-			
+
 		</view>
-		
+
 		<!-- 副科成绩走势 -->
 		<view class="chart-container">
 			<view class="chart-name">
 				<view class="t-icon t-icon-xianxingshoufengqin"></view>
 				<text class="chart-name-text">{{semester}} 副科走势对比</text>
 				<!-- 按钮 -->
-				<view class="btn-box" @click="switchScoreTypePicker = true">
-					<text class="btn">{{scoreTypeCurrent}}</text>
+				<view class="btn-box" @click="scoreTypePickerMinor = true">
+					<text class="btn">{{minorTypeCurrent}}</text>
+					<u-icon name="arrow-down" color="#3B4144;"></u-icon>
 				</view>
 			</view>
 			<!-- 图表 -->
-			<view class="charts-box" v-if="scoreTypeCurrent == '得分对比'">
+			<view class="charts-box" v-if="minorTypeCurrent == '副科得分'">
 				<qiun-data-charts type="area" :chartData="gradeData.subjectAreaChart.minorSubjectComparison"
 					:loadingType="4" tooltipFormat='tooltipScore' :canvas2d="true" canvasId="canvasId99997" />
 			</view>
-			<view class="charts-box" v-if="scoreTypeCurrent == '得分率对比'">
+			<view class="charts-box" v-if="minorTypeCurrent == '副科得分率'">
 				<qiun-data-charts type="area" :chartData="gradeData.subjectAreaChart.minorSubjectComparison"
 					:loadingType="4" tooltipFormat='tooltipScoreShort' :canvas2d="true" canvasId="canvasId129997" />
 			</view>
 		</view>
 
 		<!-- 选择器 -->
-		<u-picker :show="setSubjectPicker" :columns="subjectList" @confirm="pickerConfirm"
-			@cancel="pickerCancel" :closeOnClickOverlay="true" @change="changeHandler" :immediateChange="true">
+		<u-picker :show="setSubjectPicker" :columns="subjectList" @confirm="pickerConfirm" @cancel="pickerCancel"
+			:closeOnClickOverlay="true" @change="changeHandler" :immediateChange="true">
 		</u-picker>
 		<u-picker :show="switchScoreTypePicker" :columns="scoreTypeList" @confirm="scoreTypeConfirm"
-			@cancel="scoreTypeCancel" :closeOnClickOverlay="true" @change="changeHandler" :immediateChange="true">
+			@cancel="pickerCancel" :closeOnClickOverlay="true" @change="changeHandler" :immediateChange="true">
+		</u-picker>
+		<u-picker :show="scoreTypePickerMinor" :columns="scoreTypeListMinor" @confirm="minorTypeConfirm"
+			@cancel="pickerCancel" :closeOnClickOverlay="true" @change="changeHandler" :immediateChange="true">
 		</u-picker>
 
 
@@ -122,14 +126,21 @@
 				setSubjectPicker: false,
 				//数据展示切换
 				switchScoreTypePicker: false,
+				//副科数据展示切换
+				scoreTypePickerMinor: false,
 				//科目列表
 				subjectList: [],
 				//数据维度列表
 				scoreTypeList: [
-					['得分对比','得分率对比']
+					['主科得分', '主科得分率']
 				],
-				//当前选择图表展示方式
+				scoreTypeListMinor: [
+					['副科得分', '副科得分率']
+				],
+				//主科图表展示方式
 				scoreTypeCurrent: '',
+				//副科图表展示方式
+				minorTypeCurrent: '',
 				//当前选择科目
 				subjectCurrent: '',
 				//暂存区
@@ -157,38 +168,64 @@
 				}
 			},
 			//设置默认图表模式
-			setScoreType(){
-				if(this.scoreTypeCurrent == '')
-				this.scoreTypeCurrent = this.scoreTypeList[0][0]
+			setScoreType() {
+				if (this.scoreTypeCurrent == '')
+					this.scoreTypeCurrent = this.scoreTypeList[0][0]
+				if (this.minorTypeCurrent == '')
+					this.minorTypeCurrent = this.scoreTypeListMinor[0][0]
 			},
-			//切换统计图表模式
-			scoreTypeConfirm(e){
+			//主科统计图表模式
+			scoreTypeConfirm(e) {
+				console.log(e)
 				this.scoreTypeCurrent = this.temp
-				let that = this
-				setTimeout(function(){
-					uni.$showMsg('切换完成', 1000)
-					that.switchScoreTypePicker = false
-				},100)
+				if (this.scoreTypeCurrent == e.value[0]) {
+					let that = this
+					setTimeout(function() {
+						uni.$showMsg('切换完成', 1000)
+						that.switchScoreTypePicker = false
+					}, 100)
+				}else{
+					this.scoreTypeCurrent = e.value[0]
+					this.switchScoreTypePicker = false
+				}
+
 			},
-			scoreTypeCancel() {
-				uni.$showMsg('取消选择', 1000)
-				this.switchScoreTypePicker = false
+			//副科统计图表模式
+			minorTypeConfirm(e) {
+				this.minorTypeCurrent = this.temp
+				if (this.minorTypeCurrent == e.value[0]) {
+					let that = this
+					setTimeout(function() {
+						uni.$showMsg('切换完成', 1000)
+						that.scoreTypePickerMinor = false
+					}, 100)
+				}else{
+					this.minorTypeCurrent = e.value[0]
+					this.scoreTypePickerMinor = false
+				}
 			},
 			//切换科目
 			pickerConfirm(e) {
 				//改变subjectCurrent并由监听器处理数据图表同步改变
 				this.subjectCurrent = this.temp
-				let that = this
-				setTimeout(function() {
-					uni.$showMsg('切换完成', 1000)
-					that.setSubjectPicker = false
-				}, 100)
+				if (this.subjectCurrent == e.value[0]) {
+					let that = this
+					setTimeout(function() {
+						uni.$showMsg('切换完成', 1000)
+						that.setSubjectPicker = false
+					}, 100)
+				}else{
+					this.subjectCurrent = e.value[0]
+					this.setSubjectPicker = false
+				}
 			},
+			//取消picker
 			pickerCancel() {
 				uni.$showMsg('取消选择', 1000)
 				this.setSubjectPicker = false
+				this.switchScoreTypePicker = false
+				this.scoreTypePickerMinor = false
 			},
-
 		}
 	}
 </script>