SanHQin преди 11 месеца
родител
ревизия
1f2f14f496

+ 5 - 0
src/components/pages/classroomObservation/components/analysis.vue

@@ -66,6 +66,11 @@ export default {
 		editItem(id,_data){
 			this.$emit("editItem",id,_data)
 		},
+		getReport(){
+			this.$refs.analysisItemRef.forEach(i=>{
+				i.editBtn();
+			})
+		}
 	},
 };
 </script>

+ 4 - 3
src/components/pages/classroomObservation/components/analysisItem.vue

@@ -119,6 +119,7 @@ export default {
 			this.$message.info("回退右");
 		},
 		editBtn() {
+			console.log("👇")
 			this.loading = true;
 			let assistant_id = {
 					"课堂观察": { value: "8ab07d41-e143-11ee-aaca-12e77c4cb76b", type: 0 },
@@ -134,7 +135,7 @@ export default {
 						value: "eac63117-00a7-11ef-aaca-12e77c4cb76b",
 						type: 0,
 					},
-					"麦锡问题分类": {
+					"麦锡问题分类": {
 						value: "18545cf7-0125-11ef-aaca-12e77c4cb76b",
 						type: 0,
 					},
@@ -178,11 +179,11 @@ export default {
 						value:"25e53379-0152-11ef-aaca-12e77c4cb76b",
 						type:3,
 					},
-					"scop课堂观察":{
+					"SCOP课堂观察":{
 						value:"d0c76d35-0152-11ef-aaca-12e77c4cb76b",
 						type:3,
 					},
-					"rtop课堂观察":{
+					"RTOP课堂观察":{
 						value:"2ace7ff6-0154-11ef-aaca-12e77c4cb76b",
 						type:3
 					}

+ 39 - 0
src/components/pages/classroomObservation/components/messageArea.vue

@@ -25,6 +25,7 @@
 			/>
 
 			<analysis @updateMessage="updateMessage"
+				ref="analysis0"
 				@delItem="delAnalysisItem"
 				@editItem="editAnalysisItem"
 				title="通用课堂分析"
@@ -32,6 +33,7 @@
 				:tid="tid"
 				:fileId="fileId"/>
 			<analysis @updateMessage="updateMessage"
+				ref="analysis1"
 				@delItem="delAnalysisItem"
 				@editItem="editAnalysisItem"
 				title="科学课堂分析"
@@ -39,6 +41,7 @@
 				:tid="tid"
 				:fileId="fileId"/>
 			<analysis @updateMessage="updateMessage"
+				ref="analysis2"
 				@delItem="delAnalysisItem"
 				@editItem="editAnalysisItem"
 				title="扩展分析"
@@ -46,6 +49,7 @@
 				:tid="tid"
 				:fileId="fileId"/>
 			<analysis @updateMessage="updateMessage"
+				ref="analysis3"
 				@delItem="delAnalysisItem"
 				@editItem="editAnalysisItem"
 				title="增值性分析"
@@ -206,6 +210,7 @@ export default {
 			currencyLoading: false,
 			scienceLoading: false,
 			extendLoading: false,
+			valueAddedLoading:false,
 			input2: "",
 			dialogTagList: [
 				{ id: 0, name: "通用课堂分析" },
@@ -1065,6 +1070,7 @@ BSCS 5E教学模型是一种广泛应用于科学教育的教学策略,它鼓
 					if (_data.length == 0) {
 						return (this.currencyLoading = false);
 					}
+					console.log(_data)
 					let _bmData = _data[0];
 					// 基础信息
 					_bmData.jsonData = JSON.parse(_bmData.jsonData);
@@ -1137,11 +1143,38 @@ BSCS 5E教学模型是一种广泛应用于科学教育的教学策略,它鼓
 					this.extendLoading = false;
 				});
 		},
+		getValueAddedData(){
+			let pram = {
+				tid: this.tid,
+				// tid:'02',
+				type: "3",
+			};
+			this.valueAddedLoading = true;
+			this.ajax
+				.post("https://gpt4.cocorobo.cn/get_classroom_observation_new", pram)
+				.then((res) => {
+					let _data = res.data.FunctionResponse.result.length
+						? JSON.parse(res.data.FunctionResponse.result)
+						: [];
+					if (_data.length == 0) {
+						return (this.valueAddedLoading = false);
+					}
+					let valueAdded = [];
+					for (let i = 0; i < _data.length; i++) {
+						let _valueAdded = _data[i];
+						_valueAdded.jsonData = JSON.parse(_valueAdded.jsonData);
+						valueAdded.push(_valueAdded);
+					}
+					this.dataList.push(...valueAdded);
+					this.valueAddedLoading = false;
+				});
+		},
 		getData() {
 			this.dataList = [];
 			this.getCurrencyAndBaseMessageData();
 			this.getScienceData();
 			this.getExtendData();
+			this.getValueAddedData();
 			this.getFileId();
 		},
 		saveData(fn) {
@@ -1189,6 +1222,12 @@ BSCS 5E教学模型是一种广泛应用于科学教育的教学策略,它鼓
 				fn ? fn() : "";
 			});
 		},
+		getReport(){
+			this.$refs.analysis0.getReport()
+			this.$refs.analysis1.getReport()
+			this.$refs.analysis2.getReport()
+			this.$refs.analysis3.getReport()
+		}
 	},
 	mounted() {
 		this.getData();

+ 36 - 35
src/components/pages/classroomObservation/index.vue

@@ -107,41 +107,42 @@ export default {
 		},
 		// 生成报告
 		getReport() {
-			let assistant_title = [
-				"课堂观察",
-				"教学阶段九事件分析",
-				"OMO智慧课堂分析",
-				"布鲁姆问题分类",
-				"麦克锡问题分类",
-				"学生回答统计",
-				"课堂活动类型",
-				"素养目标分析",
-				"科学教育目标分析",
-				"5E课程改编",
-				"5EX课程改编",
-				"UTOP课程观察",
-				"RST模型",
-				"RTOP模型",
-				"课堂质量评价",
-				"scop课堂观察",
-				"rtop课堂观察",
-			]
-			let _index = 0;
-			let _this = this;
-			function addValue(){
-				_this.$refs.messageAreaRef.addAnalysisItem({title:assistant_title[_index]}).then(_=>{
-					_index+=1;
-					if(_index<assistant_title.length){
-							addValue()
-					}
-				}).catch(_=>{
-					_index+=1;
-					if(_index<assistant_title.length){
-						addValue()
-					}
-				})
-			}
-			addValue()
+			this.$refs.messageAreaRef.getReport()
+			// let assistant_title = [
+			// 	"课堂观察",
+			// 	"教学阶段九事件分析",
+			// 	"OMO智慧课堂分析",
+			// 	"布鲁姆问题分类",
+			// 	"麦克锡问题分类",
+			// 	"学生回答统计",
+			// 	"课堂活动类型",
+			// 	"素养目标分析",
+			// 	"科学教育目标分析",
+			// 	"5E课程改编",
+			// 	"5EX课程改编",
+			// 	"UTOP课程观察",
+			// 	"RST模型",
+			// 	"RTOP模型",
+			// 	"课堂质量评价",
+			// 	"scop课堂观察",
+			// 	"rtop课堂观察",
+			// ]
+			// let _index = 0;
+			// let _this = this;
+			// function addValue(){
+			// 	_this.$refs.messageAreaRef.addAnalysisItem({title:assistant_title[_index]}).then(_=>{
+			// 		_index+=1;
+			// 		if(_index<assistant_title.length){
+			// 				addValue()
+			// 		}
+			// 	}).catch(_=>{
+			// 		_index+=1;
+			// 		if(_index<assistant_title.length){
+			// 			addValue()
+			// 		}
+			// 	})
+			// }
+			// addValue()
 		},
 		//预览
 		preview() {