Merge remote-tracking branch 'origin/develop3.0' into develop3.0

TEAMModelFunction/MonitorServicesBus.cs

@@ -10,6 +10,7 @@ namespace TEAMModelFunction
         [FunctionName("test_queue_activetask")]
         public static void Run([ServiceBusTrigger("test_queue_activetask", Connection = "ServiceBusConnection")]string myQueueItem, ILogger log)
         {
+            ///ÖØÊÔ´ÎÊý
             log.LogInformation($"C# ServiceBus queue trigger function processed message: {myQueueItem}");
         }
     }

TEAMModelOS.SDK/TEAMModelOS.SDK.csproj

@@ -47,5 +47,6 @@
     <PackageReference Include="Microsoft.Azure.Cosmos" Version="3.11.0" />
     <PackageReference Include="Microsoft.Azure.Cosmos.Table" Version="2.0.0-preview" />
     <PackageReference Include="Caching.CSRedis" Version="3.5.5" />
+    <PackageReference Include="CoreSDK" Version="1.0.0" />
   </ItemGroup>
 </Project>

TEAMModelOS.Service/Services/PowerPoint/Implement/HtexService.cs

@@ -1343,8 +1343,8 @@ namespace TEAMModelOS.Service.Services.PowerPoint.Implement
                 }
                 // type: none, triangle, stealth, diamond, oval, arrow
 
-                if ((headEndNodeAttrs != null && (headEndNodeAttrs.GetTextByPath("@type").Value == "triangle" || (headEndNodeAttrs.GetTextByPath("@type").Value == "arrow")) ||
-                    (tailEndNodeAttrs != null && (tailEndNodeAttrs.GetTextByPath("@type").Value == "triangle" || (tailEndNodeAttrs.GetTextByPath("@type").Value == "arrow")))))
+                if ((headEndNodeAttrs != null && headEndNodeAttrs.GetTextByPath("@type") !=null&& (headEndNodeAttrs.GetTextByPath("@type").Value == "triangle" || (headEndNodeAttrs.GetTextByPath("@type").Value == "arrow")) ||
+                    (tailEndNodeAttrs != null && tailEndNodeAttrs.GetTextByPath("@type") != null && (tailEndNodeAttrs.GetTextByPath("@type").Value == "triangle" || (tailEndNodeAttrs.GetTextByPath("@type").Value == "arrow")))))
                 {
                   //  var triangleMarker = "<marker id='markerTriangle_" + order + "' viewBox='0 0 10 10' refX='1' refY='5' markerWidth='5' markerHeight='5' stroke='" + shapeBorder.Color + "' fill='" + shapeBorder.Color +
                              //       "' orient='auto-start-reverse' markerUnits='strokeWidth'><path d='M 0 0 L 10 5 L 0 10 z' /></marker>";
@@ -1523,8 +1523,8 @@ namespace TEAMModelOS.Service.Services.PowerPoint.Implement
                         //StrokeWidth = shapeBorder.Width + "",
                         //StrokeDasharray = shapeBorder.Stroke,
                         d=d,
-                        start=headEndNodeAttrs!=null?headEndNodeAttrs.GetTextByPath("@type").Value:null,
-                        end=tailEndNodeAttrs!=null?tailEndNodeAttrs.GetTextByPath("@type").Value:null,
+                        start=headEndNodeAttrs!=null&&headEndNodeAttrs.GetTextByPath("@type")!=null?headEndNodeAttrs.GetTextByPath("@type").Value:null,
+                        end=tailEndNodeAttrs!=null&&tailEndNodeAttrs.GetTextByPath("@type")!=null?tailEndNodeAttrs.GetTextByPath("@type").Value:null,
                     }
                 };
                 shapeSvg.svgShape = shapes;

TEAMModelOS.Service/Services/PowerPoint/Implement/ShapeSvg.cs

@@ -2801,8 +2801,8 @@ namespace TEAMModelOS.Service.Services.PowerPoint.Implement
                 // StrokeWidth = border.Width + "",
                 // StrokeDasharray = border.Stroke,
                 d=d,
-                start=headEndNodeAttrs!=null?headEndNodeAttrs.GetTextByPath("@type").Value:null,
-                end=tailEndNodeAttrs!=null?tailEndNodeAttrs.GetTextByPath("@type").Value:null,
+                 start=headEndNodeAttrs!=null&&headEndNodeAttrs.GetTextByPath("@type")!=null?headEndNodeAttrs.GetTextByPath("@type").Value:null,
+                end=tailEndNodeAttrs!=null&&tailEndNodeAttrs.GetTextByPath("@type")!=null?tailEndNodeAttrs.GetTextByPath("@type").Value:null,
                 //MarkerStart="url(#markerTriangle_" + shpId + ")",
                 //MarkerEnd="url(#markerTriangle_" + shpId + ")"
             } };
@@ -4556,8 +4556,8 @@ namespace TEAMModelOS.Service.Services.PowerPoint.Implement
                 // StrokeWidth = border.Width + "",
                 // StrokeDasharray = border.Stroke,
                 points=points,
-                 start=headEndNodeAttrs!=null?headEndNodeAttrs.GetTextByPath("@type").Value:null,
-                end=tailEndNodeAttrs!=null?tailEndNodeAttrs.GetTextByPath("@type").Value:null,
+                 start=headEndNodeAttrs!=null&&headEndNodeAttrs.GetTextByPath("@type")!=null?headEndNodeAttrs.GetTextByPath("@type").Value:null,
+                end=tailEndNodeAttrs!=null&&tailEndNodeAttrs.GetTextByPath("@type")!=null?tailEndNodeAttrs.GetTextByPath("@type").Value:null,
             } };
             return new Svg { /*SvgData = result,*/ svgShape = shapes };
         }
@@ -7076,8 +7076,8 @@ namespace TEAMModelOS.Service.Services.PowerPoint.Implement
                // Stroke = "#" + border.Color,
                 // StrokeWidth = border.Width + "",
                 // StrokeDasharray = border.Stroke,
-                start=headEndNodeAttrs!=null?headEndNodeAttrs.GetTextByPath("@type").Value:null,
-                end=tailEndNodeAttrs!=null?tailEndNodeAttrs.GetTextByPath("@type").Value:null,
+                start=headEndNodeAttrs!=null&&headEndNodeAttrs.GetTextByPath("@type")!=null?headEndNodeAttrs.GetTextByPath("@type").Value:null,
+                end=tailEndNodeAttrs!=null&&tailEndNodeAttrs.GetTextByPath("@type")!=null?tailEndNodeAttrs.GetTextByPath("@type").Value:null,
                 x1=X1,
                 x2=X2,
                 y1=Y1,

TEAMModelOS/ClientApp/src/components/learnactivity/GradeList.vue

@@ -32,7 +32,6 @@
 
 <script>
     import ReviewPaper from '../learnactivity/ReviewPaper.vue'
-    //import Loading from '@/common/Loading.vue'
     export default {
         components: {
             ReviewPaper,
@@ -54,7 +53,6 @@
                 this.studentData = this.$Mock.data.studentList[0].studentScore
                 let filterData = this.studentData
                 if (this.inputData) {
-                    // 可以客制調整
                     filterData = this.studentData.filter(res => {
                         let a = res.name
                         return (a.indexOf(this.inputData) >= 0)
@@ -65,9 +63,7 @@
         },
         methods: {
             //获取单个学生作答数据
-            getStudentInfo(data,index) {
-                console.log(data)
-                console.log(index)
+            getStudentInfo(data, index) {
                 this.selectIndex = index
             },
             //获取学生测验数据
@@ -75,7 +71,6 @@
                 let requestData = {}
                 let datas = this.$Mock.data.studentList
                 console.log(datas)
-                //this.studentList = datas[0].studentScore
                 requestData.examCode = "632dd8b3-c48c-4ee5-8448-7e539f764272"
                 requestData.id = "c3da2274-94ab-4cf1-92d8-dd30e8532aaf"
                 if (requestData.id !== undefined) {
@@ -99,9 +94,6 @@
                             } else {
                                 this.$Message.error('API ERROR!')
                             }
-                        },
-                        err => {
-
                         }
                     )
                 }
@@ -118,30 +110,20 @@
                             res => {
                                 if (res.error == null) {
                                     this.paperInfo = res.result.data[0]
-                                    console.log(this.dataInfo)
                                     let data = res.result.data[0].item
                                     this.paperInfo.item = []
-                                    let types = ["Single", "Multiple", "Judge"]
                                     for (let i = 0; i < data.length; i++) {
-                                        if (!(types.includes(data[i].type))) {
-                                            this.paperInfo.item.push(data[i])
-                                        }
+                                        this.paperInfo.item.push(data[i])
                                     }
                                     this.examAnalysisStatus = true
-                                    console.log('111111111111')
-                                    console.log(this.paperInfo)
                                 } else {
                                     this.$Message.error('API ERROR!')
                                 }
-                            },
-                            err => {
-
                             }
                         )
                     }
                 }
             }
-
         },
         mounted() {
             this.getStudentData()

TEAMModelOS/ClientApp/src/components/learnactivity/ReviewPaperList.vue

@@ -35,7 +35,7 @@
 						<div class="item-explain-details">
 							<!-- 问答题答案 -->
 							<div v-if="item.type === 'Subjective'">
-								<span v-for="(answer,index) in item.answer" :key="index" v-html="item.answer.length ? answer : '未设置答案'"></span>
+								<span v-for="(answer,index) in item.answer" :key="index"  v-html="item.answer.length ? answer : '未设置答案'"></span>
 							</div>
 							<!-- 填空题答案 -->
 							<div v-else-if="item.type === 'Complete'">
@@ -50,7 +50,7 @@
 					</div>
 					<div style="margin-top:20px">
 						<span>【题 目 分 数】：</span>
-						<Input v-model="value" placeholder="请为此题打分..." style="width: 300px" />
+						<Input  @on-change="inputScore(item)" placeholder="请为此题打分..." style="width: 300px" />
 					</div>
 					<transition name="slide">
 						<!-- <div v-show="collapseList.indexOf(exerciseList.indexOf(item)) > -1" class="toggle-area"> -->
@@ -201,7 +201,10 @@
 				this.exerciseList = this.originData.slice(start, end)
 				this.pageScrollTo(0)
 			},
-
+			//題目打分
+			inputScore(data) {
+				console.log(data)
+            },
 			pageSizeChange(val) {
 				this.pageSize = val
 				this.pageChange(1)
@@ -366,6 +369,7 @@
 
         .components-el-container .exercise-item .item-explain-details {
             width: 90%;
+			margin-left:15px;
         }
 
         .components-el-container .exercise-item .item-tools-t .ivu-icon {

TEAMModelOS/ClientApp/src/view/learnactivity/ManageEvaluation.vue

@@ -506,6 +506,8 @@
             },
             selectEvaluation(index) {
                 this.avtiveEvaluationIndex = index
+                console.log(index)
+                console.log(this.evaluationList[this.avtiveEvaluationIndex])
                 this.getMyDate(this.evaluationList[this.avtiveEvaluationIndex].startTime, this.evaluationList[this.avtiveEvaluationIndex].endTime)
                 this.findExamPaper()
             },
@@ -524,6 +526,7 @@
                     res => {
                         if (res.error == null) {
                             this.evaluationList = res.result.data
+                            console.log('獲取评测列表')
                             console.log(this.evaluationList)
                             if (this.evaluationList.length > 0) {
                                 this.selectEvaluation(0)
@@ -643,13 +646,13 @@
             }
         },
         mounted() {
-            console.log('sas')
-            console.log(this.$tools.getSas({
-                type: 'blobR',
-                data: {
-                    "name": "HBCN", "role": "student"
-                }
-            }))
+            //console.log('sas')
+            //console.log(this.$tools.getSas({
+            //    type: 'blobR',
+            //    data: {
+            //        "name": "HBCN", "role": "student"
+            //    }
+            //}))
             setTimeout(() => {
                 console.log(this.$tools.getSas({
                     type: 'blobR',