浏览代码

课堂观察

SanHQin 9 月之前
父节点
当前提交
f450576364

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

@@ -275,7 +275,8 @@ export default {
 						) {
 							this.loading = false;
 							this.loadNum = 2;
-							return this.$message.error("AI无法识别优化");
+							// this.$message.error("AI无法识别优化");
+							return 
 						}
 						let _copyData = JSON.parse(JSON.stringify(this.data));
 						// _copyData.jsonData.result = "";
@@ -297,7 +298,7 @@ export default {
 					})
 					.catch((err) => {
 						this.loadNum = 2;
-						this.$message.error("AI无法识别优化");
+						// this.$message.error("AI无法识别优化");
 						this.loading = false;
 					});
 			});

+ 16 - 0
src/components/pages/classroomObservation/components/analysisTemplateDialog.vue

@@ -186,16 +186,19 @@
 											style="background-color: #f0f2f5; color: black"
 											@click="editAnalysis(item)"
 											v-if="userId == item.userid"
+											class="bb_edit"
 										>
 											编辑
 										</div>
 										<div
 											style="border: solid 1px #3681fc; color: #3681fc"
+											class="bb_preview"
 											@click="previewAnalysis(item)"
 										>
 											预览
 										</div>
 										<div
+											class="bb_use"
 											style="background-color: #3681fc; color: white"
 											@click="useAnalysis(item)"
 										>
@@ -1069,6 +1072,7 @@ export default {
 	align-items: center;
 	border-radius: 6px;
 	cursor: pointer;
+	transition: .3s;
 }
 
 .analysisDetail {
@@ -1160,4 +1164,16 @@ export default {
 	padding: 12px;
 	box-sizing: border-box;
 }
+
+.bb_preview:hover{
+	background-color: #E0EAFB;
+}
+
+.bb_edit:hover{
+	background-color: #e4e6e9 !important;
+}
+
+.bb_use:hover{
+	background-color: #3171da !important;
+}
 </style>

+ 9 - 3
src/components/pages/classroomObservation/components/baseMessage.vue

@@ -70,7 +70,7 @@
 							style="width: 100%"
 							v-model="data.subject"
 							@change="changeData()"
-							placeholder="请选择年级"
+							placeholder="请选择科目"
 						>
 							<el-option
 								v-for="(item, index) in subjectList"
@@ -133,7 +133,7 @@
 							<div
 								class="m-m-fi-imageItem"
 								@click.stop="addImage()"
-								style="max-width:60%;"
+								style="max-width:32%;"
 								v-if="
 									imageList.fileList1 &&
 									imageList.fileList1.length +
@@ -339,6 +339,12 @@ export default {
 				{ value: "小学四年级", label: "小学四年级" },
 				{ value: "小学五年级", label: "小学五年级" },
 				{ value: "小学六年级", label: "小学六年级" },
+				{ value: "初中一年级", label: "初中一年级" },
+				{ value: "初中二年级", label: "初中二年级" },
+				{ value: "初中三年级", label: "初中三年级" },
+				{ value: "高中一年级", label: "高中一年级" },
+				{ value: "高中二年级", label: "高中二年级" },
+				{ value: "高中三年级", label: "高中三年级" },
 			],
 			subjectList: [
 				{ value: "语文", label: "语文" },
@@ -802,7 +808,7 @@ ${this.data.editorBarData.content}
 	margin-bottom: 20px;
 	display: flex;
 	justify-content: flex-start;
-	flex-wrap: wrap;
+	/* flex-wrap: wrap; */
 }
 
 .m-m-fi-imageList {

+ 35 - 14
src/components/pages/classroomObservation/components/chatArea.vue

@@ -618,7 +618,7 @@ export default {
 			input.type = "file";
 			// input.accept = ".wav";
 			// input.accept = "audio/*, .txt, .pdf, .xlsx";
-			input.accept = ".wav,.txt,.pdf,.xlsx,.doc,.docx";
+			input.accept = ".wav,.txt,.pdf,.xlsx,.doc,.docx,.csv";
 			input.click();
 			input.onchange = () => {
 				this.uploadFileLoading = true;
@@ -626,7 +626,7 @@ export default {
 				if (!/\.(wav|txt|pdf|xlsx|doc|docx)$/i.test(file.name)) {
 					this.uploadFileLoading = false;
 					return this.$message.info(
-						"请上传.wav,.txt,.pdf,.xlsx,.doc,.docx格式的文件"
+						"请上传.wav,.txt,.pdf,.xlsx,.doc,.docx,.csv格式的文件"
 					);
 				}
 				this.uploadFile(file, { changeText: true, flag: true });
@@ -1318,7 +1318,7 @@ export default {
 			let start = 0;
 			let end = 0;
 			let _pList = [];
-			let _step = 100;
+			let _step = 9999999999999999999;
 			let promiseList  = []
 			for(let i = 0;i<=list.length-1;i++){
 				_pList.push(list[i])
@@ -1332,6 +1332,7 @@ export default {
 						})
 						// let 
 					}))
+					_pList = [];
 					start = i;
 					continue;
 				}
@@ -1344,17 +1345,18 @@ export default {
 							list[startIndex+index2].aiBehavior = item2;
 						})
 					}))
+					_pList = [];
 					start = i;
 					break;
 				}
 			}
-
-			console.log(promiseList)
-
 			Promise.all(promiseList).then(_=>{
 				console.log('👇')
 				console.log(list)
 			})
+
+
+			
 			
 			// list.forEach((item,index)=>{
 			// 	if(index==0){
@@ -1370,9 +1372,19 @@ export default {
 			return new Promise((resolve,reject)=>{
 				let _uuid = uuidv4();
 				let _workText = '';
+				let _list = [];
 				list.forEach(i=>{
-					_workText+=`${i.message} ${i.time} ${i.role}\n`
-				}) 
+					_list.push({
+						index:i.index,
+						message:i.message,
+						time:i.time,
+						role:i.role,
+						behavior:"",
+					})
+				})
+				// list.forEach(i=>{
+				// 	_workText+=`${i.message} ${i.time} ${i.role}\n`
+				// }) 
 				let _msg = `Language: Please use the same language as the user requirement, if the user speaks Chinese, the specific text of your answer should also be in Chinese.
 ATTENTION: Use '##' to SPLIT SECTIONS, not '#'. Output format carefully referenced "Format example".
 Instruction: Based on the context, follow "Format example", write content
@@ -1515,11 +1527,12 @@ Instruction: Based on the context, follow "Format example", write content
 ## 数据
 
 这是你需要打标签的特定的多行文本:
-${_workText}
+${JSON.stringify(_list)}
 
 # Format example
-['老师讲话','学生提问','老师回答','老师评价或反馈','老师讲课','学生发言']
+[{index:1,message:"早上好",time:"00:00:2",role:"老师",behavior:"老师其它"},{index:2,message:"今天我们来学物理学",time:"00:00:5",role:"老师",behavior:"老师讲课"},{index:3,message:"有谁知道什么是物理吗",time:"00:00:3",role:"老师",behavior:"老师提问或点名"}]
 `
+				console.log(_msg)
 			let params = {
 			  assistant_id: '6063369f-289a-11ef-8bf4-12e77c4cb76b',
 			  userId: this.userId,
@@ -1539,7 +1552,10 @@ ${_workText}
 				// console.log(_data)
 				// console.log(JSON.parse(_data))
 				_data = JSON.parse(_data);
-				resolve({startIndex:start,endIndex:end,data:_data})
+				console.log("👇")
+				console.log(_data)
+				console.log("👆")
+				// resolve({startIndex:start,endIndex:end,data:_data})
 			}).catch(err=>{
 				console.log(err);
 				this.$message.error("行为编码错误")
@@ -1727,7 +1743,7 @@ ${_workText}
 							// 判断是不是音频文件
 							const audioRegex = /\.(mp3|wav|ogg|flac|m4a)$/i;
 							const txtRegex = /\.(txt)$/i;
-							const otherRegex = /\.(pdf|xlsx|doc|docx)$/i;
+							const otherRegex = /\.(pdf|xlsx|doc|docx|csv)$/i;
 							// if (audioRegex.test(data.Location)) {
 							// 	// console.log(data);
 							// 	_this.uploadWavFileAndGetText(file)
@@ -2016,10 +2032,13 @@ ${_workText}
 				// let div = document.createElement("div");
 				// div.innerHTML = this.editorBarData.content;
 				// return this.loading = false;
-				let _data = this.editorBarData.content;
-				let _div = document.createElement("div");
+				
 				let _sentence = 0;
 				let _words = 0;
+
+				if(this.editorBarData.type==0){
+					let _data = this.editorBarData.content;
+				let _div = document.createElement("div");
 				_div.innerHTML = _data;
 				let _test = []
 				let _tableRows = _div.querySelectorAll(`table tbody tr`);
@@ -2041,6 +2060,8 @@ ${_workText}
 					}
 				});
 				// this.getBehaviorCoding(_test)
+				}
+				
 				this.editorBarData.sentenceNum = _sentence;
 				this.editorBarData.wordsNum = _words;
 				this.$parent.saveWordFrequency({_sentence,_words})

+ 1 - 1
src/components/pages/classroomObservation/components/messageArea.vue

@@ -1319,7 +1319,7 @@ export default {
 			let data = this.dataList.find((i) => i.id == id);
 			if (data) {
 				this.saveData(data).then(() => {
-					this.$message.success("保存成功");
+					// this.$message.success("保存成功");
 				});
 			}
 		},