Merge branch 'fix_yjw' into debug

src/views/system_manage/newAuthManage.vue

@@ -2,12 +2,12 @@
     <div class="authManage_container">
         <div class="auth_cont_top">
             <div>
-                <!-- <span>{{$t('SystemManage.RoleManage.role_name')}}：</span>
-                <span>{{Role.RoleName}}</span> -->
-                <el-select v-model="role" placeholder="请选择角色" style="width:360px;marginLeft:30px;">
+                <span>{{$t('SystemManage.RoleManage.role_name')}}：</span>
+                <span>{{Role.RoleName}}</span>
+                <!-- <el-select v-model="role" placeholder="请选择角色" style="width:360px;marginLeft:30px;">
                     <el-option v-for="item in roleList" :key="item.RoleId" :label="item.RoleName" :value="item.RoleId">
                     </el-option>
-                </el-select>
+                </el-select> -->
             </div>
             <el-button style="margin-left:auto;marginRight:50px;width:140px;" @click="$router.back()" v-if="!isLook">{{$t('Dialog.cancel_btn')}}
             </el-button>
@@ -67,7 +67,7 @@ export default {
                     if (res.Data.List.length && !this.role) {
                         this.role = res.Data.List[0].RoleId
                     } 
-                    // this.Role = this.roleList.find(i=>i.RoleId===this.role)||{}
+                    this.Role = this.roleList.find(i=>i.RoleId===this.role)||{}
                 }
             })
         },