1.添加账号管理交互

jack
1 parent b5114789
Showing 14 changed files with 372 additions and 76 deletions
package-lock.json
package.json
src/api/role.js
src/api/subject.js
src/api/teacher.js
src/api/user.js
src/layout/index.vue
src/permission.js
src/store/modules/user.js
src/styles/sidebar.scss
src/utils/auth.js
src/utils/request.js
src/views/account/index.vue
src/views/login/index.vue
@@ -6320,7 +6320,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -6341,12 +6342,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -6361,17 +6364,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -6488,7 +6494,8 @@
         "inherits": {
           "version": "2.0.4",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -6500,6 +6507,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -6514,6 +6522,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -6521,12 +6530,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.9.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -6545,6 +6556,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -6634,7 +6646,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -6646,6 +6659,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -6731,7 +6745,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -6767,6 +6782,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -6786,6 +6802,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -6829,12 +6846,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -12175,10 +12194,9 @@
       "dev": true
     },
     "qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-      "dev": true
+      "version": "6.9.1",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.1.tgz",
+      "integrity": "sha512-Cxm7/SS/y/Z3MHWSxXb8lIFqgqBowP5JMlTUFyJN88y0SGQhVmZnqFK/PeuMX9LzUyWsqqhNxIyg0jlzq946yA=="
     },
     "query-string": {
       "version": "5.1.1",
@@ -12607,6 +12625,14 @@
         "tough-cookie": "~2.5.0",
         "tunnel-agent": "^0.6.0",
         "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "qs": {
+          "version": "6.5.2",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+          "dev": true
+        }
       }
     },
     "request-promise-core": {
@@ -12829,7 +12855,8 @@
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
       "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "rx-lite-aggregates": {
       "version": "4.0.8",
@@ -24,6 +24,7 @@
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",
+    "qs": "^6.9.1",
     "vue": "2.6.10",
     "vue-router": "3.0.6",
     "vuex": "3.1.0"
+import request from '@/utils/request'
+
+export function getRoleList(params) {
+  return request({
+    url: '/role/list',
+    method: 'get',
+    params
+  })
+}
+
+import request from '@/utils/request'
+
+export function getSubjectList(params) {
+  return request({
+    url: '/subject/list',
+    method: 'get',
+    params
+  })
+}
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: '/teacher/add',
+    method: 'post',
+    data
+  })
+}
+export function deluser(id) {
+  return request({
+    url: '/teacher/del',
+    method: 'post',
+    data: { id }
+  })
+}
@@ -18,7 +18,40 @@ export function getInfo(token) {
 export function logout() {
   return request({
-    url: '/vue-admin-template/user/logout',
+    url: '/logout',
     method: 'post'
   })
 }
+
+export function getUserList(schoolId) {
+  return request({
+    url: '/user/schoolusers',
+    method: 'post',
+    data: { schoolId }
+  })
+}
+
+export function enableUser(id, enable) {
+  return request({
+    url: '/user/enableuser',
+    method: 'post',
+    data: { id, enable }
+  })
+}
+
+export function searchUser(data) {
+  return request({
+    url: '/user/search',
+    method: 'post',
+    data
+  })
+}
+
+export function resetpass(data) {
+  return request({
+    url: '/user/resetpass',
+    method: 'post',
+    data
+  })
+}
+
@@ -58,7 +58,7 @@ export default {
     @include clearfix;
     position: relative;
     height: 100%;
-    width: 100%;
+    width:100%;
     &.mobile.openSidebar{
       position: fixed;
       top: 0;
@@ -32,7 +32,7 @@ router.beforeEach(async(to, from, next) =&gt; {
       } else {
         try {
           // get user info
-          await store.dispatch('user/getInfo')
+          // await store.dispatch('user/getInfo')
           next()
         } catch (error) {
@@ -3,7 +3,11 @@ import {
   getToken,
   setToken,
   removeToken,
-  setLogoLayout
+  removeUser,
+  setLogoLayout,
+  saveuser,
+  setuserinfo,
+  removeuserinfo
 } from '@/utils/auth'
 import { resetRouter } from '@/router'
@@ -12,7 +16,8 @@ const getDefaultState = () =&gt; {
     token: getToken(),
     name: '',
     avatar: '',
-    logoLayout: ''
+    logoLayout: '',
+    userInfo: {}
   }
 }
@@ -33,6 +38,9 @@ const mutations = {
   },
   SET_LOGOLAYOUT: (state, logoLayout) => {
     state.logoLayout = logoLayout
+  },
+  SET_USERINFO: (state, userInfo) => {
+    state.userInfo = userInfo
   }
 }
@@ -44,9 +52,12 @@ const actions = {
       login({ username: username.trim(), password: password })
         .then(response => {
           const { data } = response
-          commit('SET_TOKEN', data.token)
+          console.log(data)
+          commit('SET_TOKEN', data.username)
           commit('SET_LOGOLAYOUT', data.logoLayout)
-          setToken(data.token)
+          commit('SET_USERINFO', JSON.stringify(data))
+          setuserinfo(JSON.stringify(data))
+          setToken(data.username)
           setLogoLayout(data.logoLayout)
           resolve(response)
         })
@@ -79,12 +90,22 @@ const actions = {
     })
   },
+  saveuser({ commit }, userInfo) {
+    console.log(userInfo)
+    const { username, password } = userInfo
+    const param = { username: username.trim(), password: password }
+    console.log(param)
+    saveuser(JSON.stringify(param))
+  },
+
   // user logout
   logout({ commit, state }) {
     return new Promise((resolve, reject) => {
       logout(state.token)
         .then(() => {
           removeToken() // must remove  token  first
+          removeUser()
+          removeuserinfo()
           resetRouter()
           commit('RESET_STATE')
           resolve()
@@ -106,6 +106,9 @@
         [class^="el-icon-"] {
           margin-left: 20px;
         }
+        [class^="el-ump-"] {
+          margin-left: 20px;
+        }
         .svg-icon {
           margin-left: 20px;
         }
@@ -22,3 +22,25 @@ export function getLogoLayout() {
 export function setLogoLayout(token) {
   return Cookies.set(LogoLayout, token)
 }
+
+export function saveuser(userinfo) {
+  return Cookies.set('logininfo', userinfo)
+}
+
+export function getuser() {
+  return Cookies.get('logininfo')
+}
+
+export function removeUser() {
+  return Cookies.remove('logininfo')
+}
+
+export function setuserinfo(userinfo) {
+  return Cookies.set('userinfo', userinfo)
+}
+export function getuserinfo() {
+  return Cookies.set('userinfo')
+}
+export function removeuserinfo() {
+  return Cookies.remove('userinfo')
+}
@@ -2,6 +2,7 @@ import axios from &#39;axios&#39;
 import { MessageBox, Message } from 'element-ui'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
+import qs from 'qs'
 // create an axios instance
 const service = axios.create({
@@ -14,7 +15,8 @@ const service = axios.create({
 service.interceptors.request.use(
   config => {
     // do something before request is sent
-
+    console.log(config)
+    config.data = qs.stringify(config.data)
     if (store.getters.token) {
       // let each request carry token
       // ['X-Token'] is a custom headers key
@@ -46,7 +48,7 @@ service.interceptors.response.use(
     const res = response.data
     // if the custom code is not 20000, it is judged as an error.
-    if (res.code !== 20000) {
+    if (res.code !== 0) {
       Message({
         message: res.message || 'Error',
         type: 'error',
@@ -4,31 +4,30 @@
     <div class="app-container">
       <div class="btm-group">
-        <el-button type="primary" @click="accountdialog=true">新增账号</el-button>
+        <el-button type="primary" @click="add">新增账号</el-button>
         <el-button type="primary" @click="importdialog=true">批量导入</el-button>
         <el-button type="primary">批量导出</el-button>
         <el-button type="danger">批量删除</el-button>
       </div>
       <div class="select-group">
         <el-form ref="form" :inline="true" :model="form" label-width="60px">
-          <el-form-item label="角色：">
+          <el-form-item label="角色：" prop="role">
             <el-select v-model="form.role" style="width:100px" size="small" placeholder="请选择角色">
               <el-option label="全部" value="" />
-              <el-option label="教师" value="teacher" />
-              <el-option label="班主任" value="bzr" />
+              <el-option v-for="(item,index) in roleList" :key="index" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
-          <el-form-item label="账号：">
+          <el-form-item label="账号：" prop="account">
             <el-input v-model="form.account" size="small" placeholder="请输入账号" />
           </el-form-item>
-          <el-form-item label="姓名：">
+          <el-form-item label="姓名：" prop="name">
             <el-input v-model="form.name" size="small" placeholder="请输入姓名" />
           </el-form-item>
-          <el-form-item label="状态：">
+          <el-form-item label="状态：" prop="state">
             <el-select v-model="form.state" style="width:100px;" size="small" placeholder="请选择状态">
               <el-option label="全部" value="" />
-              <el-option label="正常" value="normal" />
-              <el-option label="禁用" value="disable" />
+              <el-option label="正常" value="1" />
+              <el-option label="禁用" value="0" />
             </el-select>
           </el-form-item>
           <el-form-item>
@@ -51,11 +50,18 @@
           width="55"
         />
         <el-table-column
-          prop="role"
-          label="角色"
+          label="序号"
+        >
+          <template slot-scope="scope">
+            {{ scope.$index+1 }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="id"
+          label="ID"
         />
         <el-table-column
-          prop="account"
+          prop="username"
           label="账号"
         />
         <el-table-column
@@ -67,19 +73,23 @@
           label="性别"
         />
         <el-table-column
-          prop="code"
-          label="授权码"
+          prop="roleName"
+          label="角色"
         />
         <el-table-column
-          prop="state"
+          prop="enable"
           label="状态"
-        />
+        >
+          <template slot-scope="scope">
+            {{ scope.row.enable==1?'正常':'禁用' }}
+          </template>
+        </el-table-column>
         <el-table-column label="操作" width="250">
           <template slot-scope="scope">
-            <el-button type="success" size="small" icon="el-ump-bofang" circle @click="enable(scope)" />
-            <el-button type="primary" size="small" icon="el-ump-yuechi" circle @click="enable(scope)" />
-            <el-button type="primary" size="small" icon="el-icon-edit-outline" circle @click="enable(scope)" />
-            <el-button type="danger" size="small" icon="el-icon-delete" circle @click="enable(scope)" />
+            <el-button :type="scope.row.enable==1?'success':'warning'" size="small" :icon="scope.row.enable==1?'el-ump-bofang':'el-ump-zanting'" circle @click="enable(scope.row)" />
+            <el-button type="primary" size="small" icon="el-ump-yuechi" circle @click="reset(scope.row)" />
+            <el-button type="primary" size="small" icon="el-icon-edit-outline" circle @click="edit(scope.row)" />
+            <el-button type="danger" size="small" icon="el-icon-delete" circle @click="deluser(scope.row)" />
           </template>
         </el-table-column>
       </el-table>
@@ -89,55 +99,52 @@
     <el-dialog
       title="账号信息"
       :visible.sync="accountdialog"
-      width="30%"
     >
       <el-form ref="account" :model="account" label-width="100px" style="margin-top:30px;">
-        <el-form-item label="用户角色">
+        <el-form-item label="用户角色" prop="role">
           <el-select v-model="account.role" style="width:300px;" placeholder="请选择">
             <el-option
-              v-for="item in roles"
+              v-for="item in roleList"
               :key="item.id"
-              :label="item.label"
+              :label="item.name"
               :value="item.id"
             >
-              <span style="float: left">{{ item.label }}</span>
+              <span style="float: left">{{ item.name }}</span>
               <span style="float: right; color: #8492a6; font-size: 13px">{{ item.dec }}</span>
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="账号">
-          <el-input v-model="account.account" style="width:300px;" placeholder="请输入账号" />
+        <el-form-item label="账号" prop="username">
+          <el-input v-model="account.username" style="width:300px;" placeholder="请输入账号" />
           <p class="password">初始密码统一为123456</p>
         </el-form-item>
-        <el-form-item label="姓名">
+        <el-form-item label="姓名" prop="name">
           <el-input v-model="account.name" style="width:300px;" placeholder="请输入真实姓名" />
         </el-form-item>
-        <el-form-item label="性别">
+        <el-form-item label="性别" prop="sex">
           <el-select v-model="account.sex" style="width:300px;" placeholder="请选择性别">
             <el-option value="0" label="男" />
             <el-option value="1" label="女" />
           </el-select>
         </el-form-item>
-        <el-form-item label="科目">
-          <el-select v-model="account.object" style="width:300px;" placeholder="请选择">
-            <el-option value="0" label="语文" />
-            <el-option value="1" label="数学" />
+        <el-form-item label="科目" prop="subjectId">
+          <el-select v-model="account.subjectId" style="width:300px;" placeholder="请选择">
+            <el-option v-for="(item,index) in subjectList" :key="index" :value="item.id" :label="item.cname" />
           </el-select>
         </el-form-item>
-        <el-form-item label="备注">
+        <el-form-item label="备注" prop="remark">
           <el-input v-model="account.remark" style="width:300px;" />
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="accountdialog = false">取 消</el-button>
-        <el-button type="primary" @click="accountdialog = false">保 存</el-button>
+        <el-button @click="close">取 消</el-button>
+        <el-button type="primary" @click="save">保 存</el-button>
       </span>
     </el-dialog>
     <!--批量导入-->
     <el-dialog
       title="批量导入用户"
       :visible.sync="importdialog"
-      width="30%"
     >
       <p>第一步：下载模板并编辑完成用户的信息 <el-link type="primary"><i class="el-ump-xiazai" />下载导入模板</el-link></p>
       <p>第二步：上传编辑完成的模板文件，完成导入</p>
@@ -161,8 +168,12 @@
 </template>
 <script>
-import { getList } from '@/api/table'
 import Dec from '@/components/Dec'
+import { getUserList, searchUser, resetpass, enableUser } from '@/api/user'
+import { getRoleList } from '@/api/role'
+import { getSubjectList } from '@/api/subject'
+import { add, deluser } from '@/api/teacher'
+import { getuserinfo } from '@/utils/auth'
 export default {
   components: {
@@ -171,6 +182,7 @@ export default {
   data() {
     return {
       list: null,
+      dept: '',
       listLoading: false,
       accountdialog: false,
       importdialog: false,
@@ -179,33 +191,153 @@ export default {
         { id: 0, label: '任课老师', dec: '无班级管理权限' },
         { id: 1, label: '班主任', dec: '有班级管理权限' }
       ],
+      roleList: [],
+      subjectList: [],
       form: {
         role: '',
         account: '',
         name: '',
         state: ''
       },
-      tableData: [
-        { role: '教师', account: 'zhangsan', name: '赵旭岚', sex: '女', code: '2322', state: '正常' }
-      ],
+      tableData: [],
+
       multipleSelection: [],
-      account: { role: '', account: '' }
+      account: {
+        role: '',
+        username: '',
+        name: '',
+        sex: '',
+        subjectId: '',
+        marker: ''
+      }
     }
   },
   created() {
-    // this.fetchData()
+    const userInfo =
+    JSON.stringify(this.$store.state.user.userInfo === '{}')
+      ? JSON.parse(getuserinfo())
+      : JSON.parse(this.$store.state.user.userInfo)
+    this.dept = userInfo.dept
+    this.fetchData(userInfo.dept)
+    this.getRoleList()
+    this.getSubjectList()
   },
   methods: {
-    fetchData() {
+    fetchData(id) {
       this.listLoading = true
-      getList().then(response => {
-        this.list = response.data.items
-        this.listLoading = false
+      getUserList(id).then(res => {
+        console.log(res)
+        this.tableData = res.data.data
       })
     },
-    search() {},
-    clear() {},
+    add() {
+      this.accountdialog = true
+    },
+    save() {
+      const param = {
+        ...this.account,
+        password: '123456',
+        schoolId: this.dept
+      }
+
+      add(param).then(res => {
+        if (res.code === 0) {
+          this.fetchData(this.dept)
+          this.accountdialog = false
+        }
+      })
+    },
+    close() {
+      this.$refs.account.resetFields()
+      this.accountdialog = false
+    },
+    deluser(row) {
+      this.$confirm(`确认删除用户？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'danger'
+      }).then(() => {
+        deluser(row.id).then(res => {
+          this.$message.success('删除成功')
+          this.fetchData(this.dept)
+        })
+      })
+    },
+    search() {
+      const param = {
+        roleid: this.form.role,
+        username: this.form.account,
+        name: this.form.name,
+        enable: this.form.state
+      }
+      searchUser(param).then(res => {
+        this.tableData = res.data.data
+      })
+    },
+    getRoleList() {
+      getRoleList({ dept: this.dept }).then(res => {
+        console.log(res)
+        this.roleList = res.data
+      })
+    },
+    getSubjectList() {
+      getSubjectList().then(res => {
+        console.log(res)
+        this.subjectList = res.data
+      })
+    },
+    clear() {
+      this.$refs.form.resetFields()
+    },
+    reset(row) {
+      this.$confirm(`<h3>密码重置后：</h3>
+                      <p>·初始密码为：123456</p>
+                      <p>·重置后首次登录，用户需主动修改密码</p>
+`, '确认重置密码？', {
+        confirmButtonText: '确定',
+        dangerouslyUseHTMLString: true,
+        cancelButtonText: '取消'
+      }).then(() => {
+        const param = {
+          id: row.id,
+          password: '123456'
+        }
+        resetpass(param).then(res => {
+          console.log(res)
+          if (res.code === 0) {
+            this.$message({
+              type: 'success',
+              message: '重置成功!'
+            })
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消重置'
+        })
+      })
+    },
+    enable(row) {
+      enableUser(row.id, 1 ^ row.enable).then(res => {
+        console.log(res)
+        this.fetchData(this.dept)
+      })
+    },
+    edit(row) {
+      this.accountdialog = true
+      // this.$refs.account.resetFields()
+      // this.$refs['account'].resetFields()
+      this.account = {
+        role: row.roleName,
+        username: row.username,
+        name: row.username,
+        sex: row.sex,
+        subject: row.subject,
+        marker: row.marker
+      }
+    },
     handleSelectionChange(val) {
       this.multipleSelection = val
     },
@@ -75,6 +75,7 @@
 <script>
 import { validUsername } from '@/utils/validate'
+import { getuser } from '@/utils/auth'
 export default {
   name: 'Login',
@@ -96,7 +97,7 @@ export default {
     return {
       loginForm: {
         username: 'admin',
-        password: '111111'
+        password: '123456'
       },
       loginRules: {
         username: [
@@ -121,6 +122,22 @@ export default {
       immediate: true
     }
   },
+  created() {
+    console.log(getuser())
+    const userinfo = getuser()
+    if (typeof (userinfo) !== 'undefined') {
+      this.loginForm = JSON.parse(userinfo)
+      this.$store
+        .dispatch('user/login', this.loginForm)
+        .then(res => {
+          this.$router.push({ path: this.redirect || '/' })
+          this.loading = false
+        })
+        .catch(() => {
+          this.loading = false
+        })
+    }
+  },
   methods: {
     showPwd() {
       if (this.passwordType === 'password') {
@@ -139,7 +156,10 @@ export default {
           this.$store
             .dispatch('user/login', this.loginForm)
             .then(res => {
-              console.log(res)
+              console.log(this.loginForm)
+              if (this.auto) {
+                this.$store.dispatch('user/saveuser', this.loginForm)
+              }
               this.$router.push({ path: this.redirect || '/' })
               this.loading = false
             })