OnePsycho 1 year ago
parent
commit
d772bda54e

+ 2 - 2
TEAMModelOS/ClientApp/src/common/BaseLayout.vue

@@ -751,7 +751,7 @@
 									permission: "dashboard-read",
 									menuName: "dashCenter",
 									child: [],
-									isShow: !this.isGlobalSite,
+									isShow: true,
 								},
 								// 学校管理
 								{
@@ -1261,7 +1261,7 @@
 									menuName: "ResearchMgt",
 									permission: "research-read|research-upd",
 									child: [],
-									isShow: this.edition !== "artTest" && this.IES5Menu && !this.isGlobalSite
+									isShow: this.edition !== "artTest" && this.IES5Menu && !this.isGlobalSite && this.isOpenLessonRecord
 								},
 								// 学情分析(国际站单独)
 								{

+ 7 - 0
TEAMModelOS/ClientApp/src/view/evaluation/components/BaseExerciseList.vue

@@ -558,6 +558,8 @@ export default {
      * @param item
      */
     handleToolEdit(arr, item, index) {
+      console.error(this.errorList)
+      console.error(item)
       this.currentExerciseIndex = this.exerciseList.indexOf(item) // 清单列表下的index
       this.curOrderIndex = index
       if (item.scope === 'school') {
@@ -788,6 +790,11 @@ export default {
         preOrderList.splice(this.curOrderIndex, 1, item)
         this.paper.item = preOrderList
       }
+      /* 如果编辑好的题目是之前错误的题目 则移除掉 */
+      let isErrorItemIndex = this.errorList.findIndex(i => i.id === item.id)
+      if(isErrorItemIndex > -1){
+        this.errorList.splice(isErrorItemIndex, 1)
+      }
     },
 
 

+ 0 - 2
TEAMModelOS/ClientApp/src/view/evaluation/types/BaseJudge.vue

@@ -74,8 +74,6 @@
 		watch:{
 			editInfo:{
 				handler(n){
-					console.log('主观题富文本接收到的数据')
-					console.log(n)
 					if(n){
 						this.stemEditor.txt.html(this.editInfo.question)
 						this.stemContent = this.editInfo.question

+ 2 - 1
TEAMModelOS/ClientApp/src/view/evaluation/types/BaseMultiple.vue

@@ -297,11 +297,12 @@
 			this.$editorTools.initMyEditor(stemEditor,this)
 			stemEditor.create()
 			this.stemEditor = stemEditor
-			this.initEditors()
 
 			if (this.editInfo && this.isEdit) { 
 				console.log('进入多选题Mounted编辑')
 				this.doRender(this.editInfo)
+			}else{
+				this.initEditors()
 			}
 		},
 		computed: {

+ 2 - 1
TEAMModelOS/ClientApp/src/view/evaluation/types/BaseSingle.vue

@@ -248,7 +248,6 @@
 
 			stemEditor.create()
 			this.stemEditor = stemEditor
-			this.initEditors();
 			
 			if (this.editInfo && this.isEdit) {
 				console.log('进入单选题Mounted编辑',this.editInfo)
@@ -263,6 +262,8 @@
 					this.initEditors()
 					this.stemEditor.txt.html(this.editSingleInfo.question)
 				})
+			}else{
+				this.initEditors();
 			}
 		},
 		watch: {