Merge branch 'develop3.0' of http://106.12.23.251:10080/TEAMMODEL/TEAMModelOS into develop3.0

TEAMModelOS.Service/Models/Learn/LearnUnit.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using TEAMModelOS.SDK.Context.Attributes.Azure;
+using TEAMModelOS.SDK.Module.AzureCosmosDBV3;
+
+namespace TEAMModelOS.Service.Models.Learn
+{
+    /// <summary>
+    /// 考试基础信息
+    /// </summary>
+    [CosmosDB(RU = 400, Name = "LearnUnit")]
+    public class LearnUnit:ID
+    {
+        public LearnUnit() {
+            //syllabus = new List<string>();
+            resource = new List<string>();
+            item = new List<string>();
+        }
+        //创建时间 
+        public long createTime { get; set; }
+        //创建者
+        public string creator { get; set; }
+        public string id { get; set; }
+        //public List<string> syllabus { get; set; }
+        /// <summary>
+        /// 资源内容
+        /// </summary>
+        public List<string> resource { get; set; }
+        /// <summary>
+        /// 题目
+        /// </summary>
+        public List<string> item { get; set; }
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string name { get; set; }
+        [PartitionKey]
+        public string scopeCode { get; set; }
+    }
+}

TEAMModelOS/ClientApp/src/css/dark-iview-form.less

@@ -1,9 +1,10 @@
 .dark-iview-input {
   .ivu-input{
-    background:none;
+    background:none !important;
     color:white;
     border-color:#606060;
   }
+
 }
 .dark-iview-inputnumber {
   .ivu-input-number, .ivu-input-number-small input {

TEAMModelOS/ClientApp/src/store/module/courseMgmt.js

@@ -31,7 +31,8 @@ export default {
         (resolve, reject) => {
           if (context.state.courseList.length == 0) {
             apiTools.courseMgmt.findCourse({
-              TEAMModelId: context.state.demoLoginInfo.TEAMModelId
+              //TEAMModelId: context.state.demoLoginInfo.TEAMModelId
+              scopeCode: context.state.demoLoginInfo.TEAMModelId
             }).then(
               res => {
                 if (res.error == null) {

TEAMModelOS/ClientApp/src/store/module/schoolBaseInfo.js

@@ -80,9 +80,10 @@ export default {
                 (resolve, reject) => {
                     if (context.state.classroomList == undefined) {
                         apiTools.schoolSetting.findClassInfo({
-                            schoolCode: context.state.demoLoginInfo.schoolCode,
-                            status: 1,
-                            scope: 'school'
+                            //schoolCode: context.state.demoLoginInfo.schoolCode,
+                            //status: 1,
+                            //scope: 'school'
+                          scopeCode: context.state.demoLoginInfo.schoolCode
                         }).then(
                             res => {
                                 if (res.error == null) {
@@ -97,8 +98,8 @@ export default {
 
                                                         if (currentSchoolInfo.length > 0) {
                                                             item.periodName = currentSchoolInfo[0].periodName;
-                                                            item.gradeName = JSONPath.query(currentSchoolInfo, "$..grades[?(@.gradeCode=='" + item.gradeCode + "')]")[0].gradeName;
-                                                            //item.classroomName = currentClassroomlInfo[0].classroomName;
+                                                          item.gradeName = JSONPath.query(context.state.schoolBaseInfo, "$..grades[?(@.gradeCode=='" + item.gradeCode + "')]")[0].gradeName
+                                                            
                                                         }
                                                         console.log(item)
                                                     }

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

@@ -29,7 +29,7 @@
         <span class="edit-evaluation"><Icon type="ios-send" size="20" />发布评测</span>
       </div>
       <div class="evaluation-base-info">
-        <div class="evalustion-base-attr drak-iview-input dark-iview-select">
+        <div class="evalustion-base-attr dark-iview-input dark-iview-select">
           <div class="evalustion-base-attr-header">
             基础信息
           </div>
@@ -73,7 +73,7 @@
                 <Row class="dark-iview-inputnumber">
                   <Col :xs="24" :sm="24" :md="12" :lg="6">
                   <span>总分：</span>
-                  <InputNumber :max="1000" :min="1" v-model="evaluationList[avtiveEvaluationIndex].score" size="small"></InputNumber>
+                  <InputNumber :max="1000" :min="1" v-model="examPaperList[currentSubjectIndex].score" size="small"></InputNumber>
                   </Col>
                   <Col :xs="24" :sm="24" :md="12" :lg="6">
                   <span>整体难度：</span>
@@ -135,7 +135,9 @@
     data() {
       return {
         editEvaluationStatus:false,
-        questionConfig: {},
+        questionConfig: {
+          showScore: true
+        },
         jsFn,
         groupQuestion: {},
         currentSubjectIndex:0,

TEAMModelOS/ClientApp/src/view/school-mgmt/ClassroomSetting/ClassroomSetting.vue

@@ -604,8 +604,9 @@
         return false
       },
       saveClassroom() {
-        this.classroomList[this.currentClassroomIndex]['schoolCode'] = this.demoLoginInfo.schoolCode
-        this.classroomList[this.currentClassroomIndex]['scope'] = 'school'
+        //this.classroomList[this.currentClassroomIndex]['schoolCode'] = this.demoLoginInfo.schoolCode
+        //this.classroomList[this.currentClassroomIndex]['scope'] = 'school'
+        this.classroomList[this.currentClassroomIndex]['scopeCode'] = this.demoLoginInfo.schoolCode
         this.$api.schoolSetting.classroomSettingSaveOrUpdate(this.classroomList[this.currentClassroomIndex]).then(res => {
           if (res.error == null) {
             this.$Message.success(this.$t('schoolBaseInfo.csTips3'))

TEAMModelOS/ClientApp/src/view/student-account/Index.vue

@@ -323,8 +323,9 @@
       },
       getClassroom() {
         this.$api.schoolSetting.findClassInfo({
-          schoolCode: this.demoLoginInfo.schoolCode,
-          scope:'school'
+          //schoolCode: this.demoLoginInfo.schoolCode,
+          //scope:'school'
+          scopeCode:this.demoLoginInfo.schoolCode
         }).then(res => {
           if (res.error == null) {
             if (res.result.data.length > 0) {

TEAMModelOS/ClientApp/src/view/teachcontent/index.vue

@@ -401,7 +401,7 @@
       findFileList() {
         this.$api.teachContent.findResourceByDict(
           {
-            TEAMModelId: this.demoLoginInfo.TEAMModelId
+            scopeCode: this.rangeType == 1 ? this.demoLoginInfo.TEAMModelId : this.demoLoginInfo.schoolCode
           }
         ).then(
           (res) => {

TEAMModelOS/Controllers/Learn/LearnController.cs

@@ -0,0 +1,69 @@
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using TEAMModelOS.SDK.Extension.DataResult.JsonRpcRequest;
+using TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse;
+using TEAMModelOS.SDK.Module.AzureCosmosDBV3;
+using TEAMModelOS.Service.Models.Learn;
+
+namespace TEAMModelOS.Controllers.Learn
+{
+    [Route("api/[controller]")]
+    [ApiController]
+    public class LearnController: BaseController
+    {
+        private readonly IAzureCosmosDBV3Repository cosmosDBV3Repository;
+        public LearnController(IAzureCosmosDBV3Repository _cosmosDBV3Repository)
+        {
+            cosmosDBV3Repository = _cosmosDBV3Repository;
+        }
+
+        /// <summary>
+        /// 保存考试信息
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost("SaveUnit")]
+        public async Task<BaseJosnRPCResponse> SaveUnit(JosnRPCRequest<LearnUnit> request)
+        {
+            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+
+            if (string.IsNullOrEmpty(request.@params.id))
+            {
+                request.@params.id = Guid.NewGuid().ToString();
+
+                await cosmosDBV3Repository.SaveOrUpdate(request.@params);
+            }
+            else
+            {
+                await cosmosDBV3Repository.SaveOrUpdate(request.@params);
+            }
+            return builder.Data(request.@params).build();
+        }
+
+        /// <summary>
+        /// 查询最小单元
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost("FindUnit")]
+        public async Task<BaseJosnRPCResponse> FindUnit(JosnRPCRequest<Dictionary<string, object>> request)
+        {
+            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            return builder.Data(await cosmosDBV3Repository.FindByDict<LearnUnit>(request.@params)).build();
+        }
+        /// <summary>
+        /// 删除最小单元
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost("DeleteUnit")]
+        public async Task<BaseJosnRPCResponse> DeleteUnit(JosnRPCRequest<IdPk> request)
+        {
+            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            return builder.Data(await cosmosDBV3Repository.DeleteAsync<LearnUnit>(request.@params)).build();
+        }
+    }
+}

TEAMModelOS/TEAMModelOS.csproj

@@ -36,7 +36,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="Controllers\Learn\" />
     <Folder Include="JsonFile\Subject\" />
     <Folder Include="wwwroot\" />
     <Folder Include="JwtRsaFile\" />