Merge branch 'master' into develop

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

@@ -5848,7 +5848,10 @@ const LANG_EN_US = {
             'research-upd': 'Manage Lesson Management',
             'link': 'Resource Platform',
             'link-read': 'View Resource Platform',
-            'link-upd': 'Manage Resource Platform'
+            'link-upd': 'Manage Resource Platform',
+            'art': 'Art evaluation',
+            'art-read':'View Art Evaluation',
+            'art-upd':'Manage Art Evaluation'
         },
         modal: {
             text1: 'The authorization of this account has been changed, do you want to give this account a more appropriate title?',

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

@@ -5853,7 +5853,10 @@ const LANG_ZH_CN = {
             'research-upd': '课例中心管理（修改）权限',
             'link': '资源平台',
             'link-read': '查看资源平台',
-            'link-upd': '管理（修改）资源平台'
+            'link-upd': '管理（修改）资源平台',
+            'art': '艺术评测',
+            'art-read':'艺术评测查看权限',
+            'art-upd':'艺术评测管理权限'
         },
         modal: {
             text1: '此账号权限已变更，是否要给此账号更加合适的职称',

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

@@ -5853,7 +5853,10 @@ const LANG_ZH_TW = {
             'research-upd': '課堂紀錄管理（修改）權限',
             'link': '資源平臺',
             'link-read': '查看資源平臺',
-            'link-upd': '管理（修改）資源平臺'
+            'link-upd': '管理（修改）資源平臺',
+            'art': '藝術評測',
+            'art-read':'藝術評測查看權限',
+            'art-upd':'藝術評測管理權限'
         },
         modal: {
             text1: '此帳號權限已變更，是否要給此帳號更加合適的職稱',

TEAMModelOS/ClientApp/src/common/BaseLayout.vue

@@ -618,7 +618,7 @@ export default {
           router: '',
           tag: '',
           role: 'admin',
-          permission: '',
+          permission: 'art-read|art-upd',
           subName: 'artExam',
           menuName: 'artExam',
           child: [
@@ -628,7 +628,7 @@ export default {
               router: '/home/mgtArtExam',
               tag: '',
               role: 'admin',
-              permission: '',
+              permission: 'art-read|art-upd',
               menuName: 'mgtArtExam',
               isShow: this.IES5Menu && this.$store.state.config.srvAdr == 'China'
             },
@@ -638,7 +638,7 @@ export default {
               router: '/home/ArtAssessment',
               tag: '',
               role: 'admin',
-              permission: '',
+              permission: 'art-read|art-upd',
               menuName: 'ArtAssessment',
               isShow: this.IES5Menu && this.$store.state.config.srvAdr == 'China'
             },

TEAMModelOS/ClientApp/src/router/routes.js

@@ -1326,7 +1326,7 @@ export const routes = [{
         component: () => import('@/view/artexam/Mgt.vue'),
         meta: {
             activeName: 'artExam',
-            middleware: ['login', 'ability:admin'],
+            middleware: ['login', 'ability:admin,art-read|art-upd'],
         }
     },
     //创建艺术评测
@@ -1336,7 +1336,7 @@ export const routes = [{
         component: () => import('@/view/artexam/Create.vue'),
         meta: {
             activeName: 'artExam',
-            middleware: ['login', 'ability:admin'],
+            middleware: ['login', 'ability:admin,art-upd'],
         }
     },
     //艺术评测打分
@@ -1346,7 +1346,7 @@ export const routes = [{
         component: () => import('@/view/assessment/ArtAssessment.vue'),
         meta: {
             activeName: 'artExam',
-            middleware: ['login', 'ability:admin'],
+            middleware: ['login', 'ability:admin,art-upd'],
         }
     }
     ]

TEAMModelOS/ClientApp/src/view/artexam/Mgt.vue

@@ -4,10 +4,10 @@
             <div class="art-exam-list-wrap" slot="left">
                 <div class="art-mgt-top light-iview-select light-iview-input">
                     <span>{{$t('ae.ae28')}}</span>
-                    <span class="to-create-art" @click="toCreate">
+                    <span class="to-create-art" @click="toCreate" v-if="$access.can('admin.*|art-upd')">
                         <Icon type="md-add" />
                     </span>
-                    <span class="to-create-art" @click="delArt" v-show="artInfo.owner === 'school'">
+                    <span class="to-create-art" @click="delArt" v-show="artInfo.owner === 'school'" v-if="$access.can('admin.*|art-upd')">
                         <Icon type="md-trash" />
                     </span>
                 </div>

TEAMModelOS/ClientApp/src/view/teachermgmt/components/mgt/TeacherMgt.vue

@@ -1220,12 +1220,13 @@ export default {
                 res => {
                     // 暂时去掉四类（课纲、内容、题库、知识点）校本资源的读取权限，老师加入学校默认会添加这四个权限
                     let auth = ['content-read', 'exercise-read', 'knowledge-read', 'syllabus-read']
+                    let globalDeL = ['train','art']
                     for (let i = 0; i < res.authoritylist.length; i++) {
                         if (auth.includes(res.authoritylist[i].rowKey)) {
                             res.authoritylist.splice(i, 1)
                             --i
                         }
-                        if (this.$store.state.config.srvAdr == 'Global' && res.authoritylist[i].category === 'train') {
+                        if (this.$store.state.config.srvAdr == 'Global' && globalDeL.includes(res.authoritylist[i].category)) {
                             res.authoritylist.splice(i, 1)
                             --i
                         }
@@ -1245,8 +1246,9 @@ export default {
                         schoolAc: 11,
                         research: 12,
                         train: 13,
-                        analysis: 14,
-                        link: 15,
+                        art: 14,
+                        analysis: 15,
+                        link: 16,
                     }
                     res.authoritylist.sort((a, b) => {
                         return sortMap[a.category] - sortMap[b.category]