Merge branch 'cmy/develop-bi' into develop

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

@@ -621,7 +621,12 @@ const LANG_EN_US = {
         cc4: 'Teacher：',
         stuClient: 'Web IRS No.',
         noCus: 'No course information yet',
-        noList: 'No list data yet'
+        noList: 'No list data yet',
+        regulator: 'Channel management',
+        channelsize: 'Channel space',
+        discussClass: 'No. of oridinary observation lessons',
+        discussJoin: 'No. of oridinary lesson observation connections',
+        notAuthorized: 'No license found yet'
     },
     // 班级管理
     classMgmt: {
@@ -1848,37 +1853,37 @@ const LANG_EN_US = {
         publishType1: 'Start Now',
         publishType2: 'Scheduled Start Time',
         testType: [{
-            label: "Single Answer",
-            value: "single"
-        },
-        {
-            label: "Multiple Answers",
-            value: "multiple"
-        },
-        {
-            label: "True-False",
-            value: "judge"
-        },
-        {
-            label: "Cloze",
-            value: "complete"
-        },
-        {
-            label: "Writing",
-            value: "subjective"
-        },
-        {
-            label: "Question Set",
-            value: "compose"
-        },
-        {
-            label: "Correcting",
-            value: "correct"
-        },
-        {
-            label: "Matching",
-            value: "connector"
-        },
+                label: "Single Answer",
+                value: "single"
+            },
+            {
+                label: "Multiple Answers",
+                value: "multiple"
+            },
+            {
+                label: "True-False",
+                value: "judge"
+            },
+            {
+                label: "Cloze",
+                value: "complete"
+            },
+            {
+                label: "Writing",
+                value: "subjective"
+            },
+            {
+                label: "Question Set",
+                value: "compose"
+            },
+            {
+                label: "Correcting",
+                value: "correct"
+            },
+            {
+                label: "Matching",
+                value: "connector"
+            },
         ]
     },
     // 首页相关
@@ -3339,34 +3344,34 @@ const LANG_EN_US = {
         title: 'Survey',
         questionType: 'Survey Type',
         type: [{
-            code: 0,
-            value: 'Academic Education'
-        },
-        {
-            code: 1,
-            value: 'Satisfaction Survey'
-        },
-        {
-            code: 2,
-            value: 'Voting Election'
-        },
-        {
-            code: 3,
-            value: 'Others'
-        }
+                code: 0,
+                value: 'Academic Education'
+            },
+            {
+                code: 1,
+                value: 'Satisfaction Survey'
+            },
+            {
+                code: 2,
+                value: 'Voting Election'
+            },
+            {
+                code: 3,
+                value: 'Others'
+            }
         ],
         state: [{
-            code: 100,
-            value: 'Scheduled'
-        },
-        {
-            code: 200,
-            value: 'In progress'
-        },
-        {
-            code: 300,
-            value: 'Has ended'
-        }
+                code: 100,
+                value: 'Scheduled'
+            },
+            {
+                code: 200,
+                value: 'In progress'
+            },
+            {
+                code: 300,
+                value: 'Has ended'
+            }
         ]
     },
     // 站内通知
@@ -4406,40 +4411,39 @@ const LANG_EN_US = {
             achievement: "My Grade",
         },
         testType: [{
-            label: "Single Answer",
-            value: "single"
-        },
-        {
-            label: "Multiple Answers",
-            value: "multiple"
-        },
-        {
-            label: "True-False",
-            value: "judge"
-        },
-        {
-            label: "Cloze",
-            value: "complete"
-        },
-        {
-            label: "Writing",
-            value: "subjective"
-        },
-        {
-            label: "Question Set",
-            value: "compose"
-        },
-        {
-            label: "Correcting",
-            value: "correct"
-        },
-        {
-            label: "Matching",
-            value: "connector"
-        },
-        ],
-        state1: [
+                label: "Single Answer",
+                value: "single"
+            },
+            {
+                label: "Multiple Answers",
+                value: "multiple"
+            },
+            {
+                label: "True-False",
+                value: "judge"
+            },
+            {
+                label: "Cloze",
+                value: "complete"
+            },
+            {
+                label: "Writing",
+                value: "subjective"
+            },
+            {
+                label: "Question Set",
+                value: "compose"
+            },
+            {
+                label: "Correcting",
+                value: "correct"
+            },
             {
+                label: "Matching",
+                value: "connector"
+            },
+        ],
+        state1: [{
                 type: 'all',
                 status: 'All Activity Status'
             },
@@ -4460,8 +4464,7 @@ const LANG_EN_US = {
                 status: 'Absent'
             }
         ],
-        state2: [
-            {
+        state2: [{
                 type: 'All',
                 status: 'All Activity Status'
             },
@@ -7280,9 +7283,9 @@ const LANG_EN_US = {
         },
         class: {
             total: 'Year Total Data',
-            lastWeek: 'Last week',
-            nowMonth: 'This month',
-            vitality: 'Active Status',
+                lastWeek: 'Last week',
+                nowMonth: 'This month',
+                vitality: 'Active Status',
         },
         research: {
             accomplish: 'Completed',
@@ -7325,13 +7328,13 @@ const LANG_EN_US = {
         },
         class: {
             lessonTitle: 'Lesson Record',
-            activityTitle: 'Activity',
-            interactionTitle: 'Interaction',
-            totalTitle: 'Total Data',
-            todayData: 'Today Data',
-            contrastYesterday: 'Compare with yesterday',
-            contrastLastmonth: 'Compare with last month',
-            contrastLastyear: 'Compare with last year',
+                activityTitle: 'Activity',
+                interactionTitle: 'Interaction',
+                totalTitle: 'Total Data',
+                todayData: 'Today Data',
+                contrastYesterday: 'Compare with yesterday',
+                contrastLastmonth: 'Compare with last month',
+                contrastLastyear: 'Compare with last year',
         },
         gradeTitle: 'Grade Distribution',
         subjectTitle: 'Subject Distribution',

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

@@ -621,7 +621,12 @@ const LANG_ZH_CN = {
         cc4: '教师：',
         stuClient: '学生连接数',
         noCus: '暂无课程信息',
-        noList: '暂无名单数据'
+        noList: '暂无名单数据',
+        regulator: '频道管理',
+        channelsize: '频道空间',
+        discussClass: '通用议课教室数',
+        discussJoin: '通用议课连接数',
+        notAuthorized: '暂无授权'
     },
     // 班级管理
     classMgmt: {
@@ -1846,8 +1851,7 @@ const LANG_ZH_CN = {
         evMode3: '阅卷评测',
         publishType1: '立即发布',
         publishType2: '定时发布',
-        testType: [
-            {
+        testType: [{
                 label: "单选",
                 value: "single"
             },
@@ -3339,8 +3343,7 @@ const LANG_ZH_CN = {
     mQuestion: {
         title: '问卷调查',
         questionType: '问卷类型',
-        type: [
-            {
+        type: [{
                 code: 0,
                 value: '学术教育'
             },
@@ -3357,8 +3360,7 @@ const LANG_ZH_CN = {
                 value: '其它'
             }
         ],
-        state: [
-            {
+        state: [{
                 code: 100,
                 value: '待发布'
             },
@@ -4407,8 +4409,7 @@ const LANG_ZH_CN = {
             classInteraction: "课堂互动",
             achievement: "我的成绩",
         },
-        testType: [
-            {
+        testType: [{
                 label: "单选题",
                 value: "single"
             },
@@ -4441,8 +4442,7 @@ const LANG_ZH_CN = {
                 value: "connector"
             }
         ],
-        state1: [
-            {
+        state1: [{
                 type: 'all',
                 status: '所有活动状态'
             },
@@ -4463,8 +4463,7 @@ const LANG_ZH_CN = {
                 status: '缺考'
             }
         ],
-        state2: [
-            {
+        state2: [{
                 type: 'all',
                 status: '所有活动状态'
             },
@@ -6945,7 +6944,7 @@ const LANG_ZH_CN = {
         text2: '%',
         text3: '套',
         text4: '次',
-        text5: '分',//分钟
+        text5: '分', //分钟
         text6: '则',
         text7: '人',
         text8: 'm',
@@ -7272,9 +7271,9 @@ const LANG_ZH_CN = {
         },
         class: {
             total: '今年总数据',
-            lastWeek: '上周',
-            nowMonth: '本月',
-            vitality: '活跃度',
+                lastWeek: '上周',
+                nowMonth: '本月',
+                vitality: '活跃度',
         },
         research: {
             accomplish: '已完成',
@@ -7318,15 +7317,15 @@ const LANG_ZH_CN = {
         },
         class: {
             lessonTitle: '课例',
-            activityTitle: '活动',
-            interactionTitle: '互动',
-            totalTitle: '总数据',
-            todayData: '今日数据',
-            contrastYesterday: '昨日对比',
-            contrastLastmonth: '上月对比',
-            contrastLastyear: '去年对比',
+                activityTitle: '活动',
+                interactionTitle: '互动',
+                totalTitle: '总数据',
+                todayData: '今日数据',
+                contrastYesterday: '昨日对比',
+                contrastLastmonth: '上月对比',
+                contrastLastyear: '去年对比',
         },
         gradeTitle: '年级占比',
         subjectTitle: '科目占比',
     },
-}
+}

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

@@ -621,7 +621,12 @@ const LANG_ZH_TW = {
         cc4: '教師：',
         stuClient: '學生連線數',
         noCus: '暫無課程資訊',
-        noList: '暫無名單數據'
+        noList: '暫無名單數據',
+        regulator: '頻道管理',
+        channelsize: '頻道空間',
+        discussClass: '通用議課教室數',
+        discussJoin: '通用議課連線數',
+        notAuthorized: '暫無授權'
     },
     // 班级管理
     classMgmt: {
@@ -1848,8 +1853,7 @@ const LANG_ZH_TW = {
         evMode3: '卷卡合一評量',
         publishType1: '立即發布',
         publishType2: '定時發布',
-        testType: [
-            {
+        testType: [{
                 label: "選擇",
                 value: "single"
             },
@@ -3340,8 +3344,7 @@ const LANG_ZH_TW = {
     mQuestion: {
         title: '問卷調查',
         questionType: '問卷類型',
-        type: [
-            {
+        type: [{
                 code: 0,
                 value: '學術教育'
             },
@@ -3358,8 +3361,7 @@ const LANG_ZH_TW = {
                 value: '其他'
             }
         ],
-        state: [
-            {
+        state: [{
                 code: 100,
                 value: '待發布'
             },
@@ -4408,8 +4410,7 @@ const LANG_ZH_TW = {
             classInteraction: "課堂互動",
             achievement: "我的成績",
         },
-        testType: [
-            {
+        testType: [{
                 label: "單選題",
                 value: "single"
             },
@@ -4442,8 +4443,7 @@ const LANG_ZH_TW = {
                 value: "connector"
             }
         ],
-        state1: [
-            {
+        state1: [{
                 type: 'all',
                 status: '所有活動狀態'
             },
@@ -4464,8 +4464,7 @@ const LANG_ZH_TW = {
                 status: '缺考'
             }
         ],
-        state2: [
-            {
+        state2: [{
                 type: 'all',
                 status: '所有活動狀態'
             },
@@ -6945,7 +6944,7 @@ const LANG_ZH_TW = {
         text2: '%',
         text3: '套',
         text4: '次',
-        text5: '分鐘',//分钟
+        text5: '分鐘', //分钟
         text6: '則',
         text7: '人',
         text8: 'm',
@@ -7271,9 +7270,9 @@ const LANG_ZH_TW = {
         },
         class: {
             total: '今年總數據',
-            lastWeek: '上週',
-            nowMonth: '本月',
-            vitality: '活躍度',
+                lastWeek: '上週',
+                nowMonth: '本月',
+                vitality: '活躍度',
         },
         research: {
             accomplish: '已完成',
@@ -7316,15 +7315,15 @@ const LANG_ZH_TW = {
         },
         class: {
             lessonTitle: '課堂',
-            activityTitle: '活動',
-            interactionTitle: '互動',
-            totalTitle: '總數據',
-            todayData: '今日數據',
-            contrastYesterday: '昨日對比',
-            contrastLastmonth: '上月對比',
-            contrastLastyear: '去年對比',
+                activityTitle: '活動',
+                interactionTitle: '互動',
+                totalTitle: '總數據',
+                todayData: '今日數據',
+                contrastYesterday: '昨日對比',
+                contrastLastmonth: '上月對比',
+                contrastLastyear: '去年對比',
         },
         gradeTitle: '年級佔比',
         subjectTitle: '科目佔比',
     },
-}
+}

TEAMModelOS/ClientApp/src/common/BaseLayout.vue

@@ -209,6 +209,9 @@ export default {
         } else if (resultVersions === 'undefined' || resultService === 'undefined') {
           this.edition = 'basic'
           this.systemLevel = this.$t('system.basic')
+        } else {
+          this.edition = 'basic'
+          this.systemLevel = this.$t('system.basic')
         }
 
         //版本判断 根据edition的值

TEAMModelOS/ClientApp/src/view/auth/Product.vue

@@ -240,16 +240,16 @@ export default {
           image: require("@/assets/image/module3.png"),
           content: this.$t('auth.content3'),
           isPay: 0,
-          prodCode: 'B9GPJ6NY',
+          prodCode: 'YMPCVCIM',
           'zh-cn': 'https://www.habook.com.cn/cloud.php?act=view&id=22',
           'zh-tw': 'https://www.habook.com/zh-tw/product.php?act=view&id=37',
           'en-us': 'https://www.habook.com/en/product.php?act=view&id=37',
           isShow: true,
           children: [
-            { name: '频道管理', start: 0, end: 0, state: false, key: 'B9GPJ6NY' },
-            { name: '频道空间', start: 0, end: 0, state: false, key: 'LY9AJ6NY' },
-            { name: '通用议课教室数', start: 0, end: 0, state: false, key: 'YL9CJ6NY' },
-            { name: '通用议课连接数', start: 0, end: 0, state: false, key: 'LL9MJ6NY' },
+            { name: this.$t('auth.regulator'), start: 0, end: 0, state: false, key: 'B9GPJ6NY' },    //频道管理
+            { name: this.$t('auth.channelsize'), start: 0, end: 0, state: false, key: 'LY9AJ6NY' },                    //频道空间
+            { name: this.$t('auth.discussClass'), start: 0, end: 0, state: false, key: 'YL9CJ6NY' },              //通用议课教室数
+            { name: this.$t('auth.discussJoin'), start: 0, end: 0, state: false, key: 'LL9MJ6NY' },              //通用议课连接数
           ]
         },
         {

TEAMModelOS/ClientApp/src/view/auth/ProductItem.vue

@@ -55,7 +55,7 @@
           </span>
         </div>
         <span v-else style="color:#757575;font-size:14px;margin-left:5px;">
-          暂无授权
+          {{$t('auth.notAuthorized')}}
         </span>
       </div>
     </div>