业务管理-推荐管理

首页已经修改密码的编写
客户管理的更改
2025-01-11 11:28:24 +08:00 · 2025-01-10 10:50:02 +08:00 · 2025-01-06 12:22:23 +08:00 · 2025-01-06 12:22:14 +08:00 · 2025-01-06 12:22:05 +08:00 · 2025-01-06 12:21:27 +08:00
24 changed files with 1555 additions and 969 deletions
--- a/src/api/role/index.ts
+++ b/src/api/role/index.ts
@ -8,7 +8,7 @@ import { baseUrlHost } from '../baseUrlHost';
 * 登录api接口集合
 * @method getRoleList 获取分页角色列表
 * @method deleteRole 删除角色
- * @method saveRole 保存角色
+ * @method addRole 保存角色
 * @method updateRole 更新角色
 * @method getroleListAll 获取全部角色
 * @method getRoleDetail 查询单个角色
@ -51,7 +51,7 @@ export function roleApi() {
 		},
 		getroleListAll: () => {
 			return request({
-				url: baseUrlHost + `/acGroup/`,
+				url: baseUrlHost + `/acGroup/all`,
 				method: 'get',
 			});
 		},
--- a/src/api/service/apply/index.ts
+++ b/src/api/service/apply/index.ts
@ -6,6 +6,7 @@ import { pixelUrlHost } from '/@/api/baseUrlHost';
 * 注意在写get请求时，参数是params，而不是data，要标注好
 * 
 * 登录api接口集合
+ * @method getApplyList 获取全部应用
 * @method getServicesList 获取应用服务列表
 * @method getApplyDetail 获取应用服务详情
 * @method saveApply 添加应用服务
@ -15,6 +16,12 @@ import { pixelUrlHost } from '/@/api/baseUrlHost';

 export function applyApi() {
 	return {
+		getAllServices: () => {
+			return request({
+				url: pixelUrlHost + '/paServices/all',
+				method: 'get',
+			});
+		},
 		getServicesList: (params: object) => {
 			return request({
 				url: pixelUrlHost + '/paServices',
--- a/src/api/service/recommend/index.ts
+++ b/src/api/service/recommend/index.ts
@ -0,0 +1,22 @@
+import request from '/@/utils/request';
+import { pixelUrlHost } from '/@/api/baseUrlHost';
+
+/**
+ * （不建议写成 request.post(xxx)，因为这样 post 时，无法 params 与 data 同时传参）
+ * 注意在写get请求时，参数是params，而不是data，要标注好
+ * 
+ * 登录api接口集合
+ * @method getRecommendList 获取推荐作品列表
+ */
+
+export function recommendApi() {
+	return {
+		getRecommendList: (params: object) => {
+			return request({
+				url: pixelUrlHost + '/paRecommend',
+				method: 'get',
+				params,
+			});
+		},
+	};
+}
--- a/src/api/user/index.ts
+++ b/src/api/user/index.ts
@ -0,0 +1,67 @@
+import request from '/@/utils/request';
+import { baseUrlHost } from '../baseUrlHost';
+
+/**
+ * （不建议写成 request.post(xxx)，因为这样 post 时，无法 params 与 data 同时传参）
+ * 注意在写get请求时，参数是params，而不是data，要标注好
+ * 
+ * 登录api接口集合
+ * @method getUserList 获取分页用户列表
+ * @method deleteUser 删除用户
+ * @method addUser 保存用户
+ * @method updateUser 更新用户
+ * @method getuserListAll 获取全部用户
+ * @method getUserDetail 查询单个用户
+ * @method updatepwd 修改用户密码
+ */
+
+export function userApi() {
+  return {
+    getUserList: (params:object) => {
+      return request({
+        url: baseUrlHost + '/acUser',
+        method: 'get',
+        params,
+      });
+    },
+    addUser:(data:object) => {
+      return request({
+        url:baseUrlHost + '/acUser',
+        method:'post',
+        data,
+      })
+    },
+    updateUser: (data: object) => {
+      return request({
+        url: baseUrlHost + '/acUser',
+        method: 'put',
+        data,
+      })
+    },
+    getUserDetail: (id: Number) => {
+      return request({
+        url: baseUrlHost + `/acUser/${id}`,
+        method: 'get',
+      });
+    },
+    deleteUser: (id: Number) => {
+      return request({
+        url: baseUrlHost + `/acUser/${id}`,
+        method: 'delete',
+      });
+    },
+    getuserListAll: () => {
+      return request({
+        url: baseUrlHost + `/acUser/all`,
+        method: 'get',
+      });
+    },
+    updatepwd: (id:Number,data:object) => {
+      return request({
+        url: baseUrlHost + `/acUser/${id}/pwdreset`,
+        method: 'post',
+        data
+      })
+    }
+  };
+}
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@ -107,6 +107,7 @@ export default {
 		
 		apply: 'apply',
 		shares: 'shares',
+		recommend: 'recommend',

 		/**
 		 * 业务模块end
@ -129,9 +130,10 @@ export default {
 		dropdownDefault: 'default',
 		dropdownSmall: 'small',
 		dropdown1: 'home page',
-		dropdown2: 'Personal Center',
-		dropdown3: '404',
-		dropdown4: '401',
+		dropdown2:'updatepwd',
+		// dropdown2: 'Personal Center',
+		// dropdown3: '404',
+		// dropdown4: '401',
 		dropdown5: 'Log out',
 		dropdown6: 'Code warehouse',
 		searchPlaceholder: 'Menu search: support Chinese, routing path',
--- a/src/i18n/lang/zh-cn.ts
+++ b/src/i18n/lang/zh-cn.ts
@ -110,6 +110,7 @@ export default {
 		
 		apply: '应用管理',
 		shares: '发布管理',
+		recommend: '推荐管理',

 		/**
 		 * 业务模块end
@ -132,9 +133,10 @@ export default {
 		dropdownDefault: '默认',
 		dropdownSmall: '小型',
 		dropdown1: '首页',
-		dropdown2: '个人中心',
-		dropdown3: '404',
-		dropdown4: '401',
+		// dropdown2: '个人中心',
+		// dropdown3: '404',
+		// dropdown4: '401',
+		dropdown2:'修改密码',
 		dropdown5: '退出登录',
 		dropdown6: '代码仓库',
 		searchPlaceholder: '菜单搜索：支持中文、路由路径',
--- a/src/i18n/lang/zh-tw.ts
+++ b/src/i18n/lang/zh-tw.ts
@ -107,6 +107,7 @@ export default {
 		
 		apply: '應用管理',
 		shares: '發佈管理',
+		recommend: '推薦管理',

 		/**
 		 * 业务模块end
@ -129,9 +130,10 @@ export default {
 		dropdownDefault: '默認',
 		dropdownSmall: '小型',
 		dropdown1: '首頁',
-		dropdown2: '個人中心',
-		dropdown3: '404',
-		dropdown4: '401',
+		dropdown2:'修改密碼',
+		// dropdown2: '個人中心',
+		// dropdown3: '404',
+		// dropdown4: '401',
 		dropdown5: '登出',
 		dropdown6: '程式碼倉庫',
 		searchPlaceholder: '選單蒐索：支援中文、路由路徑',
--- a/src/layout/component/aside.vue
+++ b/src/layout/component/aside.vue
@ -100,7 +100,8 @@ let Menulist = ref([]);
 // const defaultOpeneds =reactive([])
 const getmenulist = async() =>{
 	try{
-		const res = await useMenuapi.getAdminMenu(1);
+		const id = localStorage.getItem('acgroup')
+		const res = await useMenuapi.getAdminMenu(id);
 		// console.log('菜单数据',res);
 		Menulist.value = res.data;
 		isDataReady.value = true
--- a/src/layout/navBars/topBar/user.vue
+++ b/src/layout/navBars/topBar/user.vue
@ -73,15 +73,38 @@
 			<template #dropdown>
 				<el-dropdown-menu>
 					<el-dropdown-item command="/home">{{ $t('message.user.dropdown1') }}</el-dropdown-item>
-					<!-- <el-dropdown-item command="wareHouse">{{ $t('message.user.dropdown6') }}</el-dropdown-item>
-					<el-dropdown-item command="/personal">{{ $t('message.user.dropdown2') }}</el-dropdown-item>
-					<el-dropdown-item command="/404">{{ $t('message.user.dropdown3') }}</el-dropdown-item>
+					<!-- <el-dropdown-item command="wareHouse">{{ $t('message.user.dropdown6') }}</el-dropdown-item> -->
+					<!-- <el-dropdown-item>
+						<el-button text  style="height: 20px; ">
+							修改密码
+						</el-button>
+					</el-dropdown-item> -->
+					<el-dropdown-item command="updatepwd">{{ $t('message.user.dropdown2') }}</el-dropdown-item>
+					<!-- <el-dropdown-item command="/404">{{ $t('message.user.dropdown3') }}</el-dropdown-item>
 					<el-dropdown-item command="/401">{{ $t('message.user.dropdown4') }}</el-dropdown-item> -->
 					<el-dropdown-item divided command="logOut">{{ $t('message.user.dropdown5') }}</el-dropdown-item>
 				</el-dropdown-menu>
 			</template>
 		</el-dropdown>
 		<Search ref="searchRef" />
+		<div class="system-menu-dialog-container">
+		<el-dialog :title="state.dialog.title" v-model="state.dialog.isShowDialog" width="400px">
+			<el-form ref="userDialogFormRef" :rules="state.rules" :model="state.userDetailList" size="default" label-width="120px" v-loading="state.dialog.loading">
+				<el-form-item label="旧密码：" prop="old">
+                    <el-input v-model="state.userDetailList.old"></el-input>
+                </el-form-item>
+                <el-form-item label="新密码：" prop="pwd">
+                    <el-input v-model="state.userDetailList.pwd" placeholder="请输入新密码" clearable />
+                </el-form-item>
+			</el-form>
+			<template #footer>
+				<span class="dialog-footer">
+					<el-button plain @click="handleSure" type="primary" size="default">确 定</el-button>
+					<el-button plain @click="onCancel" size="default">关 闭</el-button>
+				</span>
+			</template>
+		</el-dialog>
+	</div>
 	</div>
 </template>

@ -98,6 +121,7 @@ import other from '/@/utils/other';
 import mittBus from '/@/utils/mitt';
 import { Session, Local } from '/@/utils/storage';
 import { useLoginApi } from '/@/api/login';
+import { userApi } from '/@/api/user'

 // 引入组件
 const UserNews = defineAsyncComponent(() => import('/@/layout/navBars/topBar/userNews.vue'));
@ -106,6 +130,8 @@ const Search = defineAsyncComponent(() => import('/@/layout/navBars/topBar/searc
 // 引入 api 请求接口
 const loginApi = useLoginApi();

+const userapi = userApi();
+
 // 定义变量内容
 const userNewsRef = ref();
 const userNewsBadgeRef = ref();
@ -120,8 +146,23 @@ const state = reactive({
 	isScreenfull: false,
 	disabledI18n: 'zh-cn',
 	disabledSize: 'large',
+	userDetailList:{
+		old:'',
+		pwd:'',
+	},
+	dialog:{
+		isShowDialog: false,
+		title: '修改密码',
+    loading: false,
+	},
+	rules:{
+		old:{ required: true, message: '旧密码不能为空', trigger: 'blur' },
+		pwd:{ required: true, message: '新密码不能为空', trigger: 'blur' }
+	}
 });

+const userDialogFormRef = ref();
+
 // 设置分割样式
 const layoutUserFlexNum = computed(() => {
 	let num: string | number = '';
@ -152,7 +193,8 @@ const onLayoutSetingClick = () => {
 	mittBus.emit('openSetingsDrawer');
 };
 // 下拉菜单点击时
-const onHandleCommandClick = (path: string) => {
+const onHandleCommandClick = async(path: string) => {
+	
 	if (path === 'logOut') {
 		ElMessageBox({
 			closeOnClickModal: false,
@ -189,10 +231,73 @@ const onHandleCommandClick = (path: string) => {
 			.catch(() => {});
 	} else if (path === 'wareHouse') {
 		window.open('https://gitee.com/lyt-top/vue-next-admin');
-	} else {
+	} else if(path === 'updatepwd'){
+		state.dialog.isShowDialog = true;
+		state.userDetailList.pwd ='';
+		try{
+			const res = await userapi.getUserDetail(localStorage.getItem('userid'));
+			if(res?.success){
+				state.userDetailList.old = res.data.password;
+				// console.log(111111111,state.userDetailList.oldpwd)
+			}
+		}catch(error){
+			console.error(error);
+		}
+	}
+	else {
 		router.push(path);
 	}
 };
+
+// 关闭弹窗
+const closeDialog = () => {
+	state.dialog.isShowDialog = false;
+};
+
+//确定
+const handleSure = () =>{
+	userDialogFormRef.value?.validate(async(valid:boolean) =>{
+		if(valid){
+			// console.log(111111111)
+			
+			try{
+				const res = await userapi.updatepwd(localStorage.getItem('userid'),state.userDetailList);
+				if(res?.success){
+					ElMessage.success('修改成功！');
+					reset();
+					closeDialog();
+					ElMessageBox.alert('你已被登出，请重新登录', '提示', {})
+					.then(async () => {
+						// 清除缓存/token等
+						console.log('清除缓存/token等');
+						Session.clear();
+						// 使用 reload 时，不需要调用 resetRoute() 重置路由
+						window.location.reload();
+						window.location.href = import.meta.env.MODE === "development" ? '/' : '/pixelAdmin/'; // 去登录页
+					})
+					.catch(() => {});
+				}
+			}catch(error){
+				console.error(error);
+				ElMessage.error('修改失败！');
+			}
+		}
+	})
+};
+
+// 取消
+const onCancel = () => {
+	closeDialog();
+};
+
+const reset = () =>{
+	state.userDetailList = {
+		old:'',
+		pwd:''
+	}
+	
+};
+
 // 菜单搜索点击
 const onSearchClick = () => {
 	searchRef.value.openSearch();
--- a/src/layout/navMenu/vertical.vue
+++ b/src/layout/navMenu/vertical.vue
@ -155,3 +155,11 @@ watch(
 );

 </script>
+<style lang="scss" scoped>
+
+::v-deep .el-menu-item-group__title{
+	padding :0px 0px 0px ;
+}
+
+</style>
+
--- a/src/router/route.ts
+++ b/src/router/route.ts
@ -58,7 +58,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 					isKeepAlive: true,
 					isAffix: true,
 					isIframe: false,
-					roles: ['admin', 'common'],
+					roles: ['admin', 'user'],
 					icon: 'iconfont icon-shouye',
 				},
 			},
@ -73,7 +73,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 					isKeepAlive: true,
 					isAffix: true,
 					isIframe: false,
-					roles: ['admin', 'common'],
+					roles: ['admin', 'user'],
 					icon: 'iconfont icon-shouye',
 				},
 			},
@ -89,7 +89,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 					isKeepAlive: true,
 					isAffix: false,
 					isIframe: false,
-					roles: ['admin'],
+					roles: ['admin', 'user'],
 					icon: 'iconfont icon-gerenzhongxin',
 				},
 				children: [
@ -104,7 +104,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 							isKeepAlive: true,
 							isAffix: false,
 							isIframe: false,
-							roles: ['admin'],
+							roles: ['admin', 'user'],
 							icon: 'ele-ColdDrink',
 						},
 					},
@ -119,7 +119,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 							isKeepAlive: true,
 							isAffix: false,
 							isIframe: false,
-							roles: ['admin'],
+							roles: ['admin', 'user'],
 							icon: 'iconfont icon-icon-',
 						},
 					},
@ -137,7 +137,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 					isKeepAlive: true,
 					isAffix: false,
 					isIframe: false,
-					roles: ['admin'],
+					roles: ['admin', 'user'],
 					icon: 'iconfont icon-xitongshezhi',
 				},
 				children: [
@ -152,7 +152,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 							isKeepAlive: true,
 							isAffix: false,
 							isIframe: false,
-							roles: ['admin'],
+							roles: ['admin', 'user'],
 							icon: 'iconfont icon-caidan',
 						},
 					},
@ -167,7 +167,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 							isKeepAlive: true,
 							isAffix: false,
 							isIframe: false,
-							roles: ['admin'],
+							roles: ['admin', 'user'],
 							icon: 'ele-OfficeBuilding',
 						},
 					},
@ -182,7 +182,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 							isKeepAlive: true,
 							isAffix: false,
 							isIframe: false,
-							roles: ['admin'],
+							roles: ['admin', 'user'],
 							icon: 'ele-SetUp',
 						},
 					},
@ -200,7 +200,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 					isKeepAlive: true,
 					isAffix: false,
 					isIframe: false,
-					roles: ['admin', 'common'],
+					roles: ['admin', 'user'],
 					icon: 'iconfont icon-jiliandongxuanzeqi',
 				},
 				children: [
@ -215,7 +215,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 							isKeepAlive: false,
 							isAffix: false,
 							isIframe: false,
-							roles: ['admin', 'common'],
+							roles: ['admin', 'user'],
 							icon: 'ele-Document',
 						},
 					},
@ -230,7 +230,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 							isKeepAlive: false,
 							isAffix: false,
 							isIframe: false,
-							roles: ['admin', 'common'],
+							roles: ['admin', 'user'],
 							icon: 'ele-Document',
 						},
 					},
@ -245,7 +245,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 							isKeepAlive: false,
 							isAffix: false,
 							isIframe: false,
-							roles: ['admin', 'common'],
+							roles: ['admin', 'user'],
 							icon: 'ele-Document',
 						},
 					}
@ -270,7 +270,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 					isKeepAlive: true,
 					isAffix: false,
 					isIframe: false,
-					roles: ['admin'],
+					roles: ['admin', 'user'],
 					icon: 'iconfont icon-crew_feature',
 				},
 			},
@ -286,7 +286,23 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 					isKeepAlive: true,
 					isAffix: false,
 					isIframe: false,
-					roles: ['admin'],
+					roles: ['admin', 'user'],
+					icon: 'ele-Upload',
+				},
+			},
+			// 推荐管理
+			{
+				path: '/recommend',
+				name: 'recommend',
+				component: () => import('/@/views/service/recommend/index.vue'),
+				meta: {
+					title: 'message.router.recommend',
+					isLink: '',
+					isHide: false,
+					isKeepAlive: true,
+					isAffix: false,
+					isIframe: false,
+					roles: ['admin', 'user'],
 					icon: 'ele-Upload',
 				},
 			},
@ -307,7 +323,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 					isKeepAlive: true,
 					isAffix: false,
 					isIframe: false,
-					roles: ['admin', 'common'],
+					roles: ['admin', 'user'],
 					icon: 'ele-DocumentCopy',
 				},
 			},
@ -323,7 +339,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 					isKeepAlive: true,
 					isAffix: false,
 					isIframe: false,
-					roles: ['admin', 'common'],
+					roles: ['admin', 'user'],
 					icon: 'ele-Picture',
 				},
 			},
@ -339,7 +355,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 					isKeepAlive: true,
 					isAffix: false,
 					isIframe: false,
-					roles: ['admin', 'common'],
+					roles: ['admin', 'user'],
 					icon: 'ele-User',
 				},
 			},
@ -354,7 +370,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 					isKeepAlive: true,
 					isAffix: false,
 					isIframe: false,
-					roles: ['admin', 'common'],
+					roles: ['admin', 'user'],
 					icon: 'iconfont icon-fuwenbenkuang',
 				},
 			},
@ -369,7 +385,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 					isKeepAlive: true,
 					isAffix: false,
 					isIframe: false,
-					roles: ['admin', 'common'],
+					roles: ['admin', 'user'],
 					icon: 'iconfont icon-biaodan',
 				},
 			},
@ -384,7 +400,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 					isKeepAlive: true,
 					isAffix: false,
 					isIframe: false,
-					roles: ['admin', 'common'],
+					roles: ['admin', 'user'],
 					icon: 'ele-CollectionTag',
 				},
 				// children: [
@ -432,7 +448,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 					isKeepAlive: true,
 					isAffix: false,
 					isIframe: false,
-					roles: ['admin', 'common'],
+					roles: ['admin', 'user'],
 					icon: 'iconfont icon-shuju',
 				},
 			},
@ -447,7 +463,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 					isKeepAlive: true,
 					isAffix: false,
 					isIframe: false,
-					roles: ['admin', 'common'],
+					roles: ['admin', 'user'],
 					icon: 'iconfont icon-ico_shuju',
 				},
 			},
@ -462,7 +478,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 					isKeepAlive: true,
 					isAffix: false,
 					isIframe: false,
-					roles: ['admin', 'common'],
+					roles: ['admin', 'user'],
 					icon: 'iconfont icon-jiliandongxuanzeqi',
 				},
 				children: [
@ -477,7 +493,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 							isKeepAlive: false,
 							isAffix: false,
 							isIframe: false,
-							roles: ['admin', 'common'],
+							roles: ['admin', 'user'],
 							icon: 'ele-Document',
 						},
 					},
@ -492,7 +508,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 							isKeepAlive: false,
 							isAffix: false,
 							isIframe: false,
-							roles: ['admin', 'common'],
+							roles: ['admin', 'user'],
 							icon: 'ele-Document',
 						},
 					},
@ -507,7 +523,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 							isKeepAlive: false,
 							isAffix: false,
 							isIframe: false,
-							roles: ['admin', 'common'],
+							roles: ['admin', 'user'],
 							icon: 'ele-Document',
 						},
 					}
@ -524,7 +540,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 					isKeepAlive: true,
 					isAffix: false,
 					isIframe: false,
-					roles: ['admin', 'common'],
+					roles: ['admin', 'user'],
 					icon: 'iconfont icon-jiliandongxuanzeqi',
 				},
 				children: [
@ -539,7 +555,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 							isKeepAlive: false,
 							isAffix: false,
 							isIframe: false,
-							roles: ['admin', 'common'],
+							roles: ['admin', 'user'],
 							icon: 'ele-Document',
 						},
 					},
@ -554,7 +570,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 							isKeepAlive: false,
 							isAffix: false,
 							isIframe: false,
-							roles: ['admin', 'common'],
+							roles: ['admin', 'user'],
 							icon: 'ele-Document',
 						},
 					},
@ -569,7 +585,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 							isKeepAlive: false,
 							isAffix: false,
 							isIframe: false,
-							roles: ['admin', 'common'],
+							roles: ['admin', 'user'],
 							icon: 'ele-Document',
 						},
 					}
@ -586,7 +602,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 					isKeepAlive: true,
 					isAffix: false,
 					isIframe: false,
-					roles: ['admin', 'common'],
+					roles: ['admin', 'user'],
 					icon: 'iconfont icon-jiliandongxuanzeqi',
 				},
 				children: [
@ -601,7 +617,7 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 							isKeepAlive: false,
 							isAffix: false,
 							isIframe: false,
-							roles: ['admin', 'common'],
+							roles: ['admin', 'user'],
 							icon: 'ele-Document',
 						},
 					},
--- a/src/stores/themeConfig.ts
+++ b/src/stores/themeConfig.ts
@ -151,7 +151,7 @@ export const useThemeConfig = defineStore('themeConfig', {
 			// 默认全局组件大小，可选值"<large|'default'|small>"，默认 'large'
 			globalComponentSize: 'large',
 			// 网站logo
-			logoMini: '/@/assets/logo.png',
+			logoMini: '@/assets/logo.png',
 		},
 	}),
 	actions: {
--- a/src/views/article/index.vue
+++ b/src/views/article/index.vue
@ -30,8 +30,6 @@
 			</div>
 			<el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%">
 				<el-table-column type="index" label="序号"  width="100"/>
-				<el-table-column prop="moduleName" label="模块名称" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="labelName" label="标签名称" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="title" label="标题" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="articletype" label="文章类型" :formatter="typeFormatter" show-overflow-tooltip></el-table-column>
 				<el-table-column label="置顶" show-overflow-tooltip>
@ -40,6 +38,8 @@
 						<el-tag type="error" v-else>否</el-tag>
 					</template>
 				</el-table-column>
+				<el-table-column prop="moduleName" label="模块名称" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="labelName" label="标签名称" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="htmlPath" label="链接" min-width="80">
 					<template #default="scope">
 						<el-button size="mini" style="border-radius: 10px;" @click="copyLink(scope.row)">复制</el-button>
@ -115,7 +115,13 @@ const getTableData = async() => {
 		state.tableData.loading = true;
 		let res = await artApi.getArticleList(state.tableData.param);
 		if(res?.success){
-			state.tableData.data = res.data.records;
+			state.tableData.data = res.data.records.map((item:any) => {
+				return{
+					...item,
+					moduleName:item.moduleName || '未设置',
+					labelName:item.labelName || '未设置',
+				}
+			});
 			state.tableData.total = res.data.total;
 		}else{
 			ElMessage.error('文章列表获取失败！');
--- a/src/views/clients/index.vue
+++ b/src/views/clients/index.vue
@ -2,8 +2,7 @@
    <div class="system-dept-container layout-padding">
 		<el-card shadow="hover" class="layout-padding-auto">
 			<div class="system-dept-search mb15">
-				<span>手机号:</span>
-                <el-input size="default" placeholder="请输入" v-model="state.tableData.param.phone" class="ml10" style="max-width: 250px;margin-right: 20px;"> </el-input>
+					<el-input size="default" placeholder="请输入用户名称" v-model="state.tableData.param.username" class="ml10" style="max-width: 250px;margin-right: 20px;" clearable> </el-input>
 				<el-button @click="getTableData" size="default" type="primary" class="ml10" style="margin-right: 15px;">
 					<el-icon>
 						<ele-Search />
@ -29,13 +28,14 @@
 				style="width: 100%"  
 				@selection-change="handleSelectionChange"
 			>
-				<el-table-column type="selection" :selectable="selectable" width="55" />
-				<el-table-column prop="account" label="账户"  show-overflow-tooltip width="255px"align="center"></el-table-column>
-				<el-table-column prop="nickName" label="昵称"  show-overflow-tooltip width="255px" align="center"></el-table-column>
-				<el-table-column prop="phone" label="手机号"  show-overflow-tooltip width="255px" align="center"></el-table-column>
-				<el-table-column prop="registerTime" label="注册时间" :formatter="dateFormatter" show-overflow-tooltip width="255px" align="center"></el-table-column>
-				<el-table-column prop="state" label="状态"  show-overflow-tooltip width="255px" align="center"></el-table-column>		
-				<el-table-column label="操作" width="350px" align="center">
+				<el-table-column type="selection" :selectable="selectable" width="100" />
+				<el-table-column prop="username" label="账户"  show-overflow-tooltipalign="center"></el-table-column>
+				<el-table-column prop="nickName" label="昵称"  show-overflow-tooltip  align="center"></el-table-column>
+				<el-table-column prop="phone" label="手机号"  show-overflow-tooltip  align="center"></el-table-column>
+				<el-table-column prop="mail" label="邮箱" show-overflow-tooltip align="center"></el-table-column>
+				<el-table-column prop="registerTime" label="注册时间" :formatter="dateFormatter" show-overflow-tooltip  align="center"></el-table-column>
+				<!-- <el-table-column prop="state" label="状态"  show-overflow-tooltip width="255px" align="center"></el-table-column>		 -->
+				<el-table-column label="操作"  align="center">
 					<template #default="scope">
 						<el-button size="small" text type="primary" :disabled="scope.row.enable?true:false" @click="scope.row.enable=!scope.row.enable">启用</el-button>
 						<el-button size="small" text type="primary" :disabled="scope.row.enable?false:true" @click="scope.row.enable=!scope.row.enable">禁用</el-button>
@ -126,6 +126,9 @@ import { Delete, Download, Plus, ZoomIn } from '@element-plus/icons-vue'
 import type { ComponentSize, FormInstance, FormRules, UploadFile, UploadProps, UploadUserFile } from 'element-plus'
 import { baseUrlHost } from '../../api/baseUrlHost';
 import { clientsApi } from '/@/api/clients';
+import { userApi } from '/@/api/user';
+
+const userapi = userApi();

 const options = [
 	{
@ -147,7 +150,8 @@ const state = reactive({
 		total: 0,
 		loading: false,
 		param: {
-			phone:'',
+			username:'',
+			usertype:2,
 			current: 1,
 			size: 10,
 		},
@ -181,10 +185,17 @@ const clientApi = clientsApi();
 const getTableData = async() => {
 	try {
 		state.tableData.loading = true;
-		let res = await clientApi.getClientsList(state.tableData.param);
-		console.log(res);
+		let res = await userapi.getUserList(state.tableData.param);
+		// console.log(res);
 		if(res?.success){
-			state.tableData.data = res.data.records;
+			state.tableData.data = res.data.records.map((item:any) => {
+				return {
+					...item,
+					nickName:item.nickName || '暂无',
+					phone: item.phone || '暂无',
+					mail: item.mail || '暂无',
+				}
+			});
 			state.tableData.total = res.data.total;
 		}else{
 			ElMessage.error('客户列表获取失败！');
@ -221,7 +232,8 @@ const switchState = (scope,staus) => {
 // 重置
 const reset = () =>{
 	state.tableData.param = {
-		name: '',
+		username: '',
+		usertype:2,
 		current: 1,
 		size: 10,
 	}
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
--- a/src/views/login/component/account.vue
+++ b/src/views/login/component/account.vue
@ -105,8 +105,10 @@ const onSignIn = async () => {
 		if(res?.success){
 			// 存储 token 到浏览器缓存
 			Session.set('token', res.data.token);
+			localStorage.setItem('acgroup', JSON.stringify(res.data.user.acgroup));
+			localStorage.setItem('userid',JSON.stringify(res.data.user.id))
 			// usertype判断登录角色
-			// Cookies.set('userName', res.data.user.usertype === 1 ? 'admin' : 'user');
+			// Cookies.set('userName', res.data.records.acgroup === 1 ? 'admin' : 'user');
 			Cookies.set('userName', 'admin');
 			if (!themeConfig.value.isRequestRoutes) {
 				// 前端控制路由，2、请注意执行顺序
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@ -2,7 +2,7 @@
 	<div class="login-container flex">
 		<div class="login-left">
 			<div class="login-left-logo">
-				<img :src="getThemeConfig.logoMini" />
+				<img :src="getThemeConfig.logoMini || logoMini" />
 				<div class="login-left-logo-text">
 					<span>{{ getThemeConfig.globalTitle }}</span>
 					<!-- <span class="login-left-logo-text-msg">{{ getThemeConfig.globalViceTitleMsg }}</span> -->
--- a/src/views/service/recommend/index.vue
+++ b/src/views/service/recommend/index.vue
@ -0,0 +1,243 @@
+<template>
+    <div class="system-dept-container layout-padding">
+		<el-card shadow="hover" class="layout-padding-auto">
+			<div class="system-dept-search mb15">
+                <!-- 发布者：<el-input size="default" placeholder="请输入发布用户名称" v-model="state.tableData.param.userName" 
+				class="ml10 mr10" style="max-width: 180px" clearable></el-input> -->
+                作品类型：<el-select size="default" v-model="state.tableData.param.serviceId" placeholder="请选择作品类型" 
+                clearable class="ml10 mr10" style="max-width: 180px">
+					<el-option v-for="(item,index) in state.special.data" :key="index" :label="item.name" :value="item.id"></el-option>
+                </el-select>
+                
+				<el-button @click="getTableData" size="default" type="primary" class="ml10">
+					<el-icon>
+						<ele-Search />
+					</el-icon>
+					查询
+				</el-button>
+                <el-button @click="reset" size="default" type="primary" class="ml10">
+					<el-icon>
+						<ele-RefreshRight />
+					</el-icon>
+					重置
+				</el-button>
+			</div>
+			<el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%">
+				<el-table-column align="center" type="index" label="序号"  width="100"/>
+				<el-table-column align="center" prop="name" label="作品">
+					<template #default="scope">
+						<el-image :src="scope.row.path" lazy
+						preview-teleported="true" :preview-src-list="[scope.row.path]"/>
+					</template>
+				</el-table-column>
+				<el-table-column prop="serviceName" align="center" label="服务名" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="createtime" align="center" label="时间" :formatter="dateFormatter" show-overflow-tooltip></el-table-column>
+				<el-table-column label="操作" width="200" align="center">
+					<template #default="scope">
+						<!-- <el-button size="small" text type="primary" @click="toShowDetail(scope.row.id)">查看详情</el-button> -->
+						<el-button  size="small" text type="danger" @click="toPublic(scope.row)">取消推荐</el-button>
+						<!-- <el-button size="small" v-else text type="primary" @click="audit(scope.row)">重新审核</el-button> -->
+					</template>
+				</el-table-column>
+			</el-table>
+			<el-pagination
+				@size-change="onHandleSizeChange"
+				@current-change="onHandleCurrentChange"
+				class="mt15"
+				:pager-count="5"
+				:page-sizes="[10, 20, 30]"
+				v-model:current-page="state.tableData.param.current"
+				background
+				v-model:page-size="state.tableData.param.size"
+				layout="total, sizes, prev, pager, next, jumper"
+				:total="state.tableData.total"
+			>
+			</el-pagination>
+		</el-card>
+		<!-- 回复弹窗 -->
+		<el-dialog style="height: 200px;" :title="state.auditDialog.title" v-model="state.auditDialog.show" width="400px">
+			<div class="dialog-content">
+				<el-form ref="replayFormRef" v-loading="state.auditDialog.loading" label-width="80px" :model="state.auditDialog.form">
+					<el-radio-group class="dialog-radio" v-model="state.auditDialog.form.status">
+						<el-radio :value="2">通过</el-radio>
+						<el-radio :value="3">不通过</el-radio>
+					</el-radio-group>
+					<div class="dialog-footer">
+						<el-button @click="state.auditDialog.show = false">取消</el-button>
+						<el-button type="primary">确定</el-button>
+					</div>
+				</el-form>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+
+<script setup lang="ts" name="shares">
+import { defineAsyncComponent, onMounted, reactive, ref } from 'vue';
+import { recommendApi } from '/@/api/service/recommend';
+import { applyApi } from '/@/api/service/apply';
+import { ElMessage, ElMessageBox, TableColumnCtx } from 'element-plus';
+
+// 表格数据
+const state = reactive<any>({
+	tableData: {
+		data: [],
+		total: 0,
+		loading: false,
+		param: {
+			current: 1,
+			size: 10,
+			serviceId: ''
+		},
+	},
+	special: {
+		data: [],
+	},
+	auditDialog: {
+		loading: false,
+		form: {
+			id: '',
+			status: 2
+		},
+		show: false,
+		title: '作品审核',
+		message: '',
+	}
+});
+
+// 引入 api 请求接口
+const redApi = recommendApi();
+const aplApi = applyApi();
+
+// 获取专题列表
+const getSpecialList = async() => {
+	try {
+		state.tableData.loading = true;
+		let res = await aplApi.getAllServices();
+		if(res?.success){
+			state.special.data = res.data;
+		}else{
+			ElMessage.error('专题列表获取失败！');
+		}
+	} catch (error) {
+	} finally {
+		state.tableData.loading = false;
+	}
+};
+
+// 获取表格数据
+const getTableData = async() => {
+	try {
+		state.tableData.loading = true;
+		let res = await redApi.getRecommendList(state.tableData.param);
+		if(res?.success){
+			state.tableData.data = res.data.records;
+			state.tableData.total = res.data.total;
+		}else{
+			ElMessage.error('推荐作品列表获取失败！');
+		}
+	} catch (error) {
+	} finally {
+		state.tableData.loading = false;
+	}
+};
+
+// 重置
+const reset = () =>{
+	state.tableData.param = {
+		current: 1,
+		size: 10,
+		serviceId: ''
+	}
+	getTableData();
+}
+
+const replayFormRef = ref();
+
+// 取消推荐
+const toPublic = (row: any) => {
+	ElMessageBox.confirm('确定要取消该作品推荐吗?', '提示', {
+		confirmButtonText: '确定',
+		cancelButtonText: '取消',
+		type: 'warning',
+	})
+	.then(async() => {
+		try {
+			state.tableData.loading = true;
+			// let res = await shareApi.saveRelease({ creationId: row.creationId });
+			// if(res?.success){ 
+			// 	await getTableData();
+			// ElMessage.success('发布成功！');
+			ElMessage.warning('功能暂未开放！');
+			// } else ElMessage.error('发布失败！');
+		} catch(e) {
+			ElMessage.error('处理失败！');
+		} finally {
+			state.tableData.loading = false;
+		}
+	})
+}
+
+// 日期格式化
+const dateFormatter = (row: any, column: TableColumnCtx<String>) => {
+    if(row.createtime === null) return '暂无';
+	let mount = row.createtime[1];
+	let day = row.createtime[2];
+	let hour = row.createtime[3];
+	let minute = row.createtime[4];
+	let second = row.createtime[5];
+  	return `${row.createtime[0]}-${mount < 10 ? '0' : ''}${mount}-${day < 10 ? '0' : ''}${day} ${hour < 10 ? '0' : ''}${hour}:${minute < 10 ? '0' : ''}${minute}:${second < 10 ? '0' : ''}${second}`;
+}
+
+// 分页改变
+const onHandleSizeChange = (val: number) => {
+	state.tableData.param.size = val;
+	getTableData();
+};
+
+// 分页改变
+const onHandleCurrentChange = (val: number) => {
+	state.tableData.param.current = val;
+	getTableData();
+};
+
+onMounted(() => {
+	getSpecialList();
+	getTableData();
+})
+
+</script>
+
+<style scoped lang="scss">
+.system-dept-container {
+	:deep(.el-card__body) {
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+		overflow: auto;
+		.el-table {
+			flex: 1;
+		}
+	}
+}
+.dialog-content{
+	padding: 0;
+	display: flex;
+	flex-direction: column;
+}
+.dialog-radio{
+	display: flex;
+	justify-content: center;
+}
+.dialog-footer{
+	margin-top: 20px;
+	display: flex;
+	justify-content: center;
+}
+::v-deep .el-image {
+  width: 75px; // 固定图片宽度
+  height: 75px; // 固定图片高度
+  object-fit: cover; // 图片居中剪裁
+//   display: block;
+}
+</style>
--- a/src/views/service/shares/index.vue
+++ b/src/views/service/shares/index.vue
@ -47,6 +47,7 @@
 						<el-button size="small" v-if="scope.row.reviewStatus === 1" text type="primary" @click="audit(scope.row)">审核</el-button>
 						<el-button size="small" v-else-if="scope.row.reviewStatus === null||scope.row.reviewStatus === 0" text type="primary" @click="toPublic(scope.row)">发布</el-button>
 						<el-button size="small" v-else text type="primary" @click="audit(scope.row)">重新审核</el-button>
+						<!-- <el-button size="small" v-if="scope.row.reviewStatus === 2" text type="primary" @click="toPublicHome(scope.row)">首页推荐</el-button> -->
 					</template>
 				</el-table-column>
 			</el-table>
@ -184,6 +185,35 @@ const toPublic = (row: any) => {
 	})
 }

+// 首页推荐
+const toPublicHome = (row: any) => {
+	ElMessageBox.confirm('确定要推荐该作品吗?', '提示', {
+		confirmButtonText: '确定',
+		cancelButtonText: '取消',
+		type: 'warning',
+	})
+	.then(async() => {
+		try {
+			state.tableData.loading = true;
+			const form = {
+					labelName: '首页推荐',
+					moduleName: '首页推荐',
+					path: row.path
+				}
+				console.log(form);
+				
+			// let res = await shareApi.saveRelease({ creationId: row.creationId });
+			// if(res?.success){ 
+			// 	ElMessage.success('推荐成功！');
+			// } else ElMessage.error('推荐失败！');
+		} catch(e) {
+			ElMessage.error('处理失败！');
+		} finally {
+			state.tableData.loading = false;
+		}
+	})
+}
+
 // 审核
 const audit = (row: any) => {
 	state.auditDialog.form.id = row.id;
--- a/src/views/statistics/index.vue
+++ b/src/views/statistics/index.vue
--- a/src/views/usermanage/role/dialog.vue
+++ b/src/views/usermanage/role/dialog.vue
@ -195,6 +195,8 @@ const onSubmit = async() => {
 	// emit('reset');
 	roleDialogFormRef.value?.validate( async (valid: boolean) => {
 		if(valid){
+			console.log(11111111111);
+			
 			state.ruleForm.show = state.ruleForm.show ? 1 : 0;
 			state.ruleForm.grouptypeid = 1;
 			if (state.dialog.type === 'add') {
@ -251,28 +253,6 @@ const onSubmit = async() => {
 			}
 		}
 	})
-	// if (state.dialog.type === 'add') {
-	// 	roleDialogFormRef.value?.validate((valid: boolean) => {
-  //   if (valid) {
-  //     closeDialog();
-  //     emit('reset');
-  //   } else {
-  //     ElMessage.error('请填写完整的表单信息');
-  //     return false;
-  // 		}
-  // 	}); 
-	// }
-	// else{
-	// 	roleDialogFormRef.value?.validate((valid:boolean) => {
-	// 		if (valid) {
-  //     closeDialog();
-  //     emit('reset');
-  //   } else {
-  //     ElMessage.error('请修改完整的表单信息');
-  //     return false;
-  // 		}
-	// 	})
-	// }
 };

 // 暴露变量
--- a/src/views/usermanage/role/index.vue
+++ b/src/views/usermanage/role/index.vue
@ -17,7 +17,7 @@
 				</el-button>
 			</div>
 			<el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%">
-				<el-table-column type="index" label="序号" width="60" />
+				<el-table-column type="index" label="序号" width="100" />
 				<el-table-column prop="name" label="角色名称" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="acgroup" label="角色标识" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="show" label="角色状态" show-overflow-tooltip>
@ -70,7 +70,7 @@ const roletypeapi = roletypeApi();

 // 定义变量内容
 const roleDialogRef = ref();
-const state = reactive<SysRoleState>({
+const state = reactive({
 	tableData: {
 		data: [],
 		total: 0,
@ -169,6 +169,7 @@ const reset = (index = 0) =>{
    // moduleid:moduleList.value
    pageNum: index ? state.tableData.param.pageNum : 1,
    pageSize: 10,
+		name:''
  },
  console.log(index,state.tableData.param);
  getTableData();
--- a/src/views/usermanage/user/dialog.vue
+++ b/src/views/usermanage/user/dialog.vue
@ -1,27 +1,28 @@
 <template>
 	<div class="system-user-dialog-container">
 		<el-dialog :title="state.dialog.title" v-model="state.dialog.isShowDialog" width="769px">
-			<el-form ref="userDialogFormRef" :model="state.ruleForm" size="default" label-width="90px">
+			<el-form ref="userDialogFormRef" :model="state.ruleForm" :rules="state.rules" size="default" label-width="90px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="账户名称">
-							<el-input v-model="state.ruleForm.userName" placeholder="请输入账户名称" clearable></el-input>
+						<el-form-item label="账户名称" prop="username">
+							<el-input v-model="state.ruleForm.username" placeholder="请输入账户名称" clearable></el-input>
 						</el-form-item>
 					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+					<!-- <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="用户昵称">
 							<el-input v-model="state.ruleForm.userNickname" placeholder="请输入用户昵称" clearable></el-input>
 						</el-form-item>
-					</el-col>
+					</el-col> -->
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="关联角色">
-							<el-select v-model="state.ruleForm.roleSign" placeholder="请选择" clearable class="w100">
-								<el-option label="超级管理员" value="admin"></el-option>
-								<el-option label="普通用户" value="common"></el-option>
+						<el-form-item label="关联角色" prop="acgroup">
+							<el-select v-model="state.ruleForm.acgroup" placeholder="请选择" clearable class="w100">
+								<!-- <el-option label="管理员" value="admin"></el-option>
+								<el-option label="普通用户" value="common"></el-option> -->
+								<el-option :data-op="item.id" v-for="(item,index) in roleList" :key="index" :label="item.name" :value="item.id"></el-option>
 							</el-select>
 						</el-form-item>
 					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+					<!-- <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="部门">
 							<el-cascader
 								:options="state.deptData"
@ -37,36 +38,36 @@
 								</template>
 							</el-cascader>
 						</el-form-item>
-					</el-col>
+					</el-col> -->
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="手机号">
+						<el-form-item label="手机号" prop="phone">
 							<el-input v-model="state.ruleForm.phone" placeholder="请输入手机号" clearable></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="邮箱">
-							<el-input v-model="state.ruleForm.email" placeholder="请输入" clearable></el-input>
+						<el-form-item label="邮箱" prop="mail">
+							<el-input v-model="state.ruleForm.mail" placeholder="请输入" clearable></el-input>
 						</el-form-item>
 					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="性别">
-							<el-select v-model="state.ruleForm.sex" placeholder="请选择" clearable class="w100">
+					<!-- <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> -->
+						<!-- <el-form-item label="性别">
+							<el-select v-model="state.ruleForm.gender"  placeholder="请选择" clearable class="w100">
 								<el-option label="男" value="男"></el-option>
 								<el-option label="女" value="女"></el-option>
 							</el-select>
-						</el-form-item>
-					</el-col>
+						</el-form-item> -->
+					<!-- </el-col> -->
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="账户密码">
+						<el-form-item label="账户密码" prop="password">
 							<el-input v-model="state.ruleForm.password" placeholder="请输入" type="password" clearable></el-input>
 						</el-form-item>
 					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+					<!-- <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="账户过期">
 							<el-date-picker v-model="state.ruleForm.overdueTime" type="date" placeholder="请选择" class="w100"> </el-date-picker>
 						</el-form-item>
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+					</el-col> -->
+					<!-- <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="用户状态">
 							<el-switch v-model="state.ruleForm.status" inline-prompt active-text="启" inactive-text="禁"></el-switch>
 						</el-form-item>
@ -75,7 +76,7 @@
 						<el-form-item label="用户描述">
 							<el-input v-model="state.ruleForm.describe" type="textarea" placeholder="请输入用户描述" maxlength="150"></el-input>
 						</el-form-item>
-					</el-col>
+					</el-col> -->
 				</el-row>
 			</el-form>
 			<template #footer>
@ -89,28 +90,44 @@
 </template>

 <script setup lang="ts" name="systemUserDialog">
-import { reactive, ref } from 'vue';
+import { onMounted, reactive, ref } from 'vue';
+import { roleApi } from '/@/api/role';
+import { ElMessage } from 'element-plus';
+import { userApi } from '/@/api/user';

 // 定义子组件向父组件传值/事件
-const emit = defineEmits(['refresh']);
+const emit = defineEmits(['reset']);
+
+const roleapi = roleApi()
+
+const userapi = userApi()

 // 定义变量内容
 const userDialogFormRef = ref();
 const state = reactive({
 	ruleForm: {
-		userName: '', // 账户名称
-		userNickname: '', // 用户昵称
-		roleSign: '', // 关联角色
-		department: [] as string[], // 部门
+		username: '', // 账户名称
+		// userNickname: '', // 用户昵称
+		acgroupName: '', // 关联角色
+		// department: [] as string[], // 部门
 		phone: '', // 手机号
-		email: '', // 邮箱
-		sex: '', // 性别
+		mail: '', // 邮箱
+		acgroup:0,
+		// gender: '', // 性别
 		password: '', // 账户密码
-		overdueTime: '', // 账户过期
-		status: true, // 用户状态
-		describe: '', // 用户描述
+		usertype:1
+		// overdueTime: '', // 账户过期
+		// status: true, // 用户状态
+		// describe: '', // 用户描述
 	},
-	deptData: [] as DeptTreeType[], // 部门数据
+	rules:{
+		username:{ required: true, message: '请输入账户名称', trigger:'blur'},
+		acgroup:{ required: true, message: '请选择关联角色', trigger:'change'},
+		phone:{ required: true, message: '请输入手机号', trigger:'blur'},
+		mail:{ required: true, message: '请输入邮箱', trigger:'blur'},
+		password:{ required: true, message: '请输入账户密码', trigger:'blur'},
+	},
+	// deptData: [] as DeptTreeType[], // 部门数据
 	dialog: {
 		isShowDialog: false,
 		type: '',
@ -120,22 +137,64 @@ const state = reactive({
 });

 // 打开弹窗
-const openDialog = (type: string, row: RowUserType) => {
+const openDialog = (type: string, row: any) => {
 	if (type === 'edit') {
 		state.ruleForm = row;
+		state.dialog.type = type;
 		state.dialog.title = '修改用户';
 		state.dialog.submitTxt = '修 改';
+		console.log(111111,state.ruleForm);
+		
 	} else {
+		resetForm();
 		state.dialog.title = '新增用户';
 		state.dialog.submitTxt = '新 增';
+		state.dialog.type = type;
+		userDialogFormRef.value?.resetFields();
 		// 清空表单，此项需加表单验证才能使用
 		// nextTick(() => {
 		// 	userDialogFormRef.value.resetFields();
 		// });
 	}
 	state.dialog.isShowDialog = true;
-	getMenuData();
+	// getMenuData();
 };
+
+
+//角色列表
+const roleList = ref([]);
+
+//获取角色列表
+const getroleList = async() => {
+	try{
+		let param = {
+			current:1,
+			size:10
+		}
+		const res = await roleapi.getRoleList(param);
+		if(res?.success){
+			roleList.value = res.data.records;
+			// console.log(roleList.value);
+		};
+	}catch(error){
+		console.error(error);
+		ElMessage.error('请求失败!')
+	}
+}
+
+//重置表单
+const resetForm = () =>{
+	state.ruleForm ={
+		username:'',
+		usertype:1,
+		acgroupName:'',
+		// acgroup:,
+		phone:'',
+		mail:'',
+		password:''
+	}
+};
+
 // 关闭弹窗
 const closeDialog = () => {
 	state.dialog.isShowDialog = false;
@ -146,42 +205,87 @@ const onCancel = () => {
 };
 // 提交
 const onSubmit = () => {
-	closeDialog();
-	emit('refresh');
-	// if (state.dialog.type === 'add') { }
+	// closeDialog();
+	// emit('reset');
+	userDialogFormRef.value?.validate( async(valid:boolean) => {
+		if(valid){
+
+			if(state.dialog.type === 'add'){
+				// state.ruleForm.acgroup 
+				try{
+					const res = await userapi.addUser(state.ruleForm);
+					if(res?.success){
+						
+						emit('reset');
+						closeDialog();
+						
+						ElMessage.success('用户创建成功！');
+						
+						Object.assign(state.ruleForm,{
+							username:'',
+							usertype:1,
+							usertypeName:'',
+							phone:'',
+							mail:'',
+							password:''
+						})
+					}
+				}catch(error){
+					console.error(error);
+					ElMessage.error('用户创建失败！');
+				}
+			}else{
+				try{
+					const res = await userapi.updateUser(state.ruleForm);
+					if(res?.success){
+						emit('reset');
+						ElMessage.success('用户修改成功！');
+						closeDialog();
+					}
+				}catch(error){
+					console.error(error);
+					ElMessage.error('用户修改失败！')
+				}
+			}
+		}
+	})
 };
+
 // 初始化部门数据
-const getMenuData = () => {
-	state.deptData.push({
-		deptName: 'vueNextAdmin',
-		createTime: new Date().toLocaleString(),
-		status: true,
-		sort: Math.random(),
-		describe: '顶级部门',
-		id: Math.random(),
-		children: [
-			{
-				deptName: 'IT外包服务',
-				createTime: new Date().toLocaleString(),
-				status: true,
-				sort: Math.random(),
-				describe: '总部',
-				id: Math.random(),
-			},
-			{
-				deptName: '资本控股',
-				createTime: new Date().toLocaleString(),
-				status: true,
-				sort: Math.random(),
-				describe: '分部',
-				id: Math.random(),
-			},
-		],
-	});
-};
+// const getMenuData = () => {
+// 	state.deptData.push({
+// 		deptName: 'vueNextAdmin',
+// 		createTime: new Date().toLocaleString(),
+// 		status: true,
+// 		sort: Math.random(),
+// 		describe: '顶级部门',
+// 		id: Math.random(),
+// 		children: [
+// 			{
+// 				deptName: 'IT外包服务',
+// 				createTime: new Date().toLocaleString(),
+// 				status: true,
+// 				sort: Math.random(),
+// 				describe: '总部',
+// 				id: Math.random(),
+// 			},
+// 			{
+// 				deptName: '资本控股',
+// 				createTime: new Date().toLocaleString(),
+// 				status: true,
+// 				sort: Math.random(),
+// 				describe: '分部',
+// 				id: Math.random(),
+// 			},
+// 		],
+// 	});
+// };

 // 暴露变量
 defineExpose({
 	openDialog,
 });
+onMounted(async() =>{
+	await getroleList()
+})
 </script>
--- a/src/views/usermanage/user/index.vue
+++ b/src/views/usermanage/user/index.vue
@ -2,8 +2,8 @@
 	<div class="system-user-container layout-padding">
 		<el-card shadow="hover" class="layout-padding-auto">
 			<div class="system-user-search mb15">
-				<el-input size="default" placeholder="请输入用户名称" style="max-width: 180px"> </el-input>
-				<el-button size="default" type="primary" class="ml10">
+				<el-input v-model="state.tableData.param.username" size="default" placeholder="请输入用户名称" style="max-width: 180px" clearable> </el-input>
+				<el-button size="default" type="primary" class="ml10" @click="getTableData">
 					<el-icon>
 						<ele-Search />
 					</el-icon>
@ -17,27 +17,27 @@
 				</el-button>
 			</div>
 			<el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%">
-				<el-table-column type="index" label="序号" width="60" />
-				<el-table-column prop="userName" label="账户名称" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="userNickname" label="用户昵称" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="roleSign" label="关联角色" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="department" label="部门" show-overflow-tooltip></el-table-column>
+				<el-table-column type="index" label="序号" width="100" />
+				<el-table-column prop="username" label="账户名称" show-overflow-tooltip ></el-table-column>
+				<!-- <el-table-column prop="userNickname" label="用户昵称" show-overflow-tooltip></el-table-column> -->
+				<el-table-column prop="acgroupName" label="关联角色" show-overflow-tooltip></el-table-column>
+				<!-- <el-table-column prop="department" label="部门" show-overflow-tooltip></el-table-column> -->
 				<el-table-column prop="phone" label="手机号" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="email" label="邮箱" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="status" label="用户状态" show-overflow-tooltip>
+				<el-table-column prop="mail" label="邮箱" show-overflow-tooltip></el-table-column>
+				<!-- <el-table-column prop="status" label="用户状态" show-overflow-tooltip>
 					<template #default="scope">
 						<el-tag type="success" v-if="scope.row.status">启用</el-tag>
 						<el-tag type="info" v-else>禁用</el-tag>
 					</template>
-				</el-table-column>
-				<el-table-column prop="describe" label="用户描述" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column>
+				</el-table-column> -->
+				<!-- <el-table-column prop="describe" label="用户描述" show-overflow-tooltip></el-table-column> -->
+				<el-table-column prop="createtime" label="创建时间" :formatter="dateFormatter" show-overflow-tooltip></el-table-column>
 				<el-table-column label="操作" width="100">
 					<template #default="scope">
-						<el-button :disabled="scope.row.userName === 'admin'" size="small" text type="primary" @click="onOpenEditUser('edit', scope.row)"
+						<el-button size="small" text type="primary" @click="onOpenEditUser('edit', scope.row)"
 							>修改</el-button
 						>
-						<el-button :disabled="scope.row.userName === 'admin'" size="small" text type="primary" @click="onRowDel(scope.row)">删除</el-button>
+						<el-button size="small" text type="primary" @click="onRowDel(scope.row)">删除</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
@ -47,100 +47,153 @@
 				class="mt15"
 				:pager-count="5"
 				:page-sizes="[10, 20, 30]"
-				v-model:current-page="state.tableData.param.pageNum"
+				v-model:current-page="state.tableData.param.current"
 				background
-				v-model:page-size="state.tableData.param.pageSize"
+				v-model:page-size="state.tableData.param.size"
 				layout="total, sizes, prev, pager, next, jumper"
 				:total="state.tableData.total"
 			>
 			</el-pagination>
 		</el-card>
-		<UserDialog ref="userDialogRef" @refresh="getTableData()" />
+		<UserDialog ref="userDialogRef" @reset="getTableData()" />
 	</div>
 </template>

 <script setup lang="ts" name="systemUser">
 import { defineAsyncComponent, reactive, onMounted, ref } from 'vue';
-import { ElMessageBox, ElMessage } from 'element-plus';
+import { ElMessageBox, ElMessage,TableColumnCtx } from 'element-plus';
+import { userApi } from '/@/api/user'

 // 引入组件
 const UserDialog = defineAsyncComponent(() => import('/@/views/usermanage/user/dialog.vue'));

+const userapi = userApi();
+
 // 定义变量内容
 const userDialogRef = ref();
-const state = reactive<SysUserState>({
+const state = reactive({
 	tableData: {
 		data: [],
 		total: 0,
 		loading: false,
 		param: {
-			pageNum: 1,
-			pageSize: 10,
+			username:'',
+			usertype:1,
+			current: 1,
+			size: 10,
 		},
 	},
 });

 // 初始化表格数据
-const getTableData = () => {
+const getTableData = async() => {
 	state.tableData.loading = true;
-	const data = [];
-	for (let i = 0; i < 2; i++) {
-		data.push({
-			userName: i === 0 ? 'admin' : 'test',
-			userNickname: i === 0 ? '我是管理员' : '我是普通用户',
-			roleSign: i === 0 ? 'admin' : 'common',
-			department: i === 0 ? ['vueNextAdmin', 'IT外包服务'] : ['vueNextAdmin', '资本控股'],
-			phone: '12345678910',
-			email: 'vueNextAdmin@123.com',
-			sex: '女',
-			password: '123456',
-			overdueTime: new Date(),
-			status: true,
-			describe: i === 0 ? '不可删除' : '测试用户',
-			createTime: new Date().toLocaleString(),
-		});
-	}
-	state.tableData.data = data;
-	state.tableData.total = state.tableData.data.length;
-	setTimeout(() => {
+	// const data = [];
+	// for (let i = 0; i < 2; i++) {
+	// 	data.push({
+	// 		userName: i === 0 ? 'admin' : 'test',
+	// 		userNickname: i === 0 ? '我是管理员' : '我是普通用户',
+	// 		roleSign: i === 0 ? 'admin' : 'common',
+	// 		department: i === 0 ? ['vueNextAdmin', 'IT外包服务'] : ['vueNextAdmin', '资本控股'],
+	// 		phone: '12345678910',
+	// 		email: 'vueNextAdmin@123.com',
+	// 		sex: '女',
+	// 		password: '123456',
+	// 		overdueTime: new Date(),
+	// 		status: true,
+	// 		describe: i === 0 ? '不可删除' : '测试用户',
+	// 		createTime: new Date().toLocaleString(),
+	// 	});
+	// }
+	// state.tableData.data = data;
+	// state.tableData.total = state.tableData.data.length;
+	try{
+		const res = await userapi.getUserList(state.tableData.param);
+		if(res?.success){
+			state.tableData.data = res.data.records.map((item:any) => {
+				return{
+					...item,
+					phone:item.phone || '暂无',
+					mail:item.mail || '暂无',
+				}
+			});
+			// console.log(11111111,state.tableData.data);
+			
+		};
+		state.tableData.total = res.data.total;
+	}catch(error){
+		console.error(error)
+	}finally{
+		setTimeout(() => {
 		state.tableData.loading = false;
-	}, 500);
+		}, 500);
+	}
 };
 // 打开新增用户弹窗
 const onOpenAddUser = (type: string) => {
 	userDialogRef.value.openDialog(type);
 };
 // 打开修改用户弹窗
-const onOpenEditUser = (type: string, row: RowUserType) => {
+const onOpenEditUser = (type: string, row: Object) => {
 	userDialogRef.value.openDialog(type, row);
 };
 // 删除用户
-const onRowDel = (row: RowUserType) => {
-	ElMessageBox.confirm(`此操作将永久删除账户名称：“${row.userName}”，是否继续?`, '提示', {
+const onRowDel = (row: any) => {
+	ElMessageBox.confirm(`此操作将永久删除账户名称：“${row.username}”，是否继续?`, '提示', {
 		confirmButtonText: '确认',
 		cancelButtonText: '取消',
 		type: 'warning',
 	})
-		.then(() => {
-			getTableData();
-			ElMessage.success('删除成功');
+		.then(async() => {
+			try{
+				state.tableData.loading = true;
+				const res = await userapi.deleteUser(row.id)
+				if(res?.success){
+					reset();
+					ElMessage.success('用户删除成功！');
+				}else{
+					ElMessage.error('用户删除失败！');
+				}
+			}catch(error){
+				ElMessage.error('处理失败！');
+				console.error(error);
+			}finally{
+				state.tableData.loading = false
+			}
 		})
-		.catch(() => {});
+};
+//重置
+const reset = (index = 0) =>{
+  state.tableData.param = {
+    // moduleid:moduleList.value
+    current: index ? state.tableData.param.current : 1,
+		usertype:1,
+    size: 10,
+		username:''
+  },
+  console.log(index,state.tableData.param);
+  getTableData();
 };
 // 分页改变
 const onHandleSizeChange = (val: number) => {
-	state.tableData.param.pageSize = val;
+	state.tableData.param.size = val;
 	getTableData();
 };
 // 分页改变
 const onHandleCurrentChange = (val: number) => {
-	state.tableData.param.pageNum = val;
+	state.tableData.param.current = val;
 	getTableData();
 };
+// 日期格式化
+const dateFormatter = (row: any, column: TableColumnCtx<String>) => {
+  let date = new Date(row.createtime);
+  return `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`;
+};
 // 页面加载时
 onMounted(() => {
 	getTableData();
 });
+
 </script>

 <style scoped lang="scss">
Author	SHA1	Message	Date
Double-_-Z	3d9b804f62	业务管理-推荐管理	2025-01-11 11:28:24 +08:00
夕阳微笑1	7d5b4773f1	首页已经修改密码的编写	2025-01-10 10:50:02 +08:00
夕阳微笑1	7183a5dd6b	客户管理的更改	2025-01-06 12:22:23 +08:00
夕阳微笑1	40f08c6c79	文章样式的更改	2025-01-06 12:22:14 +08:00
夕阳微笑1	06980e15f1	首页及其登录页的更改	2025-01-06 12:22:05 +08:00
夕阳微笑1	424dd6b2ad	统计的样式更改	2025-01-06 12:21:27 +08:00
夕阳微笑1	39fcb48ee1	角色和用户的管理更改	2025-01-06 12:21:01 +08:00
夕阳微笑1	b979b3315a	父文本图片还原	2025-01-02 21:19:25 +08:00
夕阳微笑1	8a70642d3b	Merge branch 'main' of http://129.211.33.98:3210/hjq/mart-admin	2025-01-02 21:13:52 +08:00
夕阳微笑1	02d34c4cdc	父文本图片路劲修改	2025-01-02 21:13:50 +08:00