Browse Source

語系調整與前端開發規範上傳

osbert 6 years ago
parent
commit
1f1af14326

+ 1 - 1
TEAMModelOS/ClientApp/components/talmgmtdashboard/InteractiveLine.vue

@@ -22,7 +22,7 @@ export default {
             let myChart = this.$echarts.init(document.getElementById(this.id));
             let arrlabel = ["2017-11","2017-12","2018-01","2018-02","2018-03","2018-04","2018-05","2018-06","2018-07","2018-08","2018-09","2018-10","2018-11","2018-12","2019-01","2019-02","2019-03","2019-04"];
             let arrTotal1 = [29,245,94,0,310,301,481,207,1,27,713,1053,1312,1064,365,441,720,369];
-            let arrTotal2 = ["26", "20", "2", "18", "27", "22", "26", "33", "9", "0", "40"];
+            // let arrTotal2 = ["26", "20", "2", "18", "27", "22", "26", "33", "9", "0", "40"];
             myChart.setOption({
                 // backgroundColor: 'rgba(17, 17, 17, 0.14)',
                 tooltip: {

+ 7 - 7
TEAMModelOS/ClientApp/components/talmgmtdashboard/TechnologyBar.vue

@@ -68,7 +68,7 @@ export default {
                 textStyle: {
                     color: '#fff',
                 },
-                data: [_this.$t('talMgmt.text50'), _this.$t('talMgmt.text51'), _this.$t('talMgmt.text52'), _this.$t('talMgmt.text53'), _this.$t('talMgmt.text54'), _this.$t('talMgmt.text55'), _this.$t('talMgmt.text56'), ]
+                data: [_this.$t('talMgmt.text50'), _this.$t('talMgmt.text52'), _this.$t('talMgmt.text53'), _this.$t('talMgmt.text54'), _this.$t('talMgmt.text55'), _this.$t('talMgmt.text56')]
               },
               backgroundColor: '#343a4073',
               tooltip: {
@@ -136,7 +136,7 @@ export default {
               },
               series: [
                 {
-                  name:'总量',
+                  name: _this.$t('talMgmt.text50'),
                   type: 'bar',
                   data: courseDataArray,
                   barWidth: 10, //柱子宽度
@@ -151,7 +151,7 @@ export default {
                   }
                 },
                 {
-                  name:'语文',
+                  name: _this.$t('talMgmt.text52'),
                   type:'bar',
                   barWidth: 10, //柱子宽度
                   data:[30, 15, 14, 13, 12, 11, 10, 9, 3, 2, 2],
@@ -165,7 +165,7 @@ export default {
                   }
                 },
                 {
-                  name:'英语',
+                  name: _this.$t('talMgmt.text53'),
                   type:'bar',
                   barWidth: 10, //柱子宽度
                   data:[30, 7, 14, 7, 6, 11, 10, 9, 3, 2, 2],
@@ -179,7 +179,7 @@ export default {
                   }
                 },
                 {
-                  name:'数学',
+                  name: _this.$t('talMgmt.text54'),
                   type:'bar',
                   barWidth: 10, //柱子宽度
                   data:[30, 7, 0, 5, 4, 2, 6, 5, 3, 2, 2],
@@ -193,7 +193,7 @@ export default {
                   }
                 },
                {
-                  name:'科学',
+                  name: _this.$t('talMgmt.text55'),
                   type:'bar',
                   barWidth: 10, //柱子宽度
                   data:[10, 1, 0, 0, 2, 3, 5, 5, 3, 2, 2],
@@ -207,7 +207,7 @@ export default {
                   }
                 },
                {
-                  name:'综合',
+                  name: _this.$t('talMgmt.text56'),
                   type:'bar',
                   barWidth: 10, //柱子宽度
                   data:[0, 0, 0, 0, 1, 0, 3, 1, 3, 2, 2],

+ 0 - 1
TEAMModelOS/ClientApp/locale/lang/en-US/talMgmt.js

@@ -49,7 +49,6 @@ export default {
     text48: '二次作答',
     text49: '常用科技分布图',
     text50: '总量',
-    text51: '英文',
     text52: '语文',
     text53: '英语',
     text54: '数学',

+ 0 - 1
TEAMModelOS/ClientApp/locale/lang/zh-CN/talMgmt.js

@@ -49,7 +49,6 @@ export default {
     text48: '二次作答',
     text49: '常用科技分布图',
     text50: '总量',
-    text51: '英文',
     text52: '语文',
     text53: '英语',
     text54: '数学',

+ 0 - 1
TEAMModelOS/ClientApp/locale/lang/zh-TW/talMgmt.js

@@ -49,7 +49,6 @@ export default {
     text48: '二次作答',
     text49: '常用科技分布圖',
     text50: '總量',
-    text51: '英文',
     text52: '語文',
     text53: '英語',
     text54: '數學',

BIN
大云前端规范.doc