Merge branch 'develop5.0-tmd' of http://106.12.23.251:10000/TEAMMODEL/TEAMModelOS into develop5.0-tmd

TEAMModelOS/ClientApp/src/common/BaseLayout.vue

@@ -885,7 +885,7 @@ export default {
 <style lang="less">
 // html,
 // body {
-// 	font-family:'DFPKing';
+// 	font-family:'微軟正黑體','Microsoft JhengHei UI','Microsoft JhengHei';
 // }
 
 .biz-menu .ivu-menu-vertical .ivu-menu-item-group-title {

TEAMModelOS/ClientApp/src/components/evaluation/ExerciseList.less

@@ -41,10 +41,9 @@
     flex-direction: row;
     justify-content: center;
     margin: 20px 0;
-    color: #fff;
     position: fixed;
     bottom: 5px;
-    background: #c7c7c7;
+    background: #fff;
     width: 100%;
     padding: 10px;
   }

TEAMModelOS/ClientApp/src/view/evaluation/bank/ExerciseList.vue

@@ -300,7 +300,7 @@
 			/** 执行筛选条件获取数据 */
 			doFilter(filterKey) {
 				this.dataLoading = true;
-				this.$refs.childRef && (this.$refs.childRef[0].collapseList = [])
+				this.$refs.childRef && this.$refs.childRef[0] && (this.$refs.childRef[0].collapseList = [])
 				this.collapseList = []; // 所有详情都收起来
 				/** 定义查询接口的参数规格 */
 				this.filterParams = {
@@ -340,7 +340,6 @@
 				this.$api.newEvaluation.FindExerciseList(data).then(async (res) => {
 					if(res.items.length){
 						let list = res.items;
-						console.log(list)
 						if((!this.flag && this.isShowSchoolBank) || (!this.flag && !this.isShowSchoolBank && this.filterOrigin === this.schoolCode)){
 							this.periodCountArr = this.getPeriodCount(res.items)
 							list = res.items.filter(i => i.periodId === this.periodList[this.filterPeriod].id)
@@ -351,7 +350,6 @@
 						/* 获取试题总数 */
 						this.totalNum = list.length;
 						this.originData = list;
-						console.log(list)
 						this.pageChange(1);
 					}else{
 						this.originData = []
@@ -404,9 +402,6 @@
 				this.fieldCountArr = fieldList.map(i => {
 					return curPeriodCond.subjects.reduce((a,b) => a + this._.sum(this.findKey(b,'field').map(j => j[+i+1+''])),0)
 				})
-				console.log(curPeriodCond)
-				console.log(this.subjectList)
-				console.log(this.subjectCountArr)
 			},
 			
 			findKey(data, field) {
@@ -625,7 +620,6 @@
 			 * @param page
 			 */
 			async pageChange(page) {
-				console.log(this.originData)
 				this.pageNum = page;
 				let start = this.pageSize * (page - 1);
 				let end = this.pageSize * page;
@@ -638,7 +632,7 @@
 					// this.totalNum = this.exerciseList.length
 					this.pageScrollTo(0);
 					this.onHandleToggle(true)
-					this.$refs.childRef && (this.$refs.childRef[0].collapseList = [])
+					this.$refs.childRef && this.$refs.childRef[0] && (this.$refs.childRef[0].collapseList = [])
 				} catch (e) {
 					this.$Message.error('Blob Error : ' + e)
 				}