用户管理

src/api/modules/manage/role.ts

@@ -0,0 +1,38 @@
+import { handle } from '../../index'
+
+const suffix = 'api'
+
+// 分页
+export const rolesGetByPage = (params: any) => handle({
+  url: `/${suffix}/roles/getByPage`,
+  method: 'get',
+  params
+})
+// 详情
+export const rolesGetRoleById = (id: any) => handle({
+  url: `/${suffix}/roles/getRoleById/${id}`,
+  method: 'get',
+})
+// 新增
+export const rolesCreate = (params: any) => handle({
+  url: `/${suffix}/roles/create`,
+  method: 'post',
+  params
+})
+// 编辑
+export const rolesUpdate = (params: any) => handle({
+  url: `/${suffix}/roles/update`,
+  method: 'post',
+  params
+})
+// 删除
+export const rolesDelete = (id: any) => handle({
+  url: `/${suffix}/roles/delete/${id}`,
+  method: 'get',
+})
+// 授权
+export const rolesDoAuthorization = (params: any) => handle({
+  url: `/${suffix}/roles/doAuthorization`,
+  method: 'post',
+  params
+})

src/api/modules/manage/user.ts

@@ -7,9 +7,59 @@ export const captcha = () => handle({
   url: `/${suffix}/captcha`,
   method: 'get',
 })
-// 验证码
+// 登录
 export const login = (params: any) => handle({
   url: `/${suffix}/login`,
   method: 'post',
   params
+})
+// 验证码
+export const getCurrentUser = () => handle({
+  url: `/${suffix}/getCurrentUser`,
+  method: 'get',
+})
+// 分页列表
+export const usersGetPageUser = (params: any) => handle({
+  url: `/${suffix}/users/getPageUser`,
+  method: 'get',
+  params
+})
+// 详情
+export const usersGetUserById = (id: any) => handle({
+  url: `/${suffix}/users/getUserById/${id}`,
+  method: 'get',
+})
+// 新增
+export const usersRegister = (params: any) => handle({
+  url: `/${suffix}/users/register`,
+  method: 'post',
+  params
+})
+// 编辑
+export const usersUpdate = (params: any) => handle({
+  url: `/${suffix}/users/update`,
+  method: 'post',
+  params
+})
+// 修改密码
+export const usersUpdatePassword = (params: any) => handle({
+  url: `/${suffix}/users/updatePassword`,
+  method: 'post',
+  params
+})
+// 删除
+export const usersDeleteUser = (id: any) => handle({
+  url: `/${suffix}/users/deleteUser/${id}`,
+  method: 'get',
+})
+// 查看授权
+export const usersGetAuthorization = (id: any) => handle({
+  url: `/${suffix}/users/getAuthorization/${id}`,
+  method: 'get',
+})
+// 授权
+export const usersDoAuthorization = (params: any) => handle({
+  url: `/${suffix}/users/doAuthorization`,
+  method: 'post',
+  params
 })

src/components/HeadMenu/index.vue

@@ -14,7 +14,7 @@
       <div class="avatar">
         <img src="@/assets/images/web/web-list_avatar.png"/>
       </div>
-      用户名
+      {{ AppStore.userInfo?.nickName }}
     </div>
     <div class="hm-head-out __hover" @click="onLoginOut">
       <SvgIcon name="close_2" color="var(--cus-main-color)" size="20"/>退出

src/components/cus/CusTable.vue

@@ -2,6 +2,7 @@
   <div class="cus-table">
     <div class="cus-table-table">
       <el-table
+        ref="ref_table"
         v-bind="$attrs"
         :data="data"
         :row-key="rowKey"
@@ -145,7 +146,7 @@
 defineOptions({
   name: 'CusTable',
 });
-import {computed, getCurrentInstance, reactive} from "vue";
+import {computed, getCurrentInstance, reactive, ref, watch} from "vue";
 
 const emit = defineEmits(['handleSort', 'handleFilter', 'handlePage', 'update:selected'])
 const {proxy} = getCurrentInstance()
@@ -166,7 +167,7 @@ const props = defineProps({
   noPage: {default: false}
 })
 const state: any = reactive({})
-
+const ref_table = ref()
 const handleSort = ({ column, prop, order }: any) => {
   emit('handleSort', {
     key: prop,
@@ -189,6 +190,17 @@ const handleFilter = (val: any) => {
 const onPage = (pageNum, pageSize) => {
   emit('handlePage', pageNum, pageSize)
 }
+watch(() => props.selected, (n: any) => {
+  if (n.length === 0) {
+    ref_table.value.clearSelection()
+  } else {
+    setTimeout(() => {
+      n.forEach(v => {
+        ref_table.value.toggleRowSelection(v, true)
+      })
+    }, 100)
+  }
+})
 </script>
 
 <style lang="scss" scoped>

src/router/index.ts

@@ -8,6 +8,7 @@ import {ElLoading, ElMessage} from "element-plus";
 import {useAppStore, useThemeStore} from "@/stores";
 import {toLogin} from "@/utils/permissions";
 import initRootVar from "@/style/initRootVar";
+import {getCurrentUser} from "@/api/modules/manage/user";
 
 
 const routes = [
@@ -46,44 +47,35 @@ router.beforeEach((to, from , next) => {
         toLogin()
     }
 })
-let userInfo = {
-    isAdmin: true,
-    id: 1
-}
+let userInfo = null
 let themeConfig = null
 export const initMainRouter = async () => {
     if (localStorage.getItem('ss_token')) {
-        // const loading = ElLoading.service({
-        //     lock: true,
-        //     text: '加载中……',
-        //     background: 'rgba(0, 0, 0, 0.7)',
-        // })
-        // await Promise.all([
-        //     mockGetUserInfo(),
-        //     mockGetConfig()
-        // ]).then(async ([user, config]) => {
-        //     userInfo = user.data
-        //     console.log('管理员：', userInfo?.isAdmin)
-        //     if (userInfo?.isAdmin) {
-        //         router.addRoute(manageRouter)
-        //     }
-        //     loading.close()
-        //     themeConfig = config.data
-        //     initRootVar(themeConfig)
-        // })
-        if (userInfo?.isAdmin) {
-            router.addRoute(manageRouter)
-        }
-        themeConfig = {
-            mainColor: '#f82828',
-            logo: 'https://element-plus.org/images/element-plus-logo.svg',
-            title: '海南社管智慧搜索平台',
-            subTitle: 'HAI NAN SHE GUAN ZHI HUI SOU SUO PING TAI',
-            // titleLogo: 'https://element-plus.org/images/element-plus-logo.svg',
-            // webBgImg: 'https://element-plus.org/images/element-plus-logo.svg',
-            // loginImg: 'https://element-plus.org/images/element-plus-logo.svg',
-        }
-        initRootVar(themeConfig)
+        const loading = ElLoading.service({
+            lock: true,
+            text: '加载中……',
+            background: 'rgba(0, 0, 0, 0.7)',
+        })
+        await Promise.all([
+            getCurrentUser(),
+        ]).then(async ([user, config]) => {
+            userInfo = user.data
+            userInfo.isAdmin = true
+            if (userInfo?.isAdmin) {
+                router.addRoute(manageRouter)
+            }
+            themeConfig = {
+                mainColor: '#f82828',
+                logo: 'https://element-plus.org/images/element-plus-logo.svg',
+                title: '海南社管智慧搜索平台',
+                subTitle: 'HAI NAN SHE GUAN ZHI HUI SOU SUO PING TAI',
+                // titleLogo: 'https://element-plus.org/images/element-plus-logo.svg',
+                // webBgImg: 'https://element-plus.org/images/element-plus-logo.svg',
+                // loginImg: 'https://element-plus.org/images/element-plus-logo.svg',
+            }
+            initRootVar(themeConfig)
+            loading.close()
+        })
     } else if (location.pathname !== '/login') {
         toLogin()
     }

src/stores/dictionary-define.ts

@@ -9,6 +9,8 @@ export const dictionaryDefine = {
 	true_false: ['trueFalseList', 'trueFalseMap'], //  是否
 	fie_type: ['fieTypeList', 'fieTypeMap'], //  字段类型
 	analyzer: ['analyzerList', 'analyzerMap'], //  分词器
+	user_status: ['userStatusList', 'userStatusMap'], //  用户状态
+	role_status: ['roleStatusList', 'roleStatusMap'], //  字典状态
 }
 
 const stateMap = {}

src/views/manage/system/user/detail.vue

@@ -14,21 +14,21 @@
           :span="24"
           required
           label="账号"
-          v-model:param="state.form.indexName"
+          v-model:param="state.form.username"
         />
         <CusFormColumn
           :span="24"
           required
           label="用户名"
-          v-model:param="state.form.indexName"
+          v-model:param="state.form.nickName"
         />
         <CusFormColumn
           :span="24"
           required
           label="状态"
-          v-model:param="state.form.shareMethod"
+          v-model:param="state.form.status"
           link="select"
-          :options="DictionaryStore.gxMethodList"
+          :options="DictionaryStore.userStatusList"
         />
       </CusForm>
     </div>
@@ -39,6 +39,7 @@
 import {computed, getCurrentInstance, nextTick, reactive, ref, watch} from "vue";
 import {useDictionaryStore} from "@/stores";
 import {ElMessage, ElMessageBox} from "element-plus";
+import {usersGetUserById, usersRegister, usersUpdate} from "@/api/modules/manage/user";
 
 const emit = defineEmits(['update:show', 'refresh'])
 const {proxy} = getCurrentInstance()
@@ -69,17 +70,30 @@ const onSubmit = () => {
       cancelButtonText: "取消",
       type: "warning",
     } as any).then(() => {
-      // state.loading = true
-      // sysIndexSaveOrUpdate(state.form).then(res => {
-      //   if (res.code === 200) {
-      //     ElMessage.success(props.transfer.mode === 'add' ? '新增成功！' : '编辑成功！')
-      //     emit('update:show', false)
-      //     emit('refresh')
-      //   } else {
-      //     ElMessage.error(res.msg)
-      //   }
-      //   state.loading = false
-      // })
+      state.loading = true
+      if (props.transfer.mode === 'add') {
+        usersRegister(state.form).then(res => {
+          if (res.code === 200) {
+            ElMessage.success('新增成功')
+            emit('update:show', false)
+            emit('refresh')
+          } else {
+            ElMessage.error(res.msg)
+          }
+          state.loading = false
+        })
+      } else if (props.transfer.mode === 'edit') {
+        usersUpdate(state.form).then(res => {
+          if (res.code === 200) {
+            ElMessage.success('编辑成功')
+            emit('update:show', false)
+            emit('refresh')
+          } else {
+            ElMessage.error(res.msg)
+          }
+          state.loading = false
+        })
+      }
     }).catch(() => {})
   }).catch((e) => {
     ElMessage({
@@ -90,15 +104,15 @@ const onSubmit = () => {
   })
 }
 const initDetail = () => {
-  // state.loading = true
-  // sysIndexGetDetail(props.transfer.id).then(res => {
-  //   if (res.code === 200) {
-  //     state.form = res.data
-  //     state.loading = false
-  //   } else {
-  //     ElMessage.error(res.msg)
-  //   }
-  // })
+  state.loading = true
+  usersGetUserById(props.transfer.id).then(res => {
+    if (res.code === 200) {
+      state.form = res.data
+      state.loading = false
+    } else {
+      ElMessage.error(res.msg)
+    }
+  })
 }
 watch(() => props.show, (n) => {
   if (n) {
@@ -114,7 +128,7 @@ watch(() => props.show, (n) => {
   }
 })
 const initDictionary = () => {
-  DictionaryStore.initDict('gx_method')
+  DictionaryStore.initDict('user_status')
 }
 </script>
 

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

@@ -6,20 +6,20 @@
         <CusFormColumn
           :span="4"
           label="账号"
-          v-model:param="state.query.form.keyword"
+          v-model:param="state.query.form.username"
         />
         <CusFormColumn
           label-width="65px"
           :span="4"
           label="用户名"
-          v-model:param="state.query.form.keyword"
+          v-model:param="state.query.form.nickName"
         />
         <CusFormColumn
           :span="4"
           label="状态"
-          v-model:param="state.query.form.keyword"
+          v-model:param="state.query.form.status"
           link="select"
-          :options="DictionaryStore.trueFalseList"
+          :options="DictionaryStore.userStatusList"
         />
         <CusButton type="main" title="搜索" @click="onSearch"/>
         <CusButton type="main" title="重置" @click="onReset"/>
@@ -35,8 +35,8 @@
         :table-head="state.query.tableHead"
         @handlePage="onPage"
       >
-        <template #shareMethod-column-value="{scope}">
-          {{DictionaryStore.gxMethodMap.get(scope.row.shareMethod)}}
+        <template #status-column-value="{scope}">
+          {{DictionaryStore.userStatusMap.get(scope.row.status)}}
         </template>
         <template #do-column-value="{scope}">
           <CusButton type="table-edit" @click="onEdit(scope.row)"/>
@@ -54,11 +54,12 @@
 
 <script setup lang="ts">
 import {getCurrentInstance, onMounted, reactive} from "vue";
-import {ElMessage} from "element-plus";
+import {ElMessage, ElMessageBox} from "element-plus";
 import DetailCom from "./detail.vue";
 import PasswordCom from "./password.vue";
 import RoleCom from "./role.vue";
 import {useDictionaryStore} from "@/stores";
+import {usersDeleteUser, usersGetPageUser} from "@/api/modules/manage/user";
 
 const {proxy} = getCurrentInstance()
 const DictionaryStore = useDictionaryStore()
@@ -70,20 +71,20 @@ const state: any = reactive({
       pageSize: 10
     },
     tableHead: [
-      {value: "indexName", label: "账号", fixed: 'left'},
-      {value: "indexName", label: "用户名", fixed: 'left'},
-      {value: "dataSource", label: "状态"},
+      {value: "username", label: "账号", fixed: 'left'},
+      {value: "nickName", label: "用户名", fixed: 'left'},
+      {value: "status", label: "状态"},
       {value: "createTime", label: "创建时间", width: 200},
-      {value: "indexName", label: "创建人"},
+      {value: "createByName", label: "创建人"},
       {value: "updateTime", label: "最后修改时间", width: 200},
-      {value: "updateTime", label: "最后修改人"},
+      {value: "updateByName", label: "最后修改人"},
       {value: "do", label: "操作", width: 320, fixed: 'right'},
     ],
     form: {},
     formReal: {},
     result: {
       total: 0,
-      data: [{}]
+      data: []
     }
   },
   detail: {
@@ -108,19 +109,16 @@ const onPage = (pageNum, pageSize) => {
     page: state.query.page.pageNum,
     size: state.query.page.pageSize,
   }
-  if (proxy.$util.isValue(state.query.formReal.keyword)) {
-    params.keyword = state.query.formReal.keyword
-  }
-  // state.query.loading = true
-  // sysIndexFindIndexByPage(proxy.$util.formatGetParam(params)).then(res => {
-  //   if (res.code === 200) {
-  //     state.query.result.total = res.data.totalElements
-  //     state.query.result.data = res.data.content
-  //     state.query.loading = false
-  //   } else {
-  //     ElMessage.error(res.msg)
-  //   }
-  // })
+  state.query.loading = true
+  usersGetPageUser(proxy.$util.formatGetParam(params)).then(res => {
+    if (res.code === 200) {
+      state.query.result.total = res.data.totalElements
+      state.query.result.data = res.data.content
+      state.query.loading = false
+    } else {
+      ElMessage.error(res.msg)
+    }
+  })
 }
 const onSearch = () => {
   state.query.formReal = JSON.parse(JSON.stringify(state.query.form))
@@ -160,9 +158,24 @@ const onRole = (row) => {
   state.role.show = true
 }
 const onDel = (row) => {
+  ElMessageBox.confirm(`请确认是否删除${row.nickName}?`, "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  } as any).then(() => {
+    state.loading = true
+    usersDeleteUser(row.id).then(res => {
+      if (res.code === 200) {
+        ElMessage.success('删除成功！')
+      } else {
+        ElMessage.error(res.msg)
+      }
+      onSearch()
+    })
+  }).catch(() => {})
 }
 const initDictionary = () => {
-  DictionaryStore.initDict('true_false')
+  DictionaryStore.initDict('user_status')
 }
 onMounted(() => {
   initDictionary()

src/views/manage/system/user/password.vue

@@ -14,7 +14,7 @@
           :span="24"
           required
           label="密码"
-          v-model:param="state.form.indexName"
+          v-model:param="state.form.password"
           type="password"
           show-password
         />
@@ -22,12 +22,12 @@
           :span="24"
           required
           label="确认密码"
-          v-model:param="state.form.indexName"
+          v-model:param="state.form.validPassword"
           type="password"
           show-password
           :rules="[
               {
-                handle: (val) => val == state.form.indexName,
+                handle: (val) => val == state.form.password,
                 message: '两次输入的密码不一致'
               }
           ]"
@@ -41,6 +41,7 @@
 import {computed, getCurrentInstance, nextTick, reactive, ref, watch} from "vue";
 import {useDictionaryStore} from "@/stores";
 import {ElMessage, ElMessageBox} from "element-plus";
+import {usersUpdatePassword} from "@/api/modules/manage/user";
 
 const emit = defineEmits(['update:show', 'refresh'])
 const {proxy} = getCurrentInstance()
@@ -65,16 +66,19 @@ const onSubmit = () => {
       cancelButtonText: "取消",
       type: "warning",
     } as any).then(() => {
-      // state.loading = true
-      // sysIndexSaveOrUpdate(state.form).then(res => {
-      //   if (res.code === 200) {
-      //     ElMessage.success(props.transfer.mode === 'add' ? '新增成功！' : '编辑成功！')
-      //     emit('update:show', false)
-      //   } else {
-      //     ElMessage.error(res.msg)
-      //   }
-      //   state.loading = false
-      // })
+      state.loading = true
+      usersUpdatePassword({
+        id: props.transfer.id,
+        password: state.form.password
+      }).then(res => {
+        if (res.code === 200) {
+          ElMessage.success('修改成功！')
+          emit('update:show', false)
+        } else {
+          ElMessage.error(res.msg)
+        }
+        state.loading = false
+      })
     }).catch(() => {})
   }).catch((e) => {
     ElMessage({
@@ -84,20 +88,9 @@ const onSubmit = () => {
     })
   })
 }
-const initPassword = () => {
-  // state.loading = true
-  // sysIndexGetDetail(props.transfer.id).then(res => {
-  //   if (res.code === 200) {
-  //     state.form = res.data
-  //     state.loading = false
-  //   } else {
-  //     ElMessage.error(res.msg)
-  //   }
-  // })
-}
 watch(() => props.show, (n) => {
   if (n) {
-    initPassword()
+    state.form = {}
     nextTick(() => {
       ref_form.value.reset()
     })

src/views/manage/system/user/role.vue

@@ -6,6 +6,7 @@
     width="600px"
     height="auto"
     max-height="90%"
+    @onSubmit="onSubmit"
   >
     <div class="__cus-manage_content">
       <div class="__cus-manage_content-main" v-loading="state.query.loading">
@@ -13,7 +14,7 @@
           :data="state.query.result.data"
           :table-head="state.query.tableHead"
           :no-page="true"
-          :selected="state.query.selected"
+          v-model:selected="state.query.selected"
         >
         </CusTable>
       </div>
@@ -25,6 +26,9 @@
 import {computed, getCurrentInstance, nextTick, reactive, ref, watch} from "vue";
 import {useDictionaryStore} from "@/stores";
 import {ElMessage, ElMessageBox} from "element-plus";
+import {rolesGetByPage} from "@/api/modules/manage/role";
+import {usersDoAuthorization, usersGetAuthorization} from "@/api/modules/manage/user";
+import {sysIndexSaveOrUpdate} from "@/api/modules/manage";
 
 const emit = defineEmits(['update:show', 'refresh'])
 const {proxy} = getCurrentInstance()
@@ -37,10 +41,10 @@ const state: any = reactive({
   query: {
     loading: false,
     tableHead: [
-      {value: "fieldNameCn", label: "角色名称"},
+      {value: "roleName", label: "角色名称"},
     ],
     result: {
-      data: [{},{}]
+      data: []
     },
     selected: []
   },
@@ -50,17 +54,37 @@ const state: any = reactive({
   },
 })
 const initRoles = () => {
-  // state.query.loading = true
-  // sysIndexFieldList(proxy.$util.formatGetParam({
-  //   indexId: props.transfer.id
-  // })).then(res => {
-  //   if (res.code === 200) {
-  //     state.query.result.data = res.data
-  //     state.query.loading = false
-  //   } else {
-  //     ElMessage.error(res.msg)
-  //   }
-  // })
+  state.query.loading = true
+  Promise.all([
+    rolesGetByPage(`page=1&size=10000`),
+    usersGetAuthorization(props.transfer.id),
+  ]).then(([allRole, userRole]) => {
+    state.query.result.data = allRole.data.content
+    state.query.selected = allRole.data.content.filter(v => userRole.data.some(s => s.id === v.id))
+    state.query.loading = false
+  })
+}
+const onSubmit = () => {
+  ElMessageBox.confirm("是否提交?", "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  } as any).then(() => {
+    state.loading = true
+    usersDoAuthorization({
+      userId: props.transfer.id,
+      roleIds: state.query.selected.map(v => v.id)
+    }).then(res => {
+      if (res.code === 200) {
+        ElMessage.success(props.transfer.mode === 'add' ? '新增成功！' : '编辑成功！')
+        emit('update:show', false)
+        emit('refresh')
+      } else {
+        ElMessage.error(res.msg)
+      }
+      state.loading = false
+    })
+  }).catch(() => {})
 }
 watch(() => props.show, (n) => {
   if (n) {