OnePsycho hai 1 ano
pai
achega
37d9f1ea12

+ 2 - 2
TEAMModelOS/ClientApp/src/utils/js-fn.js

@@ -214,7 +214,7 @@ function timeFormat(timestamp) {
     let D = date.getDate()
     let D = date.getDate()
     let H = date.getHours()
     let H = date.getHours()
     let MIN = date.getMinutes()
     let MIN = date.getMinutes()
-    return `${Y}/${M < 9 ? '0' + (M + 1) : M + 1}/${D} ${H < 10 ? '0' + H : H}:${MIN < 10 ? '00' : MIN}`
+    return `${Y}/${M < 9 ? '0' + (M + 1) : M + 1}/${D < 9 ? '0' + D : D} ${H < 10 ? '0' + H : H}:${MIN < 10 ? '00' : MIN}`
 }
 }
 function dateFormat(timestamp) {
 function dateFormat(timestamp) {
     if (timestamp <= 0) return ''
     if (timestamp <= 0) return ''
@@ -223,7 +223,7 @@ function dateFormat(timestamp) {
     let Y = date.getFullYear()
     let Y = date.getFullYear()
     let M = date.getMonth()
     let M = date.getMonth()
     let D = date.getDate()
     let D = date.getDate()
-    return `${Y}/${M < 9 ? '0' + (M + 1) : M + 1}/${D}`
+    return `${Y}/${M < 9 ? '0' + (M + 1) : M + 1}/${D < 9 ? '0' + D : D}`
 }
 }
 
 
 /**
 /**

+ 3 - 2
TEAMModelOS/ClientApp/src/view/learnactivity/ExamMgt.vue

@@ -537,7 +537,7 @@
 					}
 					}
 					if (this.ctnToken) requestData.token = this.ctnToken;
 					if (this.ctnToken) requestData.token = this.ctnToken;
 					//校本评测根据学段查询
 					//校本评测根据学段查询
-					if (this.scope == "school") requestData.period = this.filterPeriod;
+					if (this.scope == "school") requestData.period = this.$store.state.user.curPeriod.id;
 					//添加其他查询条件
 					//添加其他查询条件
 					if (this.filter.progress) requestData.progress = this.filter.progress;
 					if (this.filter.progress) requestData.progress = this.filter.progress;
 					if (this.filter.source) requestData.source = this.filter.source;
 					if (this.filter.source) requestData.source = this.filter.source;
@@ -972,9 +972,10 @@
 			},
 			},
 			"$store.state.user.curSemester": {
 			"$store.state.user.curSemester": {
 				deep: true,
 				deep: true,
-        immediate:true,
+				immediate: true,
 				handler(n, old) {
 				handler(n, old) {
 					if (n) {
 					if (n) {
+						this.scope = this.$route.name === "schoolExam" ? "school" : "private";
 						this.semesterRange = this.$tools.getStTimeByYearAndSemester(n.year, n.index);
 						this.semesterRange = this.$tools.getStTimeByYearAndSemester(n.year, n.index);
 						let curPeriod = this.$store.state.user.curPeriod;
 						let curPeriod = this.$store.state.user.curPeriod;
 						this.filterPeriod = curPeriod.id;
 						this.filterPeriod = curPeriod.id;