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.24</Version>
-		<AssemblyVersion>5.2407.24.1</AssemblyVersion>
-		<FileVersion>5.2407.24.1</FileVersion>
+		<Version>5.2407.31</Version>
+		<AssemblyVersion>5.2407.31.1</AssemblyVersion>
+		<FileVersion>5.2407.31.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.24</Version>
-	<AssemblyVersion>5.2407.24.1</AssemblyVersion>
-	<FileVersion>5.2407.24.1</FileVersion>
+	<Version>5.2407.31</Version>
+	<AssemblyVersion>5.2407.31.1</AssemblyVersion>
+	<FileVersion>5.2407.31.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.24</Version>
-		<AssemblyVersion>5.2407.24.1</AssemblyVersion>
-		<FileVersion>5.2407.24.1</FileVersion>
+		<Version>5.2407.31</Version>
+		<AssemblyVersion>5.2407.31.1</AssemblyVersion>
+		<FileVersion>5.2407.31.1</FileVersion>
 		<PackageReleaseNotes>发版</PackageReleaseNotes>
 	</PropertyGroup>
 

TEAMModelOS/ClientApp/src/common/BaseLayout.vue

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

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

@@ -9,7 +9,12 @@ export default {
     props: {
         points: {
             type: Array,
-            default: []
+            default: [],
+        }
+    },
+    data () {
+        return {
+            colorList: ['#fc8452', '#3ba272', '#73c0de',  '#9a60b4', '#fac858', '#5470c6', '#91cc75', '#ee6666', '#ea7ccc']
         }
     },
     mounted() {
@@ -76,6 +81,13 @@ export default {
                                 type: "solid",
                             },
                         },
+                        itemStyle: {
+                            normal: {
+                                color: function(params) {
+                                    return params.data.color //获取具体的参数
+                                },
+                            },
+                        },
                     }
                 ]
             }
@@ -88,10 +100,11 @@ export default {
                 let info = {
                     id: item.id,
                     name: item.name,
-                    symbolSize: item.level === 1 ? 7 : (item.level === 2 ? 5 : (item.level === 3 ? 3 : 1)),
-                    value: item.level === 1 ? 7 : (item.level === 2 ? 5 : (item.level === 3 ? 3 : 1)),
-                    category: item.level === 1 ? 7 : (item.level === 2 ? 5 : (item.level === 3 ? 3 : 1)),
+                    symbolSize: item.level === 1 ? 13 : (item.level === 2 ? 9 : (item.level === 3 ? 5 : 3)),
+                    value: item.level === 1 ? 13 : (item.level === 2 ? 9 : (item.level === 3 ? 5 : 3)),
+                    category: item.level === 1 ? 13 : (item.level === 2 ? 9 : (item.level === 3 ? 5 : 3)),
                     draggable: true,
+                    color: this.colorList[item.level - 1]
                 }
                 if(item.level != 1) {
                     links.push({

TEAMModelOS/ClientApp/src/view/task/marking/mark/ByStu.vue

@@ -645,7 +645,7 @@ export default {
       if (this.stuAnswer.length) {
         let index = this.quIndex
         this.score = this.stuScore[index] == -1 ? null : this.stuScore[index]
-        let answerOrMark = this.markArr[index] ? this.getMarkHtml(this.markArr[index]) : (this.quNoList[index].type === 'subjective' && this.quNoList[index].answerType != 'text' && this.stuAnswer[index].length ? this.getSubjectiveHtml(this.stuAnswer[index].toString(), this.quNoList[index].answerType) : this.stuAnswer[index])
+        let answerOrMark = this.markArr[index] ? this.getMarkHtml(this.markArr[index]) : (this.quNoList[index].type === 'subjective' && this.quNoList[index].answerType && this.quNoList[index].answerType != 'text' && this.stuAnswer[index].length ? this.getSubjectiveHtml(this.stuAnswer[index].toString(), this.quNoList[index].answerType) : this.stuAnswer[index])
         return answerOrMark
       } else {
         return this.stuId + this.$t('learnActivity.mark.noAnswer')

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.24</Version>
-		<AssemblyVersion>5.2407.24.1</AssemblyVersion>
-		<FileVersion>5.2407.24.1</FileVersion>
+		<Version>5.2407.31</Version>
+		<AssemblyVersion>5.2407.31.1</AssemblyVersion>
+		<FileVersion>5.2407.31.1</FileVersion>
 		<Description>TEAMModelOS(IES5)</Description>
-		<PackageReleaseNotes>IES版本说明版本切换标记5.2407.24.1</PackageReleaseNotes>
+		<PackageReleaseNotes>IES版本说明版本切换标记5.2407.31.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.24.1"
+    "Version": "5.2407.31.1"
   },
   "Azure": {
     // 测试站数据库

TEAMModelOS/appsettings.json

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