知识点&&补救资源

TEAMModelOS.SDK/Models/Cosmos/Common/Inner/Repair.cs

@@ -12,11 +12,11 @@ namespace TEAMModelOS.SDK.Models.Cosmos.Common.Inner
         /// <summary>
         /// 文件名字
         /// </summary>
-        public string name { get; set; }
+        //public string name { get; set; }
         /// <summary>
         /// 补救资源绝对地址
         /// </summary>
-        public string url { get; set; }
+        public string blobUrl { get; set; }
         /// 文件类型
         /// </summary>
         public string type { get; set; }

TEAMModelOS/ClientApp/src/utils/evTools.js

@@ -25,7 +25,7 @@ export default {
 					children:item.children || [],
 					scope:item.scope,
 					score: 0,
-					repairResource:item.repairResource,
+					repair:item.repair,
 				},
 				render:2,
 				item:[{
@@ -54,6 +54,7 @@ export default {
 				periodId:item.periodId,
 				gradeIds:item.gradeIds,
 				subjectId:item.subjectId,
+				repair:item.repair,
 				blob:item.blob
 			}
 			r(cosmosItem)

TEAMModelOS/ClientApp/src/view/evaluation/components/BaseCreateChild.vue

@@ -65,7 +65,7 @@
 		<!-- 补救的富文本部分 -->
 		<div class="exersices-analysis" v-show="exersicesType !== 'compose'">
 			<IconText :text="'补救资源'" :color="'#2892DD'" :icon="'md-link'" style="margin-bottom: 10px"></IconText>
-			<BaseRepair ref="repairRef" :datas="editInfo.repairResource"></BaseRepair>
+			<BaseRepair ref="repairRef" :datas="editInfo.repair"></BaseRepair>
 		</div>
 
 		<div class="save-wrap display-flex">
@@ -284,7 +284,7 @@
 						break;		
 				}
 				exerciseItem.repair = this.repairContent;
-				exerciseItem.repairResource = this.formatRepairResource(
+				exerciseItem.repair = this.formatRepairResource(
 					this.$refs.repairRef.datas
 				);
 				exerciseItem.field = this.exerciseField + 1;
@@ -482,7 +482,7 @@
 				this.schoolInfo = schoolInfo.school_base;
 				
 				this.stemContent = editItem.question;
-				this.relateFileList = editItem.repairResource || [];
+				this.relateFileList = editItem.repair || [];
 				this.optionsContent = editItem.option;
 				this.analysisContent = editItem.explain;
 				this.analysisEditor.txt.html(editItem.explain);

TEAMModelOS/ClientApp/src/view/evaluation/components/BaseEditExercise.vue

@@ -93,7 +93,7 @@
 		<!-- 补救的富文本部分 -->
 		<div class="exersices-analysis" v-show="exersicesType !== 'compose'">
 			<IconText :text="'补救资源'" :color="'#2892DD'" :icon="'md-link'" style="margin-bottom: 10px"></IconText>
-			<BaseRepair ref="repairRef" :datas="editInfo ? editInfo.repairResource : []"></BaseRepair>
+			<BaseRepair ref="repairRef" :datas="repairResource || []"></BaseRepair>
 		</div>
 
 		<!-- 小题展示区域 -->
@@ -170,6 +170,7 @@
 				addChildModal: false,
 				isRelatedContent: false,
 				selectPointsModal: false,
+				repairResource:[],
 				isEdit: false,
 				editInfo: null,
 				schoolInfo: {
@@ -322,7 +323,7 @@
 						break;
 				}
 				exerciseItem.explain = this.analysisContent;
-				exerciseItem.repairResource = this.formatRepairResource(
+				exerciseItem.repair = this.formatRepairResource(
 					this.$refs.repairRef.datas
 				);
 				exerciseItem.field = this.exerciseField + 1;
@@ -749,7 +750,6 @@
 				let schoolInfo = schoolProfile.school_base;
 				
 				if (editItem.scope === "school" && schoolInfo) {
-					console.log('进来了')
 					this.schoolInfo = schoolInfo;
 					this.exerciseGrade = editItem.gradeIds;
 					this.exercisePeriod = schoolInfo.period
@@ -761,7 +761,6 @@
 						.map((item) => item.id)
 						.indexOf(editItem.subjectId);
 				}
-				console.log('当前题目学段',this.exercisePeriod)
 				
 				this.isEdit = true;
 				this.exersicesDiff = editItem.level.toString() || "0";
@@ -802,10 +801,12 @@
 				}
 				this.childList = editItem.children || [];
 				this.stemContent = editItem.question;
-				this.relateFileList = editItem.repairResource || [];
+				this.relateFileList = editItem.repair || [];
 				this.optionsContent = editItem.option;
 				this.analysisContent = editItem.explain;
 				this.analysisEditor.txt.html(editItem.explain);
+				this.repairResource = this.editInfo.repair
+				console.log('当前编辑的试题',this.editInfo)
 			},
 		},
 		mounted() {

TEAMModelOS/ClientApp/src/view/evaluation/components/BaseRepair.vue

@@ -135,7 +135,13 @@
 		},
 
 		watch: {
-
+			datas:{
+				handler(n,o){
+					// console.log('监听到资源',n)
+				},
+				deep:true,
+				immediate:true
+			}
 		}
 
 	}

TEAMModelOS/ClientApp/src/view/evaluation/index/CreateExercises.vue

@@ -321,7 +321,7 @@
 					default:
 						break;
 				}
-				exerciseItem.repairResource = this.formatRepairResource(this.$refs.repairRef.datas);
+				exerciseItem.repair = this.formatRepairResource(this.$refs.repairRef.datas);
 				exerciseItem.field = this.exerciseField + 1;
 				exerciseItem.points = this.exercisePoints;
 				exerciseItem.periodId = this.isSchool ? this.schoolInfo.period[this.exercisePeriod].id : null;

TEAMModelOS/ClientApp/src/view/knowledge-point/index/Index.vue

@@ -350,6 +350,8 @@
 			/* 保存最新知识块内容 */
 			savePointAndBlock(pointItem) {
 				return new Promise((r, j) => {
+					console.log(pointItem)
+					pointItem.code =  pointItem.code.replace('Knowledge-','')
 					this.$api.knowledge.SaveOrUpdateKnowledge([pointItem]).then(res => {
 						if (!res.error && res.knowledges) {
 							this.curDragPoint = null

TEAMModelOS/ClientApp/src/view/knowledge-point/index/operation/AddPoint.vue

@@ -64,7 +64,7 @@
                         points: this.blockDatas ? [this.blockDatas.id] : [],
                         id: editPointItem ? editPointItem.id : null,
                     }
-					
+					console.log(params)
                     this.savePointAndBlock(params)
                 }
             },
@@ -76,7 +76,7 @@
              */
             savePointAndBlock(pointItem) {
                 this.$api.knowledge.SaveOrUpdateKnowledge([pointItem]).then(res => {
-                    if (!res.error && res.knowledges) {
+                    if (!res.error && res.knowledges.length) {
                         this.$emit('addFinish', res.knowledges[0])
                         this.closeModal()
                         this.currentPoint = null

TEAMModelOS/ClientApp/src/view/knowledge-point/index/operation/ComposeBlock.vue

@@ -73,7 +73,7 @@
                             name: this.newBlockName,
                             alias: this.newBlockName,
                             subjectId: this.currentParams.subjectId,
-                            code: this.currentParams.code,
+                            code: this.currentParams.code.replace('Knowledge-',''),
                             order: 706,
                             status: 1,
                             knowledgeId: Math.uuid(),

TEAMModelOS/Controllers/knowledge/KnowledgeController.cs

@@ -175,7 +175,7 @@ namespace TEAMModelOS.Controllers
                  }
              }*/
             var query = $"select c.id,c.type,c.code, c.name,c.alias,c.subjectId,c.points,c.knowledgeId,c.periodId from c where c.type = {type} and c.periodId = '{period}' and c.subjectId = '{subjectCode}'";
-            await foreach (var item in client.GetContainer("TEAMModelOS", "Common").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Knowledge-{school_code}") }))
+            await foreach (var item in client.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIterator(queryText: query, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Knowledge-{school_code}") }))
             {
                 using var json = await JsonDocument.ParseAsync(item.ContentStream);
                 
@@ -244,13 +244,16 @@ namespace TEAMModelOS.Controllers
 
                     foreach (Knowledge knowledge in request) {
                         knowledge.code = "Knowledge-" + knowledge.code;
+                        Knowledge kno = new Knowledge();
                         if (knowledge.id == null)
                         {
                             knowledge.id = Guid.NewGuid().ToString();
-                            await client.GetContainer("TEAMModelOS", "School").CreateItemAsync(knowledge, new PartitionKey($"{knowledge.code}"));
+                            kno = await client.GetContainer("TEAMModelOS", "School").CreateItemAsync(knowledge, new PartitionKey($"{knowledge.code}"));
+                            Knowledges.Add(kno);
                         }
                         else {
-                            await client.GetContainer("TEAMModelOS", "School").ReplaceItemAsync(knowledge, knowledge.id, new PartitionKey($"{knowledge.code}"));
+                            kno = await client.GetContainer("TEAMModelOS", "School").ReplaceItemAsync(knowledge, knowledge.id, new PartitionKey($"{knowledge.code}"));
+                            Knowledges.Add(kno);
                         }
                     }
                     //Knowledges = await SaveOrUpdateKnowledge(request);
@@ -357,7 +360,7 @@ namespace TEAMModelOS.Controllers
 
                 List<Knowledge> knowlegeo = new List<Knowledge>();
                 var queryOne = $"select c.id,c.type,c.code, c.name,c.alias,c.subjectId,c.points,c.knowledgeId,c.periodId from c  where c.type = 0 and c.status = 1";
-                await foreach (var item in client.GetContainer("TEAMModelOS", "Common").GetItemQueryStreamIterator(queryText: queryOne, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Knowledge-{code}") }))
+                await foreach (var item in client.GetContainer("TEAMModelOS", "School").GetItemQueryStreamIterator(queryText: queryOne, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Knowledge-{code}") }))
                 {
                     using var json = await JsonDocument.ParseAsync(item.ContentStream);