合并分支 'thy' 到 'master'

src/components/evaluationReport/evaluationReport.vue

@@ -97,7 +97,12 @@ export default {
         },
         // 初始请求
         init() {
+            var username = ''
+            if(this.$store.state.userData.userName != 'admin'){
+                 username =this.$store.state.userData.userName
+            }
             let val = {
+                   'username':username,
                 'projectName': this.searchVal,
             }
             this.$server.getEvaluationList(this.currentPage,this.pagesize,val).then(res=>{
@@ -133,7 +138,7 @@ export default {
             // return
             
            this.$router.push({name:'assessmentReport',  query: {
-            username: this.$store.state.userData.userName,
+            username: row.username,
             id: row.id,
             authority: this.$store.state.userData.type
           }})