ソースを参照

reactor:权限调整;

zhangchong 1 年間 前
コミット
ddcec61c80
2 ファイル変更44 行追加37 行削除
  1. 29 19
      src/layout/navBars/breadcrumb/user.vue
  2. 15 18
      src/views/system/menu/index.vue

+ 29 - 19
src/layout/navBars/breadcrumb/user.vue

@@ -22,7 +22,15 @@
 		</div>
 		<div class="layout-navBars-breadcrumb-user-icon mr10" title="消息通知">
 			<div class="layout-navBars-breadcrumb-user-icon">
-				<el-popover placement="bottom" trigger="click" popper-class="user-news-box" transition="el-zoom-in-top" :width="300" :persistent="false" v-model:visible="newsVisible">
+				<el-popover
+					placement="bottom"
+					trigger="click"
+					popper-class="user-news-box"
+					transition="el-zoom-in-top"
+					:width="300"
+					:persistent="false"
+					v-model:visible="newsVisible"
+				>
 					<template #reference>
 						<el-badge :value="messageCount" :max="99" :hidden="messageHidden">
 							<SvgIcon name="ele-Bell" size="18px" />
@@ -159,7 +167,7 @@ import { changePwd } from '@/api/login/user';
 import { megcount } from '@/api/auxiliary/notice';
 import signalR from '@/utils/signalR';
 import { ola } from '@/utils/ola_api';
-import {dutyOff} from "@/api/public/wex";
+import { dutyOff } from '@/api/public/wex';
 
 // 引入组件
 const UserNews = defineAsyncComponent(() => import('@/layout/navBars/breadcrumb/userNews.vue'));
@@ -316,6 +324,7 @@ const onLogOut = () => {
 			type: 'warning',
 			autofocus: false,
 			cancelButtonClass: 'default-button',
+			showClose: false,
 			beforeClose: (action, instance, done) => {
 				if (action === 'confirm') {
 					instance.confirmButtonLoading = true;
@@ -332,21 +341,21 @@ const onLogOut = () => {
 			},
 		})
 			.then(() => {
-        dutyOff(); // 呼叫中心签出
-        setTimeout(()=>{
-          ola.logout(); // 呼叫中心退出登录
-          ola.close(); // 呼叫中心关闭
-          signalR.leaveGroup('CallCenter'); // 离开呼叫中心组
-          signalR.stop(); // 断开链接
-          // 重置所有状态
-          usetelStatusStore.resetState();
-          // 清除缓存/token等
-          Local.clear();
-          Session.clear();
-          Cookie.clear();
-          // 使用 reload 时,不需要调用 resetRoute() 重置路由
-          window.location.reload();
-        },100)
+				dutyOff(); // 呼叫中心签出
+				setTimeout(() => {
+					ola.logout(); // 呼叫中心退出登录
+					ola.close(); // 呼叫中心关闭
+					signalR.leaveGroup('CallCenter'); // 离开呼叫中心组
+					signalR.stop(); // 断开链接
+					// 重置所有状态
+					usetelStatusStore.resetState();
+					// 清除缓存/token等
+					Local.clear();
+					Session.clear();
+					Cookie.clear();
+					// 使用 reload 时,不需要调用 resetRoute() 重置路由
+					window.location.reload();
+				}, 300);
 			})
 			.catch(() => {});
 		return;
@@ -364,6 +373,7 @@ const onLogOut = () => {
 		type: 'warning',
 		autofocus: false,
 		cancelButtonClass: 'default-button',
+		showClose: false,
 		beforeClose: (action, instance, done) => {
 			if (action === 'confirm') {
 				instance.confirmButtonLoading = true;
@@ -570,8 +580,8 @@ onMounted(() => {
 }
 </style>
 <style lang="scss">
-.user-news-box{
-  height: 400px;
+.user-news-box {
+	height: 400px;
 }
 .user-info-box {
 	&-content {

+ 15 - 18
src/views/system/menu/index.vue

@@ -145,7 +145,7 @@ const state = reactive<any>({
 			dataKey: 'isFast',
 			title: '快捷入口',
 			width: 100,
-			cellRenderer: ({ rowData }:any) => {
+			cellRenderer: ({ rowData }: any) => {
 				if ([1, 2].includes(rowData.menuType)) {
 					return <el-tag type={rowData.isFast ? 'success' : 'info'}>{rowData.isFast ? '是' : '否'}</el-tag>;
 				}
@@ -156,7 +156,7 @@ const state = reactive<any>({
 			dataKey: 'isHide',
 			title: '是否隐藏',
 			width: 100,
-			cellRenderer: ({ rowData }:any) => {
+			cellRenderer: ({ rowData }: any) => {
 				if ([1, 2].includes(rowData.menuType)) {
 					return <el-tag type={rowData.isHide ? 'success' : 'info'}>{rowData.isHide ? '是' : '否'}</el-tag>;
 				}
@@ -167,7 +167,7 @@ const state = reactive<any>({
 			dataKey: 'isKeepAlive',
 			title: '是否缓存',
 			width: 100,
-			cellRenderer: ({ rowData }:any) => {
+			cellRenderer: ({ rowData }: any) => {
 				if ([1, 2].includes(rowData.menuType)) {
 					return <el-tag type={rowData.isKeepAlive ? 'success' : 'info'}>{rowData.isKeepAlive ? '是' : '否'}</el-tag>;
 				}
@@ -178,7 +178,7 @@ const state = reactive<any>({
 			dataKey: 'isAffix',
 			title: '是否固定',
 			width: 100,
-			cellRenderer: ({ rowData }:any) => {
+			cellRenderer: ({ rowData }: any) => {
 				if ([1, 2].includes(rowData.menuType)) {
 					return <el-tag type={rowData.isAffix ? 'success' : 'info'}>{rowData.isAffix ? '是' : '否'}</el-tag>;
 				}
@@ -189,7 +189,7 @@ const state = reactive<any>({
 			dataKey: 'isLink',
 			title: '是否外链',
 			width: 100,
-			cellRenderer: ({ rowData }:any) => {
+			cellRenderer: ({ rowData }: any) => {
 				if ([1, 2].includes(rowData.menuType)) {
 					return <el-tag type={rowData.isLink ? 'success' : 'info'}>{rowData.isLink ? '是' : '否'}</el-tag>;
 				}
@@ -327,19 +327,16 @@ const onTableRowDel = (row: any) => {
 };
 // 获取所有菜单
 const quertyList = () => {
-	if (!auth('system:menu:query')) ElMessage.error('抱歉,您没有权限获取菜单管理列表!');
-	else {
-		state.loading = true;
-		getMenuList()
-			.then((res: any) => {
-				state.menuTableData = res?.result ?? [];
-				state.staticArr = res?.result ?? [];
-				state.loading = false;
-			})
-			.catch(() => {
-				state.loading = false;
-			});
-	}
+	state.loading = true;
+	getMenuList()
+		.then((res: any) => {
+			state.menuTableData = res?.result ?? [];
+			state.staticArr = res?.result ?? [];
+			state.loading = false;
+		})
+		.catch(() => {
+			state.loading = false;
+		});
 };
 // 格式化菜单数据并排除按钮
 const getMenuDataWithOutBtn = (routes: any) => {