Merge branch 'master' of http://121.4.203.192:9000/mingxue/front

src/permission.js

@@ -13,6 +13,10 @@ const uaWhiteList = ['/question/preview']
 
 router.beforeEach(async(to, from, next) => {
   NProgress.start()
+  // 自动登陆特性
+  const autoToken = to.query?.token
+  if (autoToken) auth.setToken(autoToken)
+  // 挂载token至Vuex
   const token = auth.getToken()
   await store.dispatch('SyncToken', token)
   // 白名单检测

src/views/elective/test/components/test-report-mixin.js

@@ -65,13 +65,13 @@ export default {
       result.sort((left, right) => {
         const lWeight = this.reportConfig.matchedKeys.includes(left.key) ? 100 : 1
         const rWeight = this.reportConfig.matchedKeys.includes(right.key) ? 100 : 1
-        return  right.value * rWeight - left.value * lWeight
+        return right.value * rWeight - left.value * lWeight
       })
       return result
     },
     topOfMergedData() {
       const topThree = this.sortedMergedData.filter(i => this.reportConfig.matchedKeys.includes(i.key))
-      this.defaultActives = topThree.map(i => i.key)
+      this.defaultActives = this.readonly ? this.sortedMergedData.map(i => i.key) : topThree.map(i => i.key)
       return topThree
     },
     chartOptions() {