1

src/api/system/menu.js

@@ -20,7 +20,7 @@ export function getMenu(menuId) {
 // 查询菜单下拉树结构
 export function treeSelect() {
   return request({
-    url: "/system/menu/tree_select",
+    url: "/system/menu/tree-select",
     method: "get",
   });
 }
@@ -28,7 +28,7 @@ export function treeSelect() {
 // 根据角色ID查询菜单下拉树结构
 export function roleMenuTreeselect(roleId) {
   return request({
-    url: "/system/menu/role_menu_tree_select/" + roleId,
+    url: "/system/menu/role-menu-tree-select/" + roleId,
     method: "get",
   });
 }

src/views/system/user/index.vue

@@ -468,6 +468,11 @@
               <el-checkbox v-model="upload.updateSupport" />
               是否更新已经存在的用户数据
             </div>
+            <div>
+              1. (*)为必填项
+              2. 角色,岗位请填数字编号
+              3. 角色,岗位若存在多个,| 隔开即可
+            </div>
             <span>仅允许导入xls、xlsx格式文件。</span>
             <el-link
               :underline="false"

src/views/system/user/profile/index.vue

@@ -15,20 +15,20 @@
             <ul class="list-group list-group-striped">
               <li class="list-group-item">
                 <svg-icon icon-class="user" />用户名称
-                <div class="pull-right">{{ state.user.userName }}</div>
+                <div class="pull-right">{{ state.user.username }}</div>
               </li>
               <li class="list-group-item">
                 <svg-icon icon-class="phone" />手机号码
-                <div class="pull-right">{{ state.user.phonenumber }}</div>
+                <div class="pull-right">{{ state.user.phone }}</div>
               </li>
               <li class="list-group-item">
                 <svg-icon icon-class="email" />用户邮箱
                 <div class="pull-right">{{ state.user.email }}</div>
               </li>
               <li class="list-group-item">
-                <svg-icon icon-class="tree" />所属部门
+                <svg-icon icon-class="tree" />所在岗位
-                <div class="pull-right" v-if="state.user.dept">
+                <div class="pull-right" >
-                  {{ state.user.dept.deptName }} / {{ state.postGroup }}
+                 {{ state.postGroup }}
                 </div>
               </li>
               <li class="list-group-item">