试卷从Blob读取后添加scope

TEAMModelOS/ClientApp/src/utils/evTools.js

@@ -360,6 +360,8 @@ export default {
 			try{
 				let jsonInfo = await $tools.getFile(fullPath)
 				let jsonData = JSON.parse(jsonInfo)
+				jsonData.scope = 'private'
+				jsonData.code = tmdId
 				// 获取试卷包含的试题数据并包装好
 				if(jsonData.slides && jsonData.slides.length){
 					let promiseArr = []
@@ -423,6 +425,8 @@ export default {
 			try{
 				let jsonInfo = await $tools.getFile(blobHost + paper.blob + '/index.json' + sasString.sas)
 				let jsonData = JSON.parse(jsonInfo)
+				jsonData.scope = curScope
+				jsonData.code = paper.code
 				// 获取试卷包含的试题数据并包装好
 				if(jsonData.slides && jsonData.slides.length){
 					let promiseArr = []
@@ -489,6 +493,8 @@ export default {
 			try {
 				let jsonInfo = await $tools.getFile(sasString.url + '/' + paper.code + paper.blob + '/index.json' + sasString.sas)
 				let jsonData = JSON.parse(jsonInfo)
+				jsonData.scope = curScope
+				jsonData.code = paper.code
 				// 获取试卷包含的试题数据并包装好
 				if (jsonData.slides && jsonData.slides.length) {
 					jsonData.item = []

TEAMModelOS/ClientApp/src/utils/public.js

@@ -281,9 +281,11 @@ export default {
 						break;
 					case 404:
 						Message.error('未访问到资源！')
+						reject(404)
 						break;
 					case 403:
 						Message.error('授权异常，无法访问！')
+						reject(403)
 						break;		
 					default:
 						break;

TEAMModelOS/ClientApp/src/view/answersheet/index.vue

@@ -393,8 +393,7 @@
 			})
 		},
 		beforeRouteLeave(to, from, next) {
-			if(to.name === 'newSchoolPaper' || to.name === 'newPrivatePaper' || to.name === 'schoplBank' || to.name === 'personalBank'){
-				console.error(to)
+			if(to.name === 'newSchoolPaper' || to.name === 'newPrivatePaper' || to.name === 'schoolBank' || to.name === 'personalBank'){
 				// 设置下一个路由的 meta
 				to.meta.isKeep = true;  // 让 A 缓存，即不刷新
 			}

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

@@ -149,6 +149,9 @@
 				// 设置下一个路由的 meta
 				to.meta.isKeep = false;  // 让 A 缓存，即不刷新
 			}
+			if(to.name === 'answerSheet'){
+				from.meta.isKeep = true
+			}
 			next();
 		},
 		watch: {

TEAMModelOS/ClientApp/src/view/evaluation/index/CreatePaper.vue

@@ -264,6 +264,9 @@
 			/* 给导入的试题 补充最新的试卷学段年级以及科目信息 */
 			refreshImportItems(list) {
 				return new Promise((r, reject) => {
+					console.log(this.schoolInfo);
+					console.log(this.evaluationInfo);
+					console.log(this.evaluationInfo.paperPeriod);
 					let objectiveTypes = ['single', 'multiple']
 					let code = this.isSchool ? this.$store.state.userInfo.schoolCode : this.$store.state.userInfo
 						.TEAMModelId
@@ -1166,15 +1169,12 @@
 
 		beforeRouteEnter(to, from, next) {
 			if (from.name === 'answerSheet' && (to.name === 'newSchoolPaper' || to.name === 'newPrivatePaper')) {
-				console.log('xxxxxxxxxxxx',to)
 				to.meta.isKeep = true
 			}
 			next()
 		},
 		beforeRouteLeave(to, from, next) {
 			if(to.name === 'answerSheet'){
-				console.error(to)
-				console.error(from)
 				// 设置下一个路由的 meta
 				from.meta.isKeep = true;  // 让 A 缓存，即不刷新
 			}