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

TEAMModelOS/ClientApp/public/lang/en-US.js

@@ -7289,6 +7289,12 @@ const LANG_EN_US = {
             basicsV: 'Basic Version',
             standardV: 'Standard Version',
             marjorV: 'Advanced Version',
+            activityP: 'Activity percentage',
+            versionsP: 'Versions percentage',
+            schoolP: 'School data percentage',
+            sizeP: 'Size percentage',
+            scheduleP: 'Progress stage',
+            subjectP: 'Subject percentage'
         },
         class: {
             total: 'Year Total Data',

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

@@ -7277,6 +7277,12 @@ const LANG_ZH_CN = {
             basicsV: '基础版',
             standardV: '标准版',
             marjorV: '专业版',
+            activityP: '活动占比',
+            versionsP: '版本占比',
+            schoolP: '学校数据占比',
+            sizeP: '空间占比',
+            scheduleP:'进度阶段',
+            subjectP:'科目占比'
         },
         class: {
             total: '今年总数据',

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

@@ -7276,6 +7276,12 @@ const LANG_ZH_TW = {
             basicsV: '基礎版',
             standardV: '標準版',
             marjorV: '專業版',
+            activityP: '活動百分比',
+            versionsP: '版本百分比',
+            schoolP: '學校數據百分比',
+            sizeP: '空間百分比',
+            scheduleP: '進度階段',
+            subjectP: '科目百分比'
         },
         class: {
             total: '今年總數據',

TEAMModelOS/ClientApp/src/view/areaMgmt/AreaIndex.vue

@@ -320,7 +320,7 @@ export default {
           },
           series: [
             {
-              name: '活动占比',
+              name: this.$t('areaStatistics.basics.activityP'),
               type: 'pie',
               radius: '70%',
               center: ['45%', '50%'],
@@ -357,7 +357,7 @@ export default {
           },
           series: [
             {
-              name: '版本占比',
+              name: this.$t('areaStatistics.basics.versionsP'),
               type: 'pie',
               radius: '70%',
               center: ['45%', '50%'],
@@ -403,7 +403,7 @@ export default {
           },
           series: [
             {
-              name: '学校数据占比',
+              name: this.$t('areaStatistics.basics.schoolP'),
               type: 'pie',
               radius: '65%',
               center: ['40%', '40%'],
@@ -450,7 +450,7 @@ export default {
           },
           series: [
             {
-              name: '学校数据占比',
+              name: this.$t('areaStatistics.basics.schoolP'),
               type: 'pie',
               radius: '75%',
               center: ['30%', '50%'],
@@ -497,7 +497,7 @@ export default {
           },
           series: [
             {
-              name: '学校数据占比',
+              name: this.$t('areaStatistics.basics.schoolP'),
               type: 'pie',
               radius: '75%',
               center: ['30%', '50%'],
@@ -598,7 +598,7 @@ export default {
             end: 35
           }],
           series: [{
-            name: this.$t('areaStatistics.class.vitality'),
+            name: this.$t('areaStatistics.basics.vitality'),
             type: "line",
             symbolSize: 10,
             symbol: 'circle',
@@ -679,7 +679,7 @@ export default {
               ],
             },
             {
-              name: '进度阶段',
+              name: this.$t('areaStatistics.basics.scheduleP'),
               type: 'pie',
               radius: ['65%', '90%'],
               data: [
@@ -715,7 +715,7 @@ export default {
           },
           series: [
             {
-              name: '空间占比',
+              name: this.$t('areaStatistics.basics.sizeP'),
               type: 'pie',
               radius: '90%',
               center: ['50%', '50%'],