初始化项目

mes/qd/src/views/system/user/center.vue

@@ -20,8 +20,15 @@
             </div>
             <ul class="user-info">
               <li><div style="height: 100%"><svg-icon icon-class="login" /> 登录账号<div class="user-right">{{ user.username }}</div></div></li>
-              <li><svg-icon icon-class="user1" /> 用户昵称 <div class="user-right">{{ user.nickName }}</div></li>
-              <li><svg-icon icon-class="dept" /> 所属部门 <div class="user-right"> {{ user.dept.name }}</div></li>
+              <li><svg-icon icon-class="user1" /> 用户姓名 <div class="user-right">{{ user.personName }}</div></li>
+              <li><svg-icon icon-class="dept" /> 所属部门
+                <el-tooltip effect="dark" placement="top">
+                  <div slot="content">
+                    <span v-for="item in depts">{{ item.name }} </span>
+                  </div>
+                  <span class="user-right" v-for="item in depts">{{ item.name }}<span v-if="depts.length>1">...</span></span>
+                </el-tooltip>
+              </li>
               <li><svg-icon icon-class="phone" /> 手机号码 <div class="user-right">{{ user.phone }}</div></li>
               <li><svg-icon icon-class="email" /> 用户邮箱 <div class="user-right">{{ user.email }}</div></li>
               <li>
@@ -40,10 +47,10 @@
         <el-card class="box-card">
           <el-tabs v-model="activeName" @tab-click="handleClick">
             <el-tab-pane label="用户资料" name="first">
-              <el-form ref="form" :model="form" :rules="rules" style="margin-top: 10px;" size="small" label-width="65px">
-                <el-form-item label="昵称" prop="nickName">
-                  <el-input v-model="form.nickName" style="width: 35%" />
-                  <span style="color: #C0C0C0;margin-left: 10px;">用户昵称不作为登录使用</span>
+              <el-form ref="form" :model="form" :rules="rules" style="margin-top: 10px;" size="mini" label-width="65px">
+                <el-form-item label="姓名" prop="personName">
+                  <el-input v-model="form.personName" style="width: 35%" />
+                  <span style="color: #C0C0C0;margin-left: 10px;">用户姓名不作为登录使用</span>
                 </el-form-item>
                 <el-form-item label="手机号" prop="phone">
                   <el-input v-model="form.phone" style="width: 35%;" />
@@ -63,10 +70,10 @@
             <!--    操作日志    -->
             <el-tab-pane label="操作日志" name="second">
               <el-table v-loading="loading" :data="data" style="width: 100%;">
-                <el-table-column prop="description" label="行为" />
+                <el-table-column prop="description" label="行为" min-width="130" show-overflow-tooltip />
                 <el-table-column prop="requestIp" label="IP" />
-                <el-table-column :show-overflow-tooltip="true" prop="address" label="IP来源" />
-                <el-table-column prop="browser" label="浏览器" />
+                <el-table-column show-overflow-tooltip prop="address" label="IP来源" />
+                <el-table-column prop="browser" label="浏览器" min-width="120" show-overflow-tooltip />
                 <el-table-column prop="time" label="请求耗时" align="center">
                   <template slot-scope="scope">
                     <el-tag v-if="scope.row.time <= 300">{{ scope.row.time }}ms</el-tag>
@@ -76,6 +83,8 @@
                 </el-table-column>
                 <el-table-column
                   align="right"
+                  min-width="120"
+                  show-overflow-tooltip
                 >
                   <template slot="header">
                     <div style="display:inline-block;float: right;cursor: pointer" @click="init">创建日期<i class="el-icon-refresh" style="margin-left: 40px" /></div>
@@ -114,7 +123,7 @@ import store from '@/store'
 import { isvalidPhone } from '@/utils/validate'
 import { parseTime } from '@/utils/index'
 import crud from '@/mixins/crud'
-import { editUser } from '@/api/system/user'
+import { editUser } from '@/views/system/user'
 import Avatar from '@/assets/images/avatar.png'
 export default {
   name: 'Center',
@@ -140,9 +149,10 @@ export default {
         'Authorization': getToken()
       },
       form: {},
+      deptsName: '',
       rules: {
-        nickName: [
-          { required: true, message: '请输入用户昵称', trigger: 'blur' },
+        personName: [
+          { required: true, message: '请输入用户姓名', trigger: 'blur' },
           { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
         ],
         phone: [
@@ -154,12 +164,13 @@ export default {
   computed: {
     ...mapGetters([
       'user',
+      'depts',
       'updateAvatarApi',
       'baseApi'
     ])
   },
   created() {
-    this.form = { id: this.user.id, nickName: this.user.nickName, gender: this.user.gender, phone: this.user.phone }
+    this.form = { id: this.user.id, personName: this.user.personName, gender: this.user.gender, phone: this.user.phone }
     store.dispatch('GetInfo').then(() => {})
   },
   methods: {

mes/qd/src/views/system/user/center/updateEmail.vue

@@ -1,13 +1,9 @@
 <template>
   <div style="display: inline-block;">
     <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="title" append-to-body width="475px" @close="cancel">
-      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="88px">
+      <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="88px">
         <el-form-item label="新邮箱" prop="email">
           <el-input v-model="form.email" auto-complete="on" style="width: 200px;" />
-          <el-button :loading="codeLoading" :disabled="isDisabled" size="small" @click="sendCode">{{ buttonName }}</el-button>
-        </el-form-item>
-        <el-form-item label="验证码" prop="code">
-          <el-input v-model="form.code" style="width: 320px;" />
         </el-form-item>
         <el-form-item label="当前密码" prop="pass">
           <el-input v-model="form.pass" type="password" style="width: 320px;" />
@@ -24,7 +20,7 @@
 <script>
 import store from '@/store'
 import { validEmail } from '@/utils/validate'
-import { updateEmail } from '@/api/system/user'
+import { updateEmail } from '@/views/system/user'
 import { resetEmail } from '@/api/system/code'
 export default {
   props: {
@@ -48,16 +44,12 @@ export default {
     return {
       loading: false, dialog: false, title: '修改邮箱', form: { pass: '', email: '', code: '' },
       user: { email: '', password: '' }, codeLoading: false,
-      buttonName: '获取验证码', isDisabled: false, time: 60,
       rules: {
         pass: [
           { required: true, message: '当前密码不能为空', trigger: 'blur' }
         ],
         email: [
           { required: true, validator: validMail, trigger: 'blur' }
-        ],
-        code: [
-          { required: true, message: '验证码不能为空', trigger: 'blur' }
         ]
       }
     }

mes/qd/src/views/system/user/center/updatePass.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="display: inline-block">
     <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="title" append-to-body width="500px" @close="cancel">
-      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="88px">
+      <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="88px">
         <el-form-item label="旧密码" prop="oldPass">
           <el-input v-model="form.oldPass" type="password" auto-complete="on" style="width: 370px;" />
         </el-form-item>
@@ -22,7 +22,7 @@
 
 <script>
 import store from '@/store'
-import { updatePass } from '@/api/system/user'
+import { updatePass } from '@/views/system/user/user'
 export default {
   data() {
     const confirmPass = (rule, value, callback) => {

mes/qd/src/views/system/user/dialog/relevanceDeptDialog.vue

@@ -0,0 +1,181 @@
+<template>
+  <el-dialog
+    title="关联用户"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="1000px"
+    @close="close"
+    @open="open"
+  >
+    <el-form
+      :inline="true"
+      class="demo-form-inline"
+      label-position="right"
+      label-width="80px"
+      label-suffix=":"
+    >
+      <el-form-item label="模糊搜索">
+        <el-input
+          v-model="query.name"
+          clearable
+          size="mini"
+          placeholder="输入部门名称搜索"
+          style="width: 200px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-form-item>
+      <rrOperation />
+    </el-form>
+
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      lazy
+      row-key="dept_id"
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+      :load="getDeptDatas"
+      default-expand-all
+      style="width: 100%;"
+      size="mini"
+      border
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      @select="handleSelectionChange"
+      @current-change="clickChange"
+    >
+      <el-table-column v-if="!isSingle" type="selection" width="55" />
+      <el-table-column v-if="isSingle" label="选择" width="55">
+        <template slot-scope="scope">
+          <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
+        </template>
+      </el-table-column>
+      <el-table-column label="名称" prop="name" />
+      <el-table-column label="排序" prop="deptSort" />
+      <el-table-column prop="createTime" label="创建日期" />
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+import crudDept from '@/views/system/dept/dept'
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+
+export default {
+  name: 'RelevanceDeptDialog',
+  components: { rrOperation, pagination },
+  cruds() {
+    return CRUD({ title: '部门', idField: 'deptId', url: 'api/dept/vo', crudMethod: { ...crudDept }, query: { isUsed: '1' }})
+  },
+  mixins: [presenter(), header()],
+  dicts: ['product_series'],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    isSingle: {
+      type: Boolean,
+      default: true
+    },
+    depts: {
+      type: Array
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      classes: [],
+      tableRadio: null,
+      class_idStr: null,
+      checkrow: null,
+      rows: []
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    clickChange(item) {
+      this.tableRadio = item
+    },
+    open() {
+      // 回显
+      this.$nextTick(function() {
+        for (var k = 0; k < this.depts.length; k++) {
+          for (var i = 0; i < this.crud.data.length; i++) {
+            if (this.crud.data[i].deptId == this.depts[k].deptId) {
+              this.$refs.table.toggleRowSelection(this.crud.data[i], true)
+              break
+            }
+          }
+        }
+      })
+    },
+    handleSelectionChange(val, row) {
+      if (val.length > 1 && this.isSingle) {
+        this.$refs.table.clearSelection()
+        this.$refs.table.toggleRowSelection(val.pop())
+      } else {
+        this.checkrow = row
+      }
+    },
+    onSelectAll() {
+      this.$refs.table.clearSelection()
+    },
+    close() {
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+    },
+    submit() {
+      // 处理单选
+      if (this.isSingle && this.tableRadio) {
+        this.$emit('update:dialogShow', false)
+        this.$emit('selectDepts', this.tableRadio)
+        return
+      }
+      this.rows = this.$refs.table.selection
+      if (this.rows.length <= 0) {
+        this.$message('请先勾选用户')
+        return
+      }
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+      this.$emit('selectDepts', this.rows)
+      // console.log(this.rows)
+    },
+    getDeptDatas(tree, treeNode, resolve) {
+      const params = { pid: tree.deptId }
+      setTimeout(() => {
+        crudDept.getDeptvo(params).then(res => {
+          resolve(res.content)
+        })
+      }, 100)
+    },
+    [CRUD.HOOK.afterRefresh]() {
+      this.open()
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 0px;
+}
+</style>
+

mes/qd/src/views/system/user/dialog/relevanceUserDialog.vue

@@ -0,0 +1,175 @@
+<template>
+  <el-dialog
+    title="关联用户"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="1000px"
+    @close="close"
+    @open="open"
+  >
+    <el-form
+      :inline="true"
+      class="demo-form-inline"
+      label-position="right"
+      label-width="80px"
+      label-suffix=":"
+    >
+      <el-form-item label="模糊搜索">
+        <el-input
+          v-model="query.blurry"
+          clearable
+          size="mini"
+          placeholder="输入账号或者名称"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-form-item>
+      <rrOperation />
+    </el-form>
+
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      style="width: 100%;"
+      size="mini"
+      border
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      @select="handleSelectionChange"
+      @current-change="clickChange"
+    >
+      <el-table-column v-if="!isSingle" type="selection" width="55" />
+      <el-table-column v-if="isSingle" label="选择" width="55">
+        <template slot-scope="scope">
+          <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
+        </template>
+      </el-table-column>
+      <el-table-column prop="username" label="用户名" :min-width="flexWidth('username',crud.data,'用户名')" />
+      <el-table-column
+        prop="personName"
+        label="姓名"
+        :min-width="flexWidth('personName',crud.data,'姓名')"
+      />
+      <el-table-column show-overflow-tooltip prop="deptnames" label="部门" />
+      <el-table-column label="状态" align="center" prop="enabled">
+        <template slot-scope="scope">
+          {{scope.row.isUsed==1?'启用':'禁用'}}
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+import crudUser from '../user'
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+
+export default {
+  name: 'RelevanceUserDialog',
+  components: { rrOperation, pagination },
+  cruds() {
+    return CRUD({ title: '用户', idField: 'userId', url: 'api/users', crudMethod: { ...crudUser }, query: {isUsed: '1'}})
+  },
+  mixins: [presenter(), header()],
+  dicts: ['product_series'],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    isSingle: {
+      type: Boolean,
+      default: true
+    },
+    users: {
+      type: Array
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      classes: [],
+      tableRadio: null,
+      class_idStr: null,
+      checkrow: null,
+      rows: []
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    clickChange(item) {
+      this.tableRadio = item
+    },
+    open() {
+      this.$nextTick(function() {
+        console.log(this.crud.data)
+        for (var k = 0; k < this.users.length; k++) {
+          for (var i = 0; i < this.crud.data.length; i++) {
+            if (this.crud.data[i].userId == this.users[k].userId) {
+              this.$refs.table.toggleRowSelection(this.crud.data[i], true)
+              break
+            }
+          }
+        }
+      })
+    },
+    handleSelectionChange(val, row) {
+      if (val.length > 1 && this.isSingle) {
+        this.$refs.table.clearSelection()
+        this.$refs.table.toggleRowSelection(val.pop())
+      } else {
+        this.checkrow = row
+      }
+    },
+    onSelectAll() {
+      this.$refs.table.clearSelection()
+    },
+    close() {
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+    },
+    submit() {
+      // 处理单选
+      if (this.isSingle && this.tableRadio) {
+        this.$emit('update:dialogShow', false)
+        this.$emit('selectUsers', this.tableRadio)
+        return
+      }
+      this.rows = this.$refs.table.selection
+      if (this.rows.length <= 0) {
+        this.$message('请先勾选用户')
+        return
+      }
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+      this.$emit('selectUsers', this.rows)
+      // console.log(this.rows)
+    },
+    [CRUD.HOOK.afterRefresh]() {
+      this.open()
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 0px;
+}
+</style>
+

mes/qd/src/views/system/user/dialog/showDataPermissionDialog.vue

@@ -0,0 +1,96 @@
+<template>
+  <el-dialog
+    title="数据权限"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="1000px"
+    @close="close"
+    @open="open"
+  >
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      style="width: 100%;"
+      size="mini"
+      border
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+    >
+      <el-table-column prop="permission_scope_type" label="权限类型" min-width="100" show-overflow-tooltip />
+      <el-table-column prop="permission_name" label="权限范围" min-width="100" show-overflow-tooltip />
+      <el-table-column prop="dept_name" label="部门名称" min-width="100" show-overflow-tooltip />
+      <el-table-column prop="person_name" label="用户名称" min-width="100" show-overflow-tooltip />
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+
+export default {
+  name: 'ShowDataPermissionDialog',
+  components: { rrOperation, pagination },
+  cruds() {
+    return CRUD({ title: '权限明细', idField: 'userId', url: 'api/dataPermission/dataDetail'})
+  },
+  mixins: [presenter(), header()],
+  dicts: ['product_series'],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    currentUserId: {
+      type: Number,
+      default: 0
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      classes: [],
+      tableRadio: null,
+      rows: []
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    clickChange(item) {
+      this.tableRadio = item
+    },
+    open() {
+      console.log(this.currentUserId)
+    },
+    close() {
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+    },
+    [CRUD.HOOK.afterRefresh]() {
+      this.open()
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 0px;
+}
+</style>
+

mes/qd/src/views/system/user/user.js

@@ -0,0 +1,61 @@
+import request from '@/utils/request'
+import { encrypt } from '@/utils/rsaEncrypt'
+
+export function add(data) {
+  return request({
+    url: 'api/users',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/users',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/users',
+    method: 'put',
+    data
+  })
+}
+
+export function editUser(data) {
+  return request({
+    url: 'api/users/center',
+    method: 'put',
+    data
+  })
+}
+
+export function updatePass(user) {
+  const data = {
+    oldPass: encrypt(user.oldPass),
+    newPass: encrypt(user.newPass)
+  }
+  return request({
+    url: 'api/users/updatePass/',
+    method: 'post',
+    data
+  })
+}
+
+export function updateEmail(form) {
+  const data = {
+    password: encrypt(form.pass),
+    email: form.email
+  }
+  return request({
+    url: 'api/users/updateEmail/' + form.code,
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, updatePass }
+