合并分支 'crs' 到 'master'

src/components/evaluationReport/evaluationReport.vue

@@ -86,12 +86,11 @@ export default {
     },
     methods: {
         add(){
-            console.log(this.$store.state.userData.userName)
             this.$router.push({
                 name: 'assessmentReport',
                 query: {
-                    username:this.$store.state.userData.userName,
-                    authority: this.$store.state.userData.type,
+                    username:this.$store.getters.getUserData.userName,
+                    authority: this.$store.getters.getUserData.type,
                     id: null,
                 }
             });
@@ -107,13 +106,10 @@ export default {
         },
         // 初始请求
         init() {
-            let username = ''
-            if (this.$store.state.userData.userName !== 'admin'){
-                username =this.$store.state.userData.userName
-            }
             let val = {
-                'username':username,
-                'projectName': this.searchVal,
+                searchMap: {
+                    'username':this.$store.getters.getUserData.userName
+                }
             }
             this.$server.getEvaluationList(this.currentPage,this.pagesize,val).then(res=>{
                 console.log(res.data)
@@ -144,11 +140,10 @@ export default {
         // 评估
         evaluation(row) {
             console.log(row)
-            console.log(this.$store.state.userData)
             this.$router.push({name:'assessmentReport',  query: {
                 username: row.username,
                 id: row.id,
-                authority: this.$store.state.userData.type
+                authority: this.$store.getters.getUserData.type
             }})
             // // return
             //  let Logistics= this.$router.resolve({
@@ -178,7 +173,7 @@ export default {
             this.$router.push({name:'reportAssess',query: {
                 username: row.username,
                 id:row.id,
-                authority:this.$store.state.userData.type,
+                authority:this.$store.getters.getUserData.type,
             }})
         },
         // 删除