Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

TEAMModelBI/TEAMModelBI.csproj

@@ -65,9 +65,9 @@
 		<SpaRoot>ClientApp\</SpaRoot>
 		<DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
 		<UserSecretsId>078b5d89-7d90-4f6a-88fc-7d96025990a8</UserSecretsId>
-		<Version>5.2407.10</Version>
-		<AssemblyVersion>5.2407.10.1</AssemblyVersion>
-		<FileVersion>5.2407.10.1</FileVersion>
+		<Version>5.2407.17</Version>
+		<AssemblyVersion>5.2407.17.1</AssemblyVersion>
+		<FileVersion>5.2407.17.1</FileVersion>
 		<Description>TEAMModelBI(BI)</Description>
 		<PackageReleaseNotes>BI版本说明版本切换标记2022000908</PackageReleaseNotes>
 		<PackageId>TEAMModelBI</PackageId>

TEAMModelOS.Function/TEAMModelOS.Function.csproj

@@ -5,9 +5,9 @@
     <OutputType>Exe</OutputType>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-	<Version>5.2407.10</Version>
-	<AssemblyVersion>5.2407.10.1</AssemblyVersion>
-	<FileVersion>5.2407.10.1</FileVersion>
+	<Version>5.2407.17</Version>
+	<AssemblyVersion>5.2407.17.1</AssemblyVersion>
+	<FileVersion>5.2407.17.1</FileVersion>
 	<PackageId>TEAMModelOS.FunctionV4</PackageId>
 	<Authors>teammodel</Authors>
 	<Company>醍摩豆（成都）信息技术有限公司</Company>

TEAMModelOS.SDK/TEAMModelOS.SDK.csproj

@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>5.2407.10</Version>
-		<AssemblyVersion>5.2407.10.1</AssemblyVersion>
-		<FileVersion>5.2407.10.1</FileVersion>
+		<Version>5.2407.17</Version>
+		<AssemblyVersion>5.2407.17.1</AssemblyVersion>
+		<FileVersion>5.2407.17.1</FileVersion>
 		<PackageReleaseNotes>发版</PackageReleaseNotes>
 	</PropertyGroup>
 

TEAMModelOS/ClientApp/public/lang/zh-TW.js

@@ -3120,7 +3120,7 @@ const LANG_ZH_TW = {
             markNum3: '三評制',
             markRole: '閱卷職務',
             errRole: '異常處理',
-            arb: '仲裁教師：',
+            arb: '仲裁教師',
             markRole: '閱卷教師',
             noTea: '暫無教師',
             remove: '移除',

TEAMModelOS/ClientApp/src/common/BaseLayout.vue

@@ -598,7 +598,7 @@
 							{
 								icon: "iconfont icon-k-point",
 								name: this.$t("system.menu.kdBack"),
-								router: "/home/knowledge",
+								router: this.$store.state.config.srvAdrType === "test" ? "/home/newKnowledge" : "/home/knowledge",
 								tag: "",
 								role: "admin|teacher",
 								permission: "knowledge-read|knowledge-upd",
@@ -953,7 +953,7 @@
 										{
 											icon: "iconfont icon-k-point",
 											name: this.$t("system.menu.kdBack"),
-											router: "/home/knowledge",
+											router: this.$store.state.config.srvAdrType === "test" ? "/home/newKnowledge" : "/home/knowledge",
 											tag: "",
 											role: "admin|teacher",
 											permission: "knowledge-read|knowledge-upd",

TEAMModelOS/ClientApp/src/router/routes.js

@@ -725,11 +725,20 @@ export const routes = [{
     {
         path: 'knowledge',
         name: 'knowledge',
-        component: () => import('@/view/knowledge-point/index/page.vue'),
+        component: () => import('@/view/knowledge-point/index/Index.vue'),
         meta: {
             activeName: 'knowledge'
         }
     },
+    // 知识点管理
+    {
+        path: 'newKnowledge',
+        name: 'newKnowledge',
+        component: () => import('@/view/knowledge-point/index/page.vue'),
+        meta: {
+            activeName: 'newKnowledge'
+        }
+    },
     // 创建校本评测
     {
         path: 'createSchoolEva',

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

@@ -233,7 +233,7 @@ export default {
             subjectList: [],
             originSubjectList: [],
             searchSubject: '',
-            activeSubjectIndex: 2,
+            activeSubjectIndex: 0,
             countArr: [],
             knowledgeTrees: undefined,
             subTreeRoot: [],
@@ -265,17 +265,18 @@ export default {
             oldNew: [],
             isLoadPoints: false,
             isParsing: false,
+            hostName: '',
             files: [
                 {
-                    link: '/download/%E7%9F%A5%E8%AF%86%E7%82%B9%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF/point-cn.xlsx',
+                    link: '/download/%E7%9F%A5%E8%AF%86%E7%82%B9%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF/point-CN.xlsx',
                     fileName: 'IES5知识点批量导入模板.xlsx'
                 },
                 {
-                    link: '/download/%E7%9F%A5%E8%AF%86%E7%82%B9%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF/point-tw.xlsx',
+                    link: '/download/%E7%9F%A5%E8%AF%86%E7%82%B9%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF/point-TW.xlsx',
                     fileName: 'IES5知識點批量導入模板.xlsx'
                 },
                 {
-                    link: '/download/%E7%9F%A5%E8%AF%86%E7%82%B9%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF/point-us.xlsx',
+                    link: '/download/%E7%9F%A5%E8%AF%86%E7%82%B9%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF/point-US.xlsx',
                     fileName: 'Batch import template of key concepts.xlsx'
                 }
             ],
@@ -288,6 +289,7 @@ export default {
     },
     created() {
         this.initSchoolData()
+        this.hostName = this.$evTools.getBlobHost()
     },
     mounted() {
     },
@@ -760,7 +762,13 @@ export default {
                         if(notContinue) break
                     }
                     if(!notContinue) {
-                        this.subTree = this.subTree.concat(pointTree)
+                        this.pointHandle(pointTree, this.subTree, 1)
+                        // el-tree未更新视图，需给subTree重新赋值，触发el-tree重新渲染
+                        let tree = [...this.subTree]
+                        this.subTree = []
+                        this.subTree = tree
+                        this.$forceUpdate()
+                        // this.subTree = this.subTree.concat(pointTree)
                         this.$Message.success(this.$t("knowledge.import.sucTip"))
                         this.batchUploadModal = false
                         this.updated = true
@@ -809,6 +817,27 @@ export default {
                 }
             })
         },
+        /* 
+         * arrAdd：新增数组
+         * arrOld：原数组
+         * index：代表第几层
+         * pid：父代id
+         */
+        pointHandle(arrAdd, arrOld, index, pid) {
+            arrAdd.forEach(item => {
+                let sameIndex = arrOld.findIndex(old => old.name === item.name)
+                if(sameIndex === -1) {
+                    let idLast4 = arrOld.length ? arrOld[arrOld.length - 1].id : '-0'
+                    let id4 = idLast4.split(`-`)
+                    item.id = `${pid}-${Number(id4[id4.length - 1]) + 1}`
+                    item.level = index
+                    item.pid = pid
+                    arrOld.push(item)
+                } else {
+                    this.pointHandle(item.children, arrOld[sameIndex].children, index + 1, arrOld[sameIndex].id)
+                }
+            })
+        },
     },
     beforeRouteLeave(to, from, next) {
         if (this.updated) {

TEAMModelOS/Controllers/School/KnowledgesController.cs

@@ -346,8 +346,14 @@ namespace TEAMModelOS.Controllers
                         x.points = keywords;
                     }
                 });
+                if (item.nodes.IsNotEmpty()) {
+                    var nodes = item.nodes.Select(x => x.name).Distinct();
+                    item.points.AddRange(nodes);
+                    item.points= item.points.Distinct().ToList();
+                }
                 knowledges.Add(item);
             }
+           
             return Ok(knowledges);
         }
     }

TEAMModelOS/TEAMModelOS.csproj

@@ -80,11 +80,11 @@
 		<SpaRoot>ClientApp\</SpaRoot>
 		<DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
 		<UserSecretsId>078b5d89-7d90-4f6a-88fc-7d96025990a8</UserSecretsId>
-		<Version>5.2407.10</Version>
-		<AssemblyVersion>5.2407.10.1</AssemblyVersion>
-		<FileVersion>5.2407.10.1</FileVersion>
+		<Version>5.2407.17</Version>
+		<AssemblyVersion>5.2407.17.1</AssemblyVersion>
+		<FileVersion>5.2407.17.1</FileVersion>
 		<Description>TEAMModelOS(IES5)</Description>
-		<PackageReleaseNotes>IES版本说明版本切换标记5.2407.10.1</PackageReleaseNotes>
+		<PackageReleaseNotes>IES版本说明版本切换标记5.2407.17.1</PackageReleaseNotes>
 		<PackageId>TEAMModelOS</PackageId>
 		<Authors>teammodel</Authors>
 		<Company>醍摩豆（成都）信息技术有限公司</Company>

TEAMModelOS/appsettings.Development.json

@@ -18,7 +18,7 @@
     "IdTokenSalt": "8263692E2213497BB55E74792B7900B4",
     "HttpTrigger": "https://teammodelosfunction-test.chinacloudsites.cn/api/",
     //"HttpTrigger": "http://localhost:7071/api/"
-    "Version": "5.2407.10.1"
+    "Version": "5.2407.17.1"
   },
   "Azure": {
     // 测试站数据库

TEAMModelOS/appsettings.json

@@ -18,7 +18,7 @@
     "Exp": 86400,
     "IdTokenSalt": "8263692E2213497BB55E74792B7900B4",
     "HttpTrigger": "https://teammodelosfunction.chinacloudsites.cn/api/",
-    "Version": "5.2407.10.1"
+    "Version": "5.2407.17.1"
   },
   "Azure": {
     "Storage": {