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

+ 18 - 0
src/common/axios.config.js

@@ -82,6 +82,23 @@ function post(url, params) {
             })
     })
 }
+
+//返回一个Promise(发送put请求)
+function put(url, params) {
+	return new Promise((resolve, reject) => {
+			axios.put(url, params)
+					.then(response => {
+							resolve(response);
+					}, err => {
+							reject(err);
+					})
+					.catch((error) => {
+							reject(error)
+					})
+	})
+}
+
+
 ////返回一个Promise(发送get请求)
 function get(url, param) {
     return new Promise((resolve, reject) => {
@@ -99,4 +116,5 @@ function get(url, param) {
 export default {
     get,
     post,
+		put,
 }

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

@@ -13,7 +13,7 @@
 			</div>
 		</div>
 		<div class="a-main" v-show="showItem">
-			<analysisItem ref="analysisItemRef" v-if="analysisItemList.length > 0" v-for="(item,index) in analysisItemList" :key="item.id" :data="item" :tid="tid" :index="index" @delItem="delItem" @editItem="editItem"/>
+			<analysisItem ref="analysisItemRef" v-if="analysisItemList.length > 0" v-for="(item,index) in analysisItemList" :key="item.id" :data="item" :tid="tid" :fileId="fileId" :index="index" @delItem="delItem" @editItem="editItem"/>
 			<div class="a_m_empty" v-if="analysisItemList.length == 0">暂无模块...</div>
 		</div>
 	</div>
@@ -37,6 +37,10 @@ export default {
 		tid:{
 			type:String,
 			require:true,
+		},
+		fileId:{
+			type:String,
+			require:true,
 		}
 	},
 	components: {

+ 5 - 1
src/components/pages/classroomObservation/components/analysisItem.vue

@@ -78,6 +78,10 @@ export default {
 		tid:{
 			type:String,
 			require:true,
+		},
+		fileId:{
+			type:String,
+			require:true,
 		}
 	},
 	data() {
@@ -192,7 +196,7 @@ export default {
 				message: "请使用代码解析器获取文件,帮我根据要求完整的分析,输出请按照要求。",
 				session_name: new Date().getTime(),
 				userId:"1cf9dc4b-d95f-11ea-af4c-52540005ab01",
-				file_ids:file_ids[this.tid],
+				file_ids:this.fileId?[this.fileId]:file_ids[this.tid],
 			}
 
 			if(!parm.assistant_id){

+ 16 - 2
src/components/pages/classroomObservation/components/chatArea.vue

@@ -229,6 +229,7 @@ const clickOutside = {
 	},
 };
 export default {
+	emits:["updateFileId"],
 	components: {
 		startPage,
 		transcription,
@@ -445,11 +446,24 @@ Markdown表格Markdown表格Markdown表格Markdown表格Markdown表格Markdown
 							// console.log("Uploaded : " + parseInt((evt.loaded * 80) / evt.total) + '%');
 						})
 						.send(function (err, data) {
-							_this.loading = false;
 							if (err) {
 								_this.$message.error("上传失败");
+								_this.loading = false;
 							} else {
-								_this.textareaValue = data.Location;
+								_this.ajax.put("https://gpt4.cocorobo.cn/upload_file_knowledge",{url: data.Location}).then(res=>{
+									let _data = res.data.FunctionResponse;
+									if(_data.result && _data.result.id){
+										_this.$emit("updateFileId", _data.result.id)
+									}else{
+										_this.$message.error("上传失败")
+									}
+									_this.loading = false;
+									// this.$emit("updateFileId", data.Location)
+								}).catch(e=>{
+									_this.loading = false;
+									_this.$message.error("上传失败")
+								})
+								
 							}
 						});
 				}

+ 13 - 5
src/components/pages/classroomObservation/components/messageArea.vue

@@ -29,25 +29,29 @@
 				@editItem="editAnalysisItem"
 				title="通用课堂分析"
 				:analysisItemList="dataList.filter((i) => i.Type === 0)"
-				:tid="tid"/>
+				:tid="tid"
+				:fileId="fileId"/>
 			<analysis @updateMessage="updateMessage"
 				@delItem="delAnalysisItem"
 				@editItem="editAnalysisItem"
 				title="科学课堂分析"
 				:analysisItemList="dataList.filter((i) => i.Type === 1)"
-				:tid="tid"/>
+				:tid="tid"
+				:fileId="fileId"/>
 			<analysis @updateMessage="updateMessage"
 				@delItem="delAnalysisItem"
 				@editItem="editAnalysisItem"
 				title="扩展分析"
 				:analysisItemList="dataList.filter((i) => i.Type === 2)"
-				:tid="tid"/>
+				:tid="tid"
+				:fileId="fileId"/>
 			<analysis @updateMessage="updateMessage"
 				@delItem="delAnalysisItem"
 				@editItem="editAnalysisItem"
 				title="增值性分析"
 				:analysisItemList="dataList.filter((i) => i.Type === 3)"
-				:tid="tid"/>
+				:tid="tid"
+				:fileId="fileId"/>
 			<!-- <currencyAnalysis
 				@updateMessage="updateMessage"
 				@delItem="delAnalysisItem"
@@ -187,6 +191,10 @@ export default {
 			type: String,
 			default: "",
 		},
+		fileId:{
+			type:String,
+			default:""
+		}
 	},
 	data() {
 		return {
@@ -977,7 +985,7 @@ BSCS 5E教学模型是一种广泛应用于科学教育的教学策略,它鼓
 					message: "请使用代码解析器获取文件,帮我根据要求完整的分析,输出请按照要求。",
 					session_name: new Date().getTime(),
 					userId: "1cf9dc4b-d95f-11ea-af4c-52540005ab01",
-					file_ids: file_ids[this.tid],
+					file_ids: this.fileId?[this.fileId]:file_ids[this.tid],
 				};
 
 				if (!parm.assistant_id) {

+ 6 - 2
src/components/pages/classroomObservation/index.vue

@@ -54,10 +54,10 @@
 		</div>
 		<div class="co-main">
 			<div class="co-m-left">
-				<chatArea :tid="tid"/>
+				<chatArea :tid="tid" @updateFileId="updateFileId"/>
 			</div>
 			<div class="co-m-right">
-				<messageArea :tid="tid" ref="messageAreaRef"/>
+				<messageArea :tid="tid" :fileId="fileId" ref="messageAreaRef"/>
 			</div>
 		</div>
 	</div>
@@ -78,6 +78,7 @@ export default {
 			title: "12月19日会议录音",
 			loading: false,
 			tid:'03',
+			fileId:"",
 			optionData:[
 				{label:"03课程",value:'03'},
 				{label:"04课程",value:'04'},
@@ -93,6 +94,9 @@ export default {
 				this.$refs.messageAreaRef.getData();
 			})
 		},
+		updateFileId(newValue){
+			this.fileId = newValue;
+		},
 		// 跳转
 		goTo(path) {
 			this.$message.info(`去到:${path}`);