update

src/components/classRoomHelper/component/countdown.vue

@@ -500,7 +500,7 @@ export default {
 		return {
 			userid: this.$route.query.userid,
 			courseId: this.$route.query.courseId,
-			tcid: this.$route.query.tcid,
+			tcid2: this.$route.query.tcid,
 			showType: 0,
 			sourceUrl:
 				"https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/%E5%80%92%E8%AE%A1%E6%97%B6%E9%9F%B3%E4%B9%901721355956636.mp3",
@@ -945,7 +945,7 @@ export default {
 			let params = [
 				{
 					uid: this.userid,
-					courseId: this.courseId+this.tcid,
+					courseId: this.courseId+(this.tcid2?this.tcid2:""),
 					content: _html,
 				},
 			];
@@ -1346,10 +1346,10 @@ ${_textData}
 				});
 		},
 		selectMemorandum() {
-			this.memorandumLoading = false;
+			this.memorandumLoading = true;
 			let params = {
 				uid: this.userid,
-				courseId: this.courseId+this.tcid,
+				courseId: this.courseId+(this.tcid2?this.tcid2:""),
 			};
 			this.memorandumList = [];
 			this.ajax

src/components/classRoomHelper/component/searchArea.vue

@@ -1158,7 +1158,7 @@ export default {
 			videoCheck: false,
 			userid: this.$route.query.userid,
 			courseId: this.$route.query.courseId,
-			tcid: this.$route.query.tcid,
+			tcid2: this.$route.query.tcid,
 			imgNumList: ["U1", "U2", "U3", "U4"],
 			chatList: [],
 			nowChatList: [],
@@ -1350,7 +1350,7 @@ export default {
 			let params = [
 				{
 					uid: this.userid,
-					courseId: this.courseId+this.tcid,
+					courseId: this.courseId+(this.tcid2?this.tcid2:""),
 					content: _html,
 				},
 			];

src/components/classRoomHelper/component/taskArea.vue

@@ -500,7 +500,7 @@ export default {
       userid: this.$route.query.userid,
       courseId: this.$route.query.courseId,
       ttype: this.$route.query.tType,
-			tcid: this.$route.query.tcid,
+			tcid2: this.$route.query.tcid,
       loading: false,
       aiBoxLoading: false,
       chatLoading: false,
@@ -733,11 +733,14 @@ export default {
       let params = [
         {
           uid: this.userid,
-          courseId: this.courseId+this.tcid,
+          courseId: this.courseId+(this.tcid2?this.tcid2:''),
           content: _html
         }
       ];
 
+			console.log('👇')
+			console.log(params)
+
       this.ajax
         .post(
           this.$store.state.api + "insert_systemOperation_countdownBehavior",

src/components/classRoomHelper/index.vue

@@ -322,7 +322,7 @@ export default {
     return {
       userid: this.$route.query.userid,
       courseId: this.$route.query.courseId,
-			tcid: this.$route.query.tcid,
+			tcid2: this.$route.query.tcid,
       type: 0,
       itemType: 0, //0--无  1-搜索  2-任务 3-对话
       fileId: [],
@@ -353,7 +353,7 @@ export default {
       let params = [
         {
           uid: this.userid,
-          courseId: this.courseId+this.tcid,
+          courseId: this.courseId+(this.tcid2?this.tcid2:""),
           content: _html
         }
       ];

src/components/easy2/studyStudent.vue

@@ -12475,7 +12475,7 @@ export default {
 			//btn
 			let params = [{
 				uid:this.userid,
-				courseId:this.id+this.tcid2,
+				courseId:this.id+(this.tcid2?this.tcid2:""),
 				content:_html
 			}]
 
@@ -12884,12 +12884,12 @@ export default {
         this.getCourseDetail(2);
 				if(flag){
 					if(flag2){
-						this.insertMemorandum(`选择<span class="variable">工具${w+1}：${this.toolsList[this.navList[i].task[j].tool[k].tool]}</span>`)
+						this.insertMemorandum(`选择<span class="variable">工具${k+1}：${this.toolsList[this.navList[i].task[j].tool[k].tool]}</span>`)
 					}else{
-						this.insertMemorandum(`选择<span class="variable">任务${this.taskCount+1}${this.navList[this.courseType].task[this.taskCount].taskName?'：'+this.navList[this.courseType].task[this.taskCount].taskName:''}</span>→<span class="variable">工具${w+1}：${this.toolsList[this.navList[i].task[j].tool[k].tool]}</span>`)
+						this.insertMemorandum(`选择<span class="variable">任务${j+1}${this.navList[i].task[j].taskName?'：'+this.navList[i].task[j].taskName:''}</span>→<span class="variable">工具${k+1}：${this.toolsList[this.navList[i].task[j].tool[k].tool]}</span>`)
 					}
 				}else{
-					this.insertMemorandum(`选择<span class="variable">阶段${this.courseType+1}${this.navList[this.courseType].dyName?'：'+this.navList[this.courseType].dyName:''}</span>→<span class="variable">任务${this.taskCount+1}${this.navList[this.courseType].task[this.taskCount].taskName?'：'+this.navList[this.courseType].task[this.taskCount].taskName:''}</span>→<span class="variable">工具${w+1}：${this.toolsList[this.navList[i].task[j].tool[k].tool]}</span>`)
+					this.insertMemorandum(`选择<span class="variable">阶段${i+1}${this.navList[i].dyName?'：'+this.navList[i].dyName:''}</span>→<span class="variable">任务${j+1}${this.navList[i].task[j].taskName?'：'+this.navList[i].task[j].taskName:''}</span>→<span class="variable">工具${k+1}：${this.toolsList[this.navList[i].task[j].tool[k].tool]}</span>`)
 				}
       }
 
@@ -16439,11 +16439,7 @@ export default {
       }
 			let flag = this.courseType==s;
 
-			if(flag){
-				this.insertMemorandum(`进入<span class="variable">任务${this.taskCount+1}${this.navList[this.courseType].task[this.taskCount].taskName?'：'+this.navList[this.courseType].task[this.taskCount].taskName:''}</span>`)
-			}else{
-				this.insertMemorandum(`进入<span class="variable">阶段${this.courseType+1}${this.navList[this.courseType].dyName?'：'+this.navList[this.courseType].dyName:''}</span>→<span class="variable">任务${this.taskCount+1}${this.navList[this.courseType].task[this.taskCount].taskName?'：'+this.navList[this.courseType].task[this.taskCount].taskName:''}</span>`)
-			}
+
       this.courseType = s;
       this.navId = i;
       this.taskCount = n;
@@ -16497,6 +16493,11 @@ export default {
       this.selectPz();
       this.getHomeWork();
       this.getCourseDetail(2);
+			if(flag){
+				this.insertMemorandum(`进入<span class="variable">任务${n+1}${this.navList[s].task[n].taskName?'：'+this.navList[s].task[n].taskName:''}</span>`)
+			}else{
+				this.insertMemorandum(`进入<span class="variable">阶段${s+1}${this.navList[s].dyName?'：'+this.navList[s].dyName:''}</span>→<span class="variable">任务${n+1}${this.navList[s].task[n].taskName?'：'+this.navList[s].task[n].taskName:''}</span>`)
+			}
     },
 
     get(i) {

src/components/easy3/studyStudent.vue

@@ -12445,7 +12445,7 @@ export default {
 			//btn
 			let params = [{
 				uid:this.userid,
-				courseId:this.id+this.tcid2,
+				courseId:this.id+(this.tcid2?this.tcid2:''),
 				content:_html
 			}]
 
@@ -12744,12 +12744,12 @@ export default {
         this.getCourseDetail(2);
 				if(flag){
 					if(flag2){
-						this.insertMemorandum(`选择<span class="variable">工具${w+1}：${this.toolsList[this.navList[i].task[j].tool[k].tool]}</span>`)
+						this.insertMemorandum(`选择<span class="variable">工具${k+1}：${this.toolsList[this.navList[i].task[j].tool[k].tool]}</span>`)
 					}else{
-						this.insertMemorandum(`选择<span class="variable">任务${this.taskCount+1}${this.navList[this.courseType].task[this.taskCount].taskName?'：'+this.navList[this.courseType].task[this.taskCount].taskName:''}</span>→<span class="variable">工具${w+1}：${this.toolsList[this.navList[i].task[j].tool[k].tool]}</span>`)
+						this.insertMemorandum(`选择<span class="variable">任务${j+1}${this.navList[i].task[j].taskName?'：'+this.navList[i].task[j].taskName:''}</span>→<span class="variable">工具${k+1}：${this.toolsList[this.navList[i].task[j].tool[k].tool]}</span>`)
 					}
 				}else{
-					this.insertMemorandum(`选择<span class="variable">阶段${this.courseType+1}${this.navList[this.courseType].dyName?'：'+this.navList[this.courseType].dyName:''}</span>→<span class="variable">任务${this.taskCount+1}${this.navList[this.courseType].task[this.taskCount].taskName?'：'+this.navList[this.courseType].task[this.taskCount].taskName:''}</span>→<span class="variable">工具${w+1}：${this.toolsList[this.navList[i].task[j].tool[k].tool]}</span>`)
+					this.insertMemorandum(`选择<span class="variable">阶段${i+1}${this.navList[i].dyName?'：'+this.navList[i].dyName:''}</span>→<span class="variable">任务${j+1}${this.navList[i].task[j].taskName?'：'+this.navList[i].task[j].taskName:''}</span>→<span class="variable">工具${k+1}：${this.toolsList[this.navList[i].task[j].tool[k].tool]}</span>`)
 				}
       }
 
@@ -16287,11 +16287,7 @@ export default {
 
 			let flag = this.courseType==s;
 
-			if(flag){
-				this.insertMemorandum(`进入<span class="variable">任务${this.taskCount+1}${this.navList[this.courseType].task[this.taskCount].taskName?'：'+this.navList[this.courseType].task[this.taskCount].taskName:''}</span>`)
-			}else{
-				this.insertMemorandum(`进入<span class="variable">阶段${this.courseType+1}${this.navList[this.courseType].dyName?'：'+this.navList[this.courseType].dyName:''}</span>→<span class="variable">任务${this.taskCount+1}${this.navList[this.courseType].task[this.taskCount].taskName?'：'+this.navList[this.courseType].task[this.taskCount].taskName:''}</span>`)
-			}
+	
       this.courseType = s;
       this.navId = i;
       this.taskCount = n;
@@ -16345,6 +16341,11 @@ export default {
       this.selectPz();
       this.getHomeWork();
       this.getCourseDetail(2);
+			if(flag){
+				this.insertMemorandum(`进入<span class="variable">任务${n+1}${this.navList[s].task[n].taskName?'：'+this.navList[s].task[n].taskName:''}</span>`)
+			}else{
+				this.insertMemorandum(`进入<span class="variable">阶段${s+1}${this.navList[s].dyName?'：'+this.navList[s].dyName:''}</span>→<span class="variable">任务${n+1}${this.navList[s].task[n].taskName?'：'+this.navList[s].task[n].taskName:''}</span>`)
+			}
     },
 
     get(i) {

src/components/studyStudent.vue

@@ -12423,10 +12423,10 @@ export default {
 			//btn
 			let params = [{
 				uid:this.userid,
-				courseId:this.id+this.tcid2,
+				courseId:this.id+(this.tcid2?this.tcid2:''),
 				content:_html
 			}]
-
+			console.log("👇👇")
 			console.log(params)
 
 			this.ajax.post(this.$store.state.api+'insert_systemOperation_countdownBehavior',params).then(res=>{
@@ -12722,12 +12722,12 @@ export default {
         this.getCourseDetail(2);
 				if(flag){
 					if(flag2){
-						this.insertMemorandum(`选择<span class="variable">工具${w+1}：${this.toolsList[this.navList[i].task[j].tool[k].tool]}</span>`)
+						this.insertMemorandum(`选择<span class="variable">工具${k+1}：${this.toolsList[this.navList[i].task[j].tool[k].tool]}</span>`)
 					}else{
-						this.insertMemorandum(`选择<span class="variable">任务${this.taskCount+1}${this.navList[this.courseType].task[this.taskCount].taskName?'：'+this.navList[this.courseType].task[this.taskCount].taskName:''}</span>→<span class="variable">工具${w+1}：${this.toolsList[this.navList[i].task[j].tool[k].tool]}</span>`)
+						this.insertMemorandum(`选择<span class="variable">任务${j+1}${this.navList[i].task[j].taskName?'：'+this.navList[i].task[j].taskName:''}</span>→<span class="variable">工具${k+1}：${this.toolsList[this.navList[i].task[j].tool[k].tool]}</span>`)
 					}
 				}else{
-					this.insertMemorandum(`选择<span class="variable">阶段${this.courseType+1}${this.navList[this.courseType].dyName?'：'+this.navList[this.courseType].dyName:''}</span>→<span class="variable">任务${this.taskCount+1}${this.navList[this.courseType].task[this.taskCount].taskName?'：'+this.navList[this.courseType].task[this.taskCount].taskName:''}</span>→<span class="variable">工具${w+1}：${this.toolsList[this.navList[i].task[j].tool[k].tool]}</span>`)
+					this.insertMemorandum(`选择<span class="variable">阶段${i+1}${this.navList[i].dyName?'：'+this.navList[i].dyName:''}</span>→<span class="variable">任务${j+1}${this.navList[i].task[j].taskName?'：'+this.navList[i].task[j].taskName:''}</span>→<span class="variable">工具${k+1}：${this.toolsList[this.navList[i].task[j].tool[k].tool]}</span>`)
 				}
       }
 
@@ -16276,11 +16276,7 @@ export default {
 			
       this.navId = i;
       this.taskCount = n;
-			if(flag){
-				this.insertMemorandum(`进入<span class="variable">任务${this.taskCount+1}${this.navList[this.courseType].task[this.taskCount].taskName?'：'+this.navList[this.courseType].task[this.taskCount].taskName:''}</span>`)
-			}else{
-				this.insertMemorandum(`进入<span class="variable">阶段${this.courseType+1}${this.navList[this.courseType].dyName?'：'+this.navList[this.courseType].dyName:''}</span>→<span class="variable">任务${this.taskCount+1}${this.navList[this.courseType].task[this.taskCount].taskName?'：'+this.navList[this.courseType].task[this.taskCount].taskName:''}</span>`)
-			}
+			
 			
       if(ctype == 2){
         this.navList[s].task[n].isOpen = true
@@ -16336,6 +16332,11 @@ export default {
       this.selectPz();
       this.getHomeWork();
       this.getCourseDetail(2);
+			if(flag){
+				this.insertMemorandum(`进入<span class="variable">任务${n+1}${this.navList[s].task[n].taskName?'：'+this.navList[s].task[n].taskName:''}</span>`)
+			}else{
+				this.insertMemorandum(`进入<span class="variable">阶段${s+1}${this.navList[s].dyName?'：'+this.navList[s].dyName:''}</span>→<span class="variable">任务${n+1}${this.navList[s].task[n].taskName?'：'+this.navList[s].task[n].taskName:''}</span>`)
+			}
     },
 
     get(i) {