update

TEAMModelOS/ClientApp/src/common/BaseSelectSchool.vue

@@ -333,7 +333,7 @@
 			},
 			/* 判断是否要显示学年期切换控件 */
 			showSemesterSelect() {
-				let routeArr = ["/home/CusMgt"];
+				let routeArr = ["/home/CusMgt","/home/manageVote","/home/manageQuestionnaire"];
 				return routeArr.includes(this.$route.path);
 			}
 		}

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

@@ -262,7 +262,7 @@ export default {
     this.pageSize = this.isAnalysis ? 999 : 5
     this.pageChange(1)
     this.getScatterData()
-    this.paperInfo = JSON.parse(localStorage.curExam)
+    this.paperInfo = localStorage.curExam ? JSON.parse(localStorage.curExam) : null
   },
   methods: {
     onPrintItem(e, index) {

TEAMModelOS/ClientApp/src/view/joinclass/JoinClass.vue

@@ -172,10 +172,10 @@ export default {
                             sessionStorage.setItem('identity', 'student')
                         } else if (res.status == 4) {// 个人名单未开放加入
                             this.$Message.warning(this.$t('cusMgt.join.joinLock'))
-                        } else if (res.status == 6) {// 没有开启审核模式
-                            this.$Message.warning('没有开启审核模式')
-                        } else if (res.status == 5) {// 人数已满，需要审核通过再加入
+                        } else if (res.status == 6) {// 需要审核通过再加入
                             this.$Message.warning('需要审核通过再加入')
+                        } else if (res.status == 5) {// 人数已满，需要审核通过再加入
+                            this.$Message.warning('人数已满')
                         } else if (res.status == 7) {// 二维码设置已经过期
                             this.$Message.warning('二维码设置已经过期')
                         }

TEAMModelOS/ClientApp/src/view/mycourse/MyCourse.vue

@@ -505,6 +505,9 @@
 				let stulist = this.courseGroupList.find((item) => {
 					return item.id == this.teaClassList[this.curClassIndex].stulist;
 				});
+				let groupIndex = this.courseGroupList.findIndex((item) => {
+					return item.id == this.teaClassList[this.curClassIndex].stulist;
+				});
 				if (stulist) {
 					console.log(stulist)
 					let params = stulist;
@@ -516,13 +519,16 @@
 						.upsertGroupInfo(params)
 						.then(
 							(res) => {
-								console.log(res)
 								this.qrSetting = {
 									review: res.list.review ? true : false,
 									limitCount: res.list.limitCount,
 									qrcodeDays: res.list.qrcodeDays || 1,
 									qrcodeExpire:res.list.qrcodeExpire
 								}
+								this.teaClassList[this.curClassIndex].review = res.list.review
+								this.teaClassList[this.curClassIndex].limitCount = res.list.limitCount
+								this.teaClassList[this.curClassIndex].qrcodeDays = res.list.qrcodeDays
+								this.teaClassList[this.curClassIndex].qrcodeExpire = res.list.qrcodeExpire
 								console.log(this.qrSetting)
 								this.$Message.info(this.$t("cusMgt.updOk"));
 							},

TEAMModelOS/ClientApp/src/view/questionnaire/ManageQuestionnaire.vue

@@ -573,6 +573,13 @@ export default {
             }
           })
         } else {
+          // 如果是学校活动 则需要带上查询的学期起止时间
+						if (!this.isPrivate) {
+							let curSemester = this.$store.state.user.curSemester;
+							let semesterRange = this.$tools.getStTimeByYearAndSemester(curSemester.year, curSemester.index);
+							data.stime = semesterRange.stime;
+							data.etime = semesterRange.etime;
+						}
           this.$api.questionnaire.FindSurveys(data).then(res => {
             if (!res.error) {
               r(res)
@@ -1567,6 +1574,13 @@ export default {
       },
       immediate: true,
     },
+    "$store.state.user.curSemester": {
+				deep: true,
+				handler(n, old) {
+          this.continueToken = null
+					this.handleTabClick(this.$route.name === "manageQuestionnaire" ? 0 : 1);
+				}
+			}
   },
 };
 </script>

TEAMModelOS/ClientApp/src/view/syllabus/Syllabus.vue

@@ -415,6 +415,7 @@ export default {
   },
   data() {
     return {
+      curSemesterTimeRange:null,
       importNodes: null,
       excelData: null,
       previewTree: null,
@@ -2841,7 +2842,23 @@ export default {
           this.currentPeriodIndex = n.periodIndex
         }
       }
-    }
+    },
+    // '$store.state.user.curSemester': {
+    //   deep: true,
+    //   immediate: true,
+    //   handler(n, old) {
+    //     if (n && this.$route.name === 'syllabus') {
+    //       this.nodeItems = []
+    //       this.tabResources = []
+    //       let curPeriodIndex = this.$store.state.user.curPeriod.periodIndex
+    //       this.curSemesterTimeRange = this.$tools.getStTimeByYearAndSemester(n.year,n.index)
+    //       console.error(n);
+    //       console.error(this.curSemesterTimeRange);
+    //       this.getSchoolInfo(curPeriodIndex)
+    //       this.currentPeriodIndex = curPeriodIndex
+    //     }
+    //   }
+    // }
   }
 }
 </script>