对接部分接口

src/api/system/user.js

@@ -106,7 +106,8 @@ export function uploadAvatar(data) {
 export function getAuthRole(userId) {
   return request({
     url: '/system/user/authRole/' + userId,
-    method: 'get'
+    method: 'get',
+    showLoading:true,
   })
 }
 

src/views/login.vue

@@ -77,7 +77,7 @@ export default {
       codeUrl: "",
       loginForm: {
         username: "admin",
-        password: "11111",
+        password: "111111",
         rememberMe: false,
         code: "",
         uuid: ""

src/views/system/role/index.vue

@@ -178,23 +178,26 @@
             <el-radio
               v-for="dict in dict.type.sys_normal_disable"
               :key="dict.value"
-              :label="dict.value"
-            >{{dict.label}}</el-radio>
+              :label="dict.value">
+              {{dict.label}}
+            </el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="菜单权限">
           <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
           <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
           <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">自动选中下级</el-checkbox>
-          <el-tree
-            class="tree-border"
-            :data="menuOptions"
-            show-checkbox
-            ref="menu"
-            node-key="id"
-            :check-strictly="!form.menuCheckStrictly"
-            empty-text="加载中，请稍候"
-          ></el-tree>
+          <div style="max-height: 300px;overflow: auto;">
+            <el-tree
+              class="tree-border"
+              :data="menuOptions"
+              show-checkbox
+              ref="menu"
+              node-key="id"
+              :check-strictly="!form.menuCheckStrictly"
+              empty-text="加载中，请稍候"
+            ></el-tree>
+          </div>
         </el-form-item>
         <el-form-item label="备注">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>

src/views/system/user/authRole.vue

@@ -24,7 +24,7 @@
         </template>
       </el-table-column>
       <el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column>
-      <el-table-column label="角色编号" align="center" prop="roleId" />
+      <el-table-column label="角色编号" align="center" prop="id" />
       <el-table-column label="角色名称" align="center" prop="roleName" />
       <el-table-column label="权限字符" align="center" prop="roleKey" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
@@ -92,17 +92,21 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.roleIds = selection.map((item) => item.roleId);
+      this.roleIds = selection.map((item) => item.id);
     },
     // 保存选中的数据编号
     getRowKey(row) {
-      return row.roleId;
+      return row.id;
     },
     /** 提交按钮 */
     submitForm() {
-      const userId = this.form.userId;
       const roleIds = this.roleIds.join(",");
-      updateAuthRole({ userId: userId, roleIds: roleIds }).then((response) => {
+      console.log(this.form.id,roleIds,'111111')
+      let data = {
+        userId: this.form.id,
+        roleIds: roleIds
+      }
+      updateAuthRole(data).then((response) => {
         this.$modal.msgSuccess("授权成功");
         this.close();
       });

src/views/system/user/index.vue

@@ -26,7 +26,6 @@
             node-key="id"
             :default-expanded-keys="defaultKeys"
             :default-checked-keys="defaultKeys"
-            highlight-current
             @node-click="handleNodeClick"
           />
         </div>
@@ -275,10 +274,10 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="状态">
-              <el-radio-group v-model="form.locked">
+              <el-radio-group v-model="form.isLock">
                 <el-radio
                   v-for="dict in dict.type.sys_normal_disable"
-                  :key="dict.value"
+                  :key="`${dict.value}`"
                   :label="dict.value"
                 >{{dict.label}}</el-radio>
               </el-radio-group>