合并分支 'crs' 到 'master'

src/components/home/home.vue

@@ -116,10 +116,14 @@ export default {
         },
         // 跳转到其他页面
         goOther(path) {
-            if (path === 'http://120.55.57.35:8080/assessment/#/Assessment') {
+            if (path === 'http://120.55.57.35:8080/assessment/#/Assessment' && this.$store.getters.getUserData.type !== 1) {
                 let val = 'http://120.55.57.35:8080/assessment/#/Assessment' + '?username=' + this.$store.getters.getUserData.userName + '&authority=0';
                 window.open(val);
-            } else {
+            } else if (path === 'http://120.55.57.35:8080/assessment/#/Assessment' && this.$store.getters.getUserData.type === 1) {
+                let val = 'http://120.55.57.35:8080/assessment/#/Assessment' + '?username=' + this.$store.getters.getUserData.userName + '&authority=1';
+                window.open(val);
+            }
+            else {
                 window.open(path);
             }
         }