Преглед изворни кода

Merge branch 'develop6.0-tmd' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop6.0-tmd

liqk пре 3 година
родитељ
комит
743c20140e
1 измењених фајлова са 10 додато и 4 уклоњено
  1. 10 4
      TEAMModelOS/ClientApp/src/common/BaseSelectSchool.vue

+ 10 - 4
TEAMModelOS/ClientApp/src/common/BaseSelectSchool.vue

@@ -167,13 +167,19 @@
 					if (res) {
 						this.$User.freshLogin()
 					}
-					console.log(localStorage.getItem('auth_token'))
 					console.log('切换学校了',this.curSchool,schoolCode)
-					console.log('当前学校的学段信息',this.$store.state.user.schoolProfile.school_base.id)
 					console.log('当前学校的学段信息',this.$store.state.user.schoolProfile.school_base.period)
 					this.periods = this.$store.state.user.schoolProfile.school_base.period
-					this.periods && (this.curPeriod = this.periods[0])
-					this.onPeriodSelect(0)
+					let vuexPeriod = this.$store.state.user.curPeriod
+					let preSchoolCode = localStorage.getItem('cur_schoolCode')
+					// 判断之前已经选择了学段 并且从区级切换回来的是同一学校 则去读取存储的学段数据 否则默认读取第一个学段信息
+					if(vuexPeriod && preSchoolCode && preSchoolCode === schoolCode){
+						this.onPeriodSelect(vuexPeriod.periodIndex)
+					}else{
+						this.onPeriodSelect(0)
+					}
+					localStorage.setItem('cur_schoolCode',schoolCode)
+					// this.periods && (this.curPeriod = this.periods[0])
 					setTimeout(() => {
 						this.$EventBus.$emit('onGlobalLoading', false)
 					}, 1500)