Merge branch 'master' of git.taauav.net:gitadmin/jndz_admin_web

src/views/basicTable/category.vue

@@ -58,12 +58,6 @@
           align="center"
           prop="createTime"
         ></el-table-column>
-        <el-table-column
-          label="创建人"
-          min-width="80"
-          align="center"
-          prop="createUser"
-        ></el-table-column>
         <el-table-column label="操作" min-width="120" align="center">
           <template slot-scope="{ row }">
             <el-link

src/views/common/fragment/HeaderRight.vue

@@ -4,22 +4,16 @@
     <el-menu-item index="full" @click="fullScreen">
       <i :class="isFullScreen?'el-icon-_screen-restore':'el-icon-_screen-full'"></i>
     </el-menu-item>
-    <el-menu-item index="notice">
-      <ele-notice/><!-- 消息通知组件 -->
-    </el-menu-item>
+   
     <el-submenu index="user" popper-class="ele-menu-pop">
       <template slot="title">
         <el-avatar :src="user.avatar"/>
-        <span>{{ user.nickname || '' }}</span>
+        <span>{{ user.username || '' }}</span>
       </template>
-      <el-menu-item index="info" @click="goUserInfo"><i class="el-icon-user"></i><span>个人中心</span></el-menu-item>
       <el-menu-item index="password" @click="showPassword"><i class="el-icon-key"></i><span>修改密码</span></el-menu-item>
       <el-divider/>
       <el-menu-item index="logout" @click="logout"><i class="el-icon-switch-button"></i><span>退出登录</span></el-menu-item>
     </el-submenu>
-    <el-menu-item index="more" v-if="$setting.showSetting" @click="showSetting">
-      <i class="el-icon-_more"></i>
-    </el-menu-item>
   </el-menu>
 </template>
 

src/views/login/login.vue

@@ -33,7 +33,7 @@ export default {
   data() {
     return {
       loading: false,  // 加载状态
-      form: {username: 'admin', password: '123456', captcha: '520', remember: true, key:''},  // 表单数据
+      form: {username: '', password: '', captcha: '', remember: true, key:''},  // 表单数据
       rules: {  // 表单验证规则
         username: [
           {required: true, message: '请输入账号', trigger: 'blur'}

src/views/system/user/index.vue

@@ -105,17 +105,16 @@
                 <el-option label="女" :value="2"/>
               </el-select>
             </el-form-item>
-            <el-form-item label="职级" prop="levelId">
+            <el-form-item label="职级:" prop="levelId">
               <el-select filterable clearable v-model="editForm.levelId" size="small" placeholder="-请选择职级-">
                 <el-option v-for="item in levelList" :key="item.id" :label="item.name" :value="item.id"/>
               </el-select>
             </el-form-item>
-             <el-form-item label="部门:" prop="roleIds">
-              <el-select v-model="editForm.deptId" placeholder="请选择部门" class="ele-block" clearable multiple>
+             <el-form-item label="部门:" prop="deptId">
+              <el-select filterable clearable v-model="editForm.deptId" size="small" placeholder="-请选择部门-">
                 <el-option v-for="(item,index) in departmentsList" :key="index" :label="item.name" :value="item.id"/>
               </el-select>
             </el-form-item>
-           
           </el-col>
           <el-col :sm="12">
             <el-form-item label="手机号:">