From e7f78fbae033a3d636cd800c21c3353287d9da37 Mon Sep 17 00:00:00 2001
From: sheng <15292050171@163.com>
Date: Mon, 11 Sep 2023 14:58:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E7=BB=9F=E8=AE=A1=E5=9B=BE=E8=A1=A8=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/dept/components/DeptUserCom/crud.tsx |  2 +-
 .../dept/components/DeptUserCom/index.vue       | 17 ++++++++++++++---
 .../menu/components/MenuFormCom/index.vue       |  9 +++++----
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/web/src/views/system/dept/components/DeptUserCom/crud.tsx b/web/src/views/system/dept/components/DeptUserCom/crud.tsx
index 329a19c..36bc11b 100644
--- a/web/src/views/system/dept/components/DeptUserCom/crud.tsx
+++ b/web/src/views/system/dept/components/DeptUserCom/crud.tsx
@@ -74,7 +74,7 @@ export const createCrudOptions = function ({ crudExpose, context }: CreateCrudOp
 				container: {
 					action: {
 						col: {
-							span: 6,
+							span: 10,
 						},
 					},
 				},
diff --git a/web/src/views/system/dept/components/DeptUserCom/index.vue b/web/src/views/system/dept/components/DeptUserCom/index.vue
index a0533c1..d05522d 100644
--- a/web/src/views/system/dept/components/DeptUserCom/index.vue
+++ b/web/src/views/system/dept/components/DeptUserCom/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="dept-user-com-box dept-info">
+	<div v-show="!showCount" class="dept-user-com-box dept-info">
 		<div class="di-left">
 			<h3>{{ deptInfo.dept_name || '' }}</h3>
 			<div class="di-cell">
@@ -30,8 +30,15 @@
 		<div style="height: 180px; width: 380px" ref="deptCountBar"></div>
 		<div style="height: 180px; width: 200px" ref="deptSexPie"></div>
 	</div>
-	<fs-crud ref="crudRef" v-bind="crudBinding" customClass="dept-user-com-box dept-user-com-table">
-		<!-- -->
+
+	<fs-crud
+		ref="crudRef"
+		v-bind="crudBinding"
+		:customClass="!showCount ? 'dept-user-com-box dept-user-com-table' : 'dept-user-com-box dept-user-com-table-cover'"
+	>
+		<template #toolbar-left>
+			<el-button :icon="!showCount ? 'Hide' : 'View'" circle @click="showCount = !showCount"></el-button>
+		</template>
 		<template #actionbar-right>
 			<importExcel api="api/system/user/">导入 </importExcel>
 		</template>
@@ -63,6 +70,7 @@ let deptCountBar = ref();
 let deptSexPie = ref();
 let isShowChildFlag = ref(false);
 let deptInfo = ref<Partial<HeadDeptInfoType>>({});
+let showCount = ref(false);
 
 /**
  * 初始化顶部部门折线图
@@ -213,6 +221,9 @@ const { resetCrudOptions } = useCrud({
 .dept-user-com-table {
 	height: calc(100% - 200px);
 }
+.dept-user-com-table-cover {
+	height: 100%;
+}
 .dept-info {
 	width: 100%;
 	height: 200px;
diff --git a/web/src/views/system/menu/components/MenuFormCom/index.vue b/web/src/views/system/menu/components/MenuFormCom/index.vue
index 79929b3..c7e519d 100644
--- a/web/src/views/system/menu/components/MenuFormCom/index.vue
+++ b/web/src/views/system/menu/components/MenuFormCom/index.vue
@@ -23,6 +23,11 @@
 					style="width: 100%"
 				/>
 			</el-form-item>
+
+			<el-form-item label="路由地址" prop="web_path">
+				<el-input v-model="menuFormData.web_path" placeholder="请输入路由地址，请以/开头" />
+			</el-form-item>
+
 			<el-form-item label="图标" prop="icon">
 				<IconSelector clearable v-model="menuFormData.icon" />
 			</el-form-item>
@@ -60,10 +65,6 @@
 			<el-divider></el-divider>
 
 			<div style="min-height: 184px">
-				<el-form-item v-if="!menuFormData.is_catalog && !menuFormData.is_link" label="路由地址" prop="web_path">
-					<el-input v-model="menuFormData.web_path" placeholder="请输入路由地址，请以/开头" />
-				</el-form-item>
-
 				<el-form-item v-if="!menuFormData.is_catalog && !menuFormData.is_link" label="组件地址" prop="component">
 					<el-autocomplete
 						class="w-full"