diff --git a/.env b/.env
index 94652cffd565464f4de021f69d18107faa8c36db..bd76b9eaabbde92b097c8196585f35b0df6ed29c 100644
--- a/.env
+++ b/.env
@@ -7,5 +7,5 @@ VITE_OPEN = false
 # 打包是否开启 cdn（源文件 utils/build.ts），可自行修改
 VITE_OPEN_CDN = false
 
-# public path 配置线上环境路径（打包）、本地通过 http-server 访问时，请置空即可
-VITE_PUBLIC_PATH = /vue-next-admin-preview/
\ No newline at end of file
+# public path 配置线上环境路径（打包）、本地通过 http-server 访问时，请置空即可 /vue-next-admin-preview/
+VITE_PUBLIC_PATH =
\ No newline at end of file
diff --git a/.env.development b/.env.development
index 83fd5c5f87541e39f8222c18f140e118df576bfc..1834c78a5ff67e06311e207d578e2c263a666c31 100644
--- a/.env.development
+++ b/.env.development
@@ -2,4 +2,4 @@
 ENV = development
 
 # 本地环境接口地址
-VITE_API_URL = http://localhost:8888/
\ No newline at end of file
+VITE_API_URL = http://localhost:9000/
\ No newline at end of file
diff --git a/.env.production b/.env.production
index 478a84194a4457c5d11c63c3ca8b8a7d17ae2550..f50f5d7239f05b7946ebec38dfbfb0e8814d6208 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,5 @@
 # 线上环境
 ENV = production
 
-# 线上环境接口地址
-VITE_API_URL = https://lyt-top.gitee.io/vue-next-admin-preview/
\ No newline at end of file
+# 线上环境接口地址http://11.1.11.116:8888/ http://slkjyun.cn:8888/
+VITE_API_URL = https://www.slkjyun.cn/
\ No newline at end of file
diff --git a/index.html b/index.html
index dc8466cc0684542494c4b22c74c070243501f3ce..df75c5f81b1ae39bf6062eca1001162a8819fb35 100644
--- a/index.html
+++ b/index.html
@@ -27,6 +27,6 @@
 			})();
 		</script>
 		<script type="module" src="/src/main.ts"></script>
-		<script type="text/javascript" src="https://api.map.baidu.com/api?v=3.0&ak=wsijQt8sLXrCW71YesmispvYHitfG9gv&s=1"></script>
+<!--		<script type="text/javascript" src="https://api.map.baidu.com/api?v=3.0&ak=wsijQt8sLXrCW71YesmispvYHitfG9gv&s=1"></script>-->
 	</body>
 </html>
diff --git a/package-lock.json b/package-lock.json
index 1a944f7d1d8e9e9e0de2505579859bc43c0efb6d..61498f9e077d66c030aeb677764efeeabde676aa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,6 +21,7 @@
 				"element-plus": "^2.6.1",
 				"js-cookie": "^3.0.5",
 				"js-table2excel": "^1.1.2",
+				"jsencrypt": "^3.3.2",
 				"jsplumb": "^2.15.6",
 				"mitt": "^3.0.1",
 				"nprogress": "^0.2.0",
@@ -36,7 +37,8 @@
 				"vue-demi": "^0.14.7",
 				"vue-grid-layout": "^3.0.0-beta1",
 				"vue-i18n": "^9.10.2",
-				"vue-router": "^4.3.0"
+				"vue-router": "^4.3.0",
+				"xlsx": "^0.18.5"
 			},
 			"devDependencies": {
 				"@types/node": "^20.11.28",
@@ -1684,6 +1686,15 @@
 				"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
 			}
 		},
+		"node_modules/adler-32": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz",
+			"integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==",
+			"license": "Apache-2.0",
+			"engines": {
+				"node": ">=0.8"
+			}
+		},
 		"node_modules/ajv": {
 			"version": "6.12.6",
 			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -1847,6 +1858,19 @@
 				"node": ">=6"
 			}
 		},
+		"node_modules/cfb": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/cfb/-/cfb-1.2.2.tgz",
+			"integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==",
+			"license": "Apache-2.0",
+			"dependencies": {
+				"adler-32": "~1.3.0",
+				"crc-32": "~1.2.0"
+			},
+			"engines": {
+				"node": ">=0.8"
+			}
+		},
 		"node_modules/chalk": {
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -1917,6 +1941,15 @@
 				"tiny-emitter": "^2.0.0"
 			}
 		},
+		"node_modules/codepage": {
+			"version": "1.15.0",
+			"resolved": "https://registry.npmjs.org/codepage/-/codepage-1.15.0.tgz",
+			"integrity": "sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==",
+			"license": "Apache-2.0",
+			"engines": {
+				"node": ">=0.8"
+			}
+		},
 		"node_modules/color-convert": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -1962,6 +1995,18 @@
 			"resolved": "https://registry.npmjs.org/countup.js/-/countup.js-2.8.0.tgz",
 			"integrity": "sha512-f7xEhX0awl4NOElHulrl4XRfKoNH3rB+qfNSZZyjSZhaAoUk6elvhH+MNxMmlmuUJ2/QNTWPSA7U4mNtIAKljQ=="
 		},
+		"node_modules/crc-32": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
+			"integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
+			"license": "Apache-2.0",
+			"bin": {
+				"crc32": "bin/crc32.njs"
+			},
+			"engines": {
+				"node": ">=0.8"
+			}
+		},
 		"node_modules/cropperjs": {
 			"version": "1.6.1",
 			"resolved": "https://registry.npmjs.org/cropperjs/-/cropperjs-1.6.1.tgz",
@@ -2612,6 +2657,15 @@
 				"node": ">= 6"
 			}
 		},
+		"node_modules/frac": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/frac/-/frac-1.1.2.tgz",
+			"integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==",
+			"license": "Apache-2.0",
+			"engines": {
+				"node": ">=0.8"
+			}
+		},
 		"node_modules/fs-extra": {
 			"version": "10.1.0",
 			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
@@ -3014,6 +3068,11 @@
 				"js-yaml": "bin/js-yaml.js"
 			}
 		},
+		"node_modules/jsencrypt": {
+			"version": "3.3.2",
+			"resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.2.tgz",
+			"integrity": "sha512-arQR1R1ESGdAxY7ZheWr12wCaF2yF47v5qpB76TtV64H1pyGudk9Hvw8Y9tb/FiTIaaTRUyaSnm5T/Y53Ghm/A=="
+		},
 		"node_modules/json-schema-traverse": {
 			"version": "0.4.1",
 			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -3869,6 +3928,18 @@
 				"url": "https://github.com/sponsors/antoniandre"
 			}
 		},
+		"node_modules/ssf": {
+			"version": "0.11.2",
+			"resolved": "https://registry.npmjs.org/ssf/-/ssf-0.11.2.tgz",
+			"integrity": "sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==",
+			"license": "Apache-2.0",
+			"dependencies": {
+				"frac": "~1.1.2"
+			},
+			"engines": {
+				"node": ">=0.8"
+			}
+		},
 		"node_modules/ssr-window": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-3.0.0.tgz",
@@ -4087,6 +4158,7 @@
 			"resolved": "https://registry.npmjs.org/vite-plugin-cdn-import/-/vite-plugin-cdn-import-0.3.5.tgz",
 			"integrity": "sha512-e1raoalfBiIhv+hnMeSp1UNjloDDBhHpeFxkwRRdPBmTdDRqdEEn8owUmT5u8UBSVCs4xN3n/od4a91vXEhXPQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"rollup-plugin-external-globals": "^0.6.1"
 			}
@@ -4127,6 +4199,7 @@
 			"resolved": "https://registry.npmjs.org/vite-plugin-compression/-/vite-plugin-compression-0.5.1.tgz",
 			"integrity": "sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"chalk": "^4.1.2",
 				"debug": "^4.3.3",
@@ -4291,12 +4364,51 @@
 			"resolved": "https://registry.npmjs.org/wildcard/-/wildcard-1.1.2.tgz",
 			"integrity": "sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng=="
 		},
+		"node_modules/wmf": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/wmf/-/wmf-1.0.2.tgz",
+			"integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==",
+			"license": "Apache-2.0",
+			"engines": {
+				"node": ">=0.8"
+			}
+		},
+		"node_modules/word": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/word/-/word-0.3.0.tgz",
+			"integrity": "sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==",
+			"license": "Apache-2.0",
+			"engines": {
+				"node": ">=0.8"
+			}
+		},
 		"node_modules/wrappy": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
 			"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
 			"dev": true
 		},
+		"node_modules/xlsx": {
+			"version": "0.18.5",
+			"resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.18.5.tgz",
+			"integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==",
+			"license": "Apache-2.0",
+			"dependencies": {
+				"adler-32": "~1.3.0",
+				"cfb": "~1.2.1",
+				"codepage": "~1.15.0",
+				"crc-32": "~1.2.1",
+				"ssf": "~0.11.2",
+				"wmf": "~1.0.1",
+				"word": "~0.3.0"
+			},
+			"bin": {
+				"xlsx": "bin/xlsx.njs"
+			},
+			"engines": {
+				"node": ">=0.8"
+			}
+		},
 		"node_modules/xml-name-validator": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
@@ -5360,6 +5472,11 @@
 			"dev": true,
 			"requires": {}
 		},
+		"adler-32": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz",
+			"integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A=="
+		},
 		"ajv": {
 			"version": "6.12.6",
 			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -5489,6 +5606,15 @@
 			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
 			"dev": true
 		},
+		"cfb": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/cfb/-/cfb-1.2.2.tgz",
+			"integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==",
+			"requires": {
+				"adler-32": "~1.3.0",
+				"crc-32": "~1.2.0"
+			}
+		},
 		"chalk": {
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -5541,6 +5667,11 @@
 				"tiny-emitter": "^2.0.0"
 			}
 		},
+		"codepage": {
+			"version": "1.15.0",
+			"resolved": "https://registry.npmjs.org/codepage/-/codepage-1.15.0.tgz",
+			"integrity": "sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA=="
+		},
 		"color-convert": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -5580,6 +5711,11 @@
 			"resolved": "https://registry.npmjs.org/countup.js/-/countup.js-2.8.0.tgz",
 			"integrity": "sha512-f7xEhX0awl4NOElHulrl4XRfKoNH3rB+qfNSZZyjSZhaAoUk6elvhH+MNxMmlmuUJ2/QNTWPSA7U4mNtIAKljQ=="
 		},
+		"crc-32": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
+			"integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ=="
+		},
 		"cropperjs": {
 			"version": "1.6.1",
 			"resolved": "https://registry.npmjs.org/cropperjs/-/cropperjs-1.6.1.tgz",
@@ -6082,6 +6218,11 @@
 				"mime-types": "^2.1.12"
 			}
 		},
+		"frac": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/frac/-/frac-1.1.2.tgz",
+			"integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA=="
+		},
 		"fs-extra": {
 			"version": "10.1.0",
 			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
@@ -6376,6 +6517,11 @@
 				"argparse": "^2.0.1"
 			}
 		},
+		"jsencrypt": {
+			"version": "3.3.2",
+			"resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.2.tgz",
+			"integrity": "sha512-arQR1R1ESGdAxY7ZheWr12wCaF2yF47v5qpB76TtV64H1pyGudk9Hvw8Y9tb/FiTIaaTRUyaSnm5T/Y53Ghm/A=="
+		},
 		"json-schema-traverse": {
 			"version": "0.4.1",
 			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -6975,6 +7121,14 @@
 			"resolved": "https://registry.npmjs.org/splitpanes/-/splitpanes-3.1.5.tgz",
 			"integrity": "sha512-r3Mq2ITFQ5a2VXLOy4/Sb2Ptp7OfEO8YIbhVJqJXoFc9hc5nTXXkCvtVDjIGbvC0vdE7tse+xTM9BMjsszP6bw=="
 		},
+		"ssf": {
+			"version": "0.11.2",
+			"resolved": "https://registry.npmjs.org/ssf/-/ssf-0.11.2.tgz",
+			"integrity": "sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==",
+			"requires": {
+				"frac": "~1.1.2"
+			}
+		},
 		"ssr-window": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-3.0.0.tgz",
@@ -7250,12 +7404,36 @@
 			"resolved": "https://registry.npmjs.org/wildcard/-/wildcard-1.1.2.tgz",
 			"integrity": "sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng=="
 		},
+		"wmf": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/wmf/-/wmf-1.0.2.tgz",
+			"integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw=="
+		},
+		"word": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/word/-/word-0.3.0.tgz",
+			"integrity": "sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA=="
+		},
 		"wrappy": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
 			"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
 			"dev": true
 		},
+		"xlsx": {
+			"version": "0.18.5",
+			"resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.18.5.tgz",
+			"integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==",
+			"requires": {
+				"adler-32": "~1.3.0",
+				"cfb": "~1.2.1",
+				"codepage": "~1.15.0",
+				"crc-32": "~1.2.1",
+				"ssf": "~0.11.2",
+				"wmf": "~1.0.1",
+				"word": "~0.3.0"
+			}
+		},
 		"xml-name-validator": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
diff --git a/package.json b/package.json
index 6e2fd7e1751710f4c9bfada9425093d39e94cabd..c12c8b9933f5b33d1684b62193115ce8ff40ac6d 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
 		"element-plus": "^2.6.1",
 		"js-cookie": "^3.0.5",
 		"js-table2excel": "^1.1.2",
+		"jsencrypt": "^3.3.2",
 		"jsplumb": "^2.15.6",
 		"mitt": "^3.0.1",
 		"nprogress": "^0.2.0",
@@ -37,7 +38,8 @@
 		"vue-demi": "^0.14.7",
 		"vue-grid-layout": "^3.0.0-beta1",
 		"vue-i18n": "^9.10.2",
-		"vue-router": "^4.3.0"
+		"vue-router": "^4.3.0",
+		"xlsx": "^0.18.5"
 	},
 	"devDependencies": {
 		"@types/node": "^20.11.28",
diff --git a/src/App.vue b/src/App.vue
index 80074176a98905c7b802863aac05e7d63c2eb4b4..d89e09f0c16bfb69c358b508fc1fbec7ccbc6127 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,7 +4,7 @@
 		<LockScreen v-if="themeConfig.isLockScreen" />
 		<Setings ref="setingsRef" v-show="setLockScreen" />
 		<CloseFull v-if="!themeConfig.isLockScreen" />
-		<Upgrade v-if="getVersion" />
+<!--		<Upgrade v-if="getVersion" />-->
 		<Sponsors />
 	</el-config-provider>
 </template>
diff --git a/src/api/apps/index.ts b/src/api/apps/index.ts
new file mode 100644
index 0000000000000000000000000000000000000000..93c080f368f15f7bcd8e1dce0acf23401014d9d1
--- /dev/null
+++ b/src/api/apps/index.ts
@@ -0,0 +1,70 @@
+import request from '/@/utils/request';
+
+/**
+ * （不建议写成 request.post(xxx)，因为这样 post 时，无法 params 与 data 同时传参）
+ *
+ * 登录api接口集合
+ * @method signIn 用户登录
+ * @method signOut 用户退出登录
+ */
+export function useAppsApi() {
+	return {
+		listByAppPage: (data: object) => {
+			return request({
+				url: '/api/admin/app/listByAppPage',
+				method: 'post',
+				data,
+			});
+		},
+		add: (data: object) => {
+			return request({
+				url: '/api/admin/app/add',
+				method: 'post',
+				data,
+			});
+		},
+		edit: (data: object) => {
+			return request({
+				url: '/api/admin/app/edit',
+				method: 'post',
+				data,
+			});
+		},
+		removeById: (data: object) => {
+			return request({
+				url: '/api/admin/app/removeById',
+				method: 'post',
+				data,
+			});
+		},
+		/**
+		 * 申请应用上下线
+		 * @param data
+		 */
+		applyApp: (data: object) => {
+			return request({
+				url: '/api/admin/app/applyApp',
+				method: 'post',
+				data,
+			});
+		},
+		/**
+		 * 应用上下线
+		 * @param data
+		 */
+		applyAppOnLineOffline: (data: object) => {
+			return request({
+				url: '/api/admin/app/applyAppOnLineOffline',
+				method: 'post',
+				data,
+			});
+		},
+		topping: (data: object) => {
+			return request({
+				url: '/api/admin/app/topping',
+				method: 'post',
+				data,
+			});
+		}
+	};
+}
diff --git a/src/api/cms/article/index.ts b/src/api/cms/article/index.ts
new file mode 100644
index 0000000000000000000000000000000000000000..a68c357b5fc057fececac515a2317976a0d92842
--- /dev/null
+++ b/src/api/cms/article/index.ts
@@ -0,0 +1,56 @@
+import request from '/@/utils/request';
+
+/**
+ * （不建议写成 request.post(xxx)，因为这样 post 时，无法 params 与 data 同时传参）
+ *
+ * 登录api接口集合
+ * @method signIn 用户登录
+ * @method signOut 用户退出登录
+ */
+export function useArticleApi() {
+	const prefix = '/api/admin/cms/article';
+	return {
+		listByPage: (data: object) => {
+			return request({
+				url: `${prefix}/listByPage`,
+				method: 'post',
+				data,
+			});
+		},
+		add: (data: object) => {
+			return request({
+				url: `${prefix}/add`,
+				method: 'post',
+				data,
+			});
+		},
+		edit: (data: object) => {
+			return request({
+				url: `${prefix}/edit`,
+				method: 'post',
+				data,
+			});
+		},
+		removeById: (data: object) => {
+			return request({
+				url: `${prefix}/remove`,
+				method: 'post',
+				data,
+			});
+		},
+		topping: (data: object) => {
+			return request({
+				url: `${prefix}/topping`,
+				method: 'post',
+				data,
+			});
+		},
+		shelf: (data: object) => {
+			return request({
+				url: `${prefix}/shelf`,
+				method: 'post',
+				data,
+			});
+		}
+	};
+}
diff --git a/src/api/cms/banner/index.ts b/src/api/cms/banner/index.ts
new file mode 100644
index 0000000000000000000000000000000000000000..9340d6288db8c79cc9f739669b74da232dc9273b
--- /dev/null
+++ b/src/api/cms/banner/index.ts
@@ -0,0 +1,56 @@
+import request from '/@/utils/request';
+
+/**
+ * （不建议写成 request.post(xxx)，因为这样 post 时，无法 params 与 data 同时传参）
+ *
+ * 登录api接口集合
+ * @method signIn 用户登录
+ * @method signOut 用户退出登录
+ */
+export function useBannerApi() {
+	const prefix = '/api/admin/cms/banner';
+	return {
+		listByPage: (data: object) => {
+			return request({
+				url: `${prefix}/listByPage`,
+				method: 'post',
+				data,
+			});
+		},
+		add: (data: object) => {
+			return request({
+				url: `${prefix}/add`,
+				method: 'post',
+				data,
+			});
+		},
+		edit: (data: object) => {
+			return request({
+				url: `${prefix}/edit`,
+				method: 'post',
+				data,
+			});
+		},
+		removeById: (data: object) => {
+			return request({
+				url: `${prefix}/remove`,
+				method: 'post',
+				data,
+			});
+		},
+		topping: (data: object) => {
+			return request({
+				url: `${prefix}/topping`,
+				method: 'post',
+				data,
+			});
+		},
+		shelf: (data: object) => {
+			return request({
+				url: `${prefix}/shelf`,
+				method: 'post',
+				data,
+			});
+		}
+	};
+}
diff --git a/src/api/cms/channel/index.ts b/src/api/cms/channel/index.ts
new file mode 100644
index 0000000000000000000000000000000000000000..1866b85cb02a8479e9af5a2309f1602d9cfa3c84
--- /dev/null
+++ b/src/api/cms/channel/index.ts
@@ -0,0 +1,42 @@
+import request from '/@/utils/request';
+
+/**
+ * （不建议写成 request.post(xxx)，因为这样 post 时，无法 params 与 data 同时传参）
+ *
+ * 登录api接口集合
+ * @method signIn 用户登录
+ * @method signOut 用户退出登录
+ */
+export function useChannelApi() {
+	const prefix = '/api/admin/cms/channel';
+	return {
+		channelTree: (data: object) => {
+			return request({
+				url: `${prefix}/tree`,
+				method: 'post',
+				data,
+			});
+		},
+		add: (data: object) => {
+			return request({
+				url: `${prefix}/add`,
+				method: 'post',
+				data,
+			});
+		},
+		edit: (data: object) => {
+			return request({
+				url: `${prefix}/edit`,
+				method: 'post',
+				data,
+			});
+		},
+		removeById: (data: object) => {
+			return request({
+				url: `${prefix}/remove`,
+				method: 'post',
+				data,
+			});
+		}
+	};
+}
diff --git a/src/api/login/index.ts b/src/api/login/index.ts
index 71ed9461c586e20d35dec54c981727da78923901..56f2b2e06f52bb4fa276cad57efdd4bfed611a48 100644
--- a/src/api/login/index.ts
+++ b/src/api/login/index.ts
@@ -11,14 +11,34 @@ export function useLoginApi() {
 	return {
 		signIn: (data: object) => {
 			return request({
-				url: '/user/signIn',
+				url: '/api/admin/user/login',
 				method: 'post',
 				data,
 			});
 		},
 		signOut: (data: object) => {
 			return request({
-				url: '/user/signOut',
+				url: '/api/admin/user/logout',
+				method: 'post',
+				data,
+			});
+		},
+		getPk: () => {
+			return request({
+				url: '/api/admin/user/getPk',
+				method: 'post',
+			});
+		},
+		getUserInfo: (data: object) => {
+			return request({
+				url: '/api/website/sso/getUserInfo',
+				method: 'post',
+				data,
+			});
+		},
+		getLoginUserInfo: (data: object) => {
+			return request({
+				url: '/api/website/sso/getLoginUserInfo',
 				method: 'post',
 				data,
 			});
diff --git a/src/api/orgTenant/index.ts b/src/api/orgTenant/index.ts
new file mode 100644
index 0000000000000000000000000000000000000000..5d811d6cac60ccacfb9dafbe1ee89c832bc14919
--- /dev/null
+++ b/src/api/orgTenant/index.ts
@@ -0,0 +1,41 @@
+import request from '/@/utils/request';
+
+/**
+ * （不建议写成 request.post(xxx)，因为这样 post 时，无法 params 与 data 同时传参）
+ *
+ * 登录api接口集合
+ * @method signIn 用户登录
+ * @method signOut 用户退出登录
+ */
+export function useOrgTenantApi() {
+	return {
+		listByPage: (data: object) => {
+			return request({
+				url: '/api/admin/orgTenant/listByPage',
+				method: 'post',
+				data,
+			});
+		},
+		add: (data: object) => {
+			return request({
+				url: '/api/admin/orgTenant/add',
+				method: 'post',
+				data,
+			});
+		},
+		edit: (data: object) => {
+			return request({
+				url: '/api/admin/orgTenant/edit',
+				method: 'post',
+				data,
+			});
+		},
+		removeById: (data: object) => {
+			return request({
+				url: '/api/admin/orgTenant/removeById',
+				method: 'post',
+				data,
+			});
+		}
+	};
+}
diff --git a/src/api/system/index.ts b/src/api/system/index.ts
new file mode 100644
index 0000000000000000000000000000000000000000..775951979526ba0b2271b707562add23c94365ea
--- /dev/null
+++ b/src/api/system/index.ts
@@ -0,0 +1,60 @@
+import request from '/@/utils/request';
+
+/**
+ * 系统管理模块
+ */
+export function systemApi() {
+	return {
+		orgTree: () => {
+			return request({
+				url: '/api/admin/org/orgTree',
+				method: 'post',
+			});
+		},
+		orgSchoolTree: () => {
+			return request({
+				url: '/api/admin/org/orgSchoolTree',
+				method: 'post',
+			});
+		},
+		orgAreaTree: () => {
+			return request({
+				url: '/api/admin/org/orgAreaTree',
+				method: 'post',
+			});
+		},
+		orgLeaderTree: () => {
+			return request({
+				url: '/api/admin/org/orgLeaderTree',
+				method: 'post',
+			});
+		},
+		orgBOETree: () => {
+			return request({
+				url: '/api/admin/org/orgBOETree',
+				method: 'post',
+			});
+		},
+		orgSchoolOnlyTree: () => {
+			return request({
+				url: '/api/admin/org/orgSchoolOnlyTree',
+				method: 'post',
+			});
+		},
+		saveOrUpdate: (data: object) => {
+			return request({
+				url: '/api/admin/org/saveOrUpdate',
+				method: 'post',
+				data,
+			});
+		},
+		removeById: (data: object) => {
+			return request({
+				url: `/api/admin/org/removeById`,
+				method: 'post',
+				data,
+			});
+		},
+
+	};
+}
diff --git a/src/api/user/index.ts b/src/api/user/index.ts
new file mode 100644
index 0000000000000000000000000000000000000000..575476d134bc910befe382b8079531fc126b62e4
--- /dev/null
+++ b/src/api/user/index.ts
@@ -0,0 +1,214 @@
+import request from '/@/utils/request';
+
+/**
+ * 系统管理模块
+ */
+export function userApi() {
+	return {
+		studentListByPage: (data: object) => {
+			return request({
+				url: '/api/admin/user/studentListByPage',
+				method: 'post',
+				data,
+			});
+		},
+		teacherListByPage: (data: object) => {
+			return request({
+				url: '/api/admin/user/teacherListByPage',
+				method: 'post',
+				data,
+			});
+		},
+		managerListByPage: (data: object) => {
+			return request({
+				url: '/api/admin/user/managerListByPage',
+				method: 'post',
+				data,
+			});
+		},
+		BOEUserListByPage: (data: object) => {
+			return request({
+				url: '/api/admin/user/BOEUserListByPage',
+				method: 'post',
+				data,
+			});
+		},
+		noRoleUserListByPage: (data: object) => {
+			return request({
+				url: '/api/admin/user/noRoleUserListByPage',
+				method: 'post',
+				data,
+			});
+		},
+		parentUserListByPage: (data: object) => {
+			return request({
+				url: '/api/admin/user/parentUserListByPage',
+				method: 'post',
+				data,
+			});
+		},
+		findRoleListByUserId: (data: object) => {
+			return request({
+				url: '/api/admin/role/findRoleListByUserId',
+				method: 'post',
+				data,
+			});
+		},
+		saveOrUpdateStudent: (data: object) => {
+			return request({
+				url: '/api/admin/user/saveOrUpdateStudent',
+				method: 'post',
+				data,
+			});
+		},
+		saveOrUpdateManager: (data: object) => {
+			return request({
+				url: '/api/admin/user/saveOrUpdateManager',
+				method: 'post',
+				data,
+			});
+		},
+		saveOrUpdateBOEUser: (data: object) => {
+			return request({
+				url: '/api/admin/user/saveOrUpdateBOEUser',
+				method: 'post',
+				data,
+			});
+		},
+		saveOrUpdateTeacher: (data: object) => {
+			return request({
+				url: '/api/admin/user/saveOrUpdateTeacher',
+				method: 'post',
+				data,
+			});
+		},
+		saveOrUpdateTeach: (data: object) => {
+			return request({
+				url: '/api/admin/user/saveOrUpdateTeach',
+				method: 'post',
+				data,
+			});
+		},
+		saveUserRoleRelationship: (data: object) => {
+			return request({
+				url: '/api/admin/role/saveUserRoleRelationship',
+				method: 'post',
+				data,
+			});
+		},
+		studentRemoveById: (data: object) => {
+			return request({
+				url: '/api/admin/user/studentRemoveById',
+				method: 'post',
+				data,
+			});
+		},
+		teacherRemoveById: (data: object) => {
+			return request({
+				url: '/api/admin/user/teacherRemoveById',
+				method: 'post',
+				data,
+			});
+		},
+		managerRemoveById: (data: object) => {
+			return request({
+				url: '/api/admin/user/managerRemoveById',
+				method: 'post',
+				data,
+			});
+		},
+		BOERemoveById: (data: object) => {
+			return request({
+				url: '/api/admin/user/BOERemoveById',
+				method: 'post',
+				data,
+			});
+		},
+		teachRemoveById: (data: object) => {
+			return request({
+				url: '/api/admin/user/teachRemoveById',
+				method: 'post',
+				data,
+			});
+		},
+		UserRoleRelationshipRemoveById: (data: object) => {
+			return request({
+				url: '/api/admin/role/UserRoleRelationshipRemoveById',
+				method: 'post',
+				data,
+			});
+		},
+		saveOrUpdateParent: (data: object) => {
+			return request({
+				url: '/api/admin/user/saveOrUpdateParent',
+				method: 'post',
+				data,
+			});
+		},
+		parentRemoveById: (data: object) => {
+			return request({
+				url: '/api/admin/user/parentRemoveById',
+				method: 'post',
+				data,
+			});
+		},
+		studentImport: (data: object) => {
+			return request({
+				url: '/api/admin/user/studentImport',
+				method: 'post',
+				data,
+			});
+		},
+		teacherImport: (data: object) => {
+			return request({
+				url: '/api/admin/user/teacherImport',
+				method: 'post',
+				data,
+			});
+		},
+		studentImportMQMessage: (data: object) => {
+			return request({
+				url: '/api/admin/user/studentImportMQMessage',
+				method: 'post',
+				data,
+			});
+		},
+		teacherImportMQMessage: (data: object) => {
+			return request({
+				url: '/api/admin/user/teacherImportMQMessage',
+				method: 'post',
+				data,
+			});
+		},
+		savePermission: (data: object) => {
+			return request({
+				url: '/api/admin/user/savePermission',
+				method: 'post',
+				data,
+			});
+		},
+		getManagerUserPhone: (data: object) => {
+			return request({
+				url: '/api/admin/user/getManagerUserPhone',
+				method: 'post',
+				data,
+			});
+		},
+		getLoginSms: (data: object) => {
+			return request({
+				url: '/api/admin/user/getLoginSms',
+				method: 'post',
+				data,
+			});
+		},
+		checkLoginSms: (data: object) => {
+			return request({
+				url: '/api/admin/user/checkLoginSms',
+				method: 'post',
+				data,
+			});
+		},
+
+
+	};
+}
diff --git a/src/assets/logo.png b/src/assets/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..ddd805bab48573074f2879ddabbf6c8dffa69723
Binary files /dev/null and b/src/assets/logo.png differ
diff --git a/src/components/editor/index.vue b/src/components/editor/index.vue
index c5fed8afee6e189a24fb3edaaf5dccde52ebe6b3..a0b8b2369e2b42093e0518c7c00b414d24943899 100644
--- a/src/components/editor/index.vue
+++ b/src/components/editor/index.vue
@@ -46,6 +46,10 @@ const props = defineProps({
 	getHtml: String,
 	// 双向绑定，用于获取 editor.getText()
 	getText: String,
+  server: String,
+  videoServer: String,
+  fieldName: String,
+  maxFileSize: Number
 });
 
 // 定义子组件向父组件传值/事件
@@ -56,10 +60,30 @@ const editorRef = shallowRef();
 const state = reactive({
 	editorConfig: {
 		placeholder: props.placeholder,
+    MENU_CONF: {
+      uploadImage: {
+        server: props.server,
+        fieldName: props.fieldName??'file',
+        maxFileSize: props.maxFileSize??1024*1024*20,
+        allowedFileTypes: ['image/png', "image/jpeg"],
+      },
+      uploadVideo: {
+        server: props.videoServer,
+        fieldName: props.fieldName??'file',
+        maxFileSize: props.maxFileSize??1024*1024*20,
+        allowedFileTypes: ['video/mp4'],
+      }
+    },
 	},
 	editorVal: props.getHtml,
 });
 
+// state.editorConfig.MENU_CONF['uploadImage'] = {
+//   server: props.server,
+//   fieldName: props.fieldName??'file',
+//   maxFileSize: props.maxFileSize??1024*1024*20,
+// }
+
 // 编辑器回调函数
 const handleCreated = (editor: IDomEditor) => {
 	editorRef.value = editor;
diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index 83d1129d1b1c9e94a3b635a7cd694c4febe27375..69f18d77a0c1cca7af02813df35148fc9cec547c 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -6,7 +6,13 @@ export default {
 		systemMenu: 'systemMenu',
 		systemRole: 'systemRole',
 		systemUser: 'systemUser',
-		systemDept: 'systemDept',
+		systemStudentUser: 'systemStudentUser',
+		BOEUser:'BOEUser',
+		systemManagerUser: 'systemManagerUser',
+		systemTeacherUser: 'systemTeacherUser',
+		noRoleUser:'noRoleUser',
+		parentUser: 'parentUser',
+		systemOrg: 'systemOrg',
 		systemDic: 'systemDic',
 		limits: 'limits',
 		limitsFrontEnd: 'FrontEnd',
diff --git a/src/i18n/lang/zh-cn.ts b/src/i18n/lang/zh-cn.ts
index e0713b94c5419d6af8d5f6a4c556d70105ecd0aa..d6251163f014c230d954e1cd2b37b5d8465b7b20 100644
--- a/src/i18n/lang/zh-cn.ts
+++ b/src/i18n/lang/zh-cn.ts
@@ -2,12 +2,25 @@
 export default {
 	router: {
 		home: '首页',
-		system: '系统设置',
+		system: '系统功能',
 		systemMenu: '菜单管理',
 		systemRole: '角色管理',
 		systemUser: '用户管理',
-		systemDept: '部门管理',
+		systemStudentUser: '学生管理',
+		BOEUser:'教育局管理',
+		systemManagerUser: '管理员管理',
+		systemTeacherUser: '教师管理',
+		noRoleUser: '无角色用户管理',
+		parentUser: '家长管理',
+		systemOrg: '机构管理',
 		systemDic: '字典管理',
+		systemOrgTenant: '租户管理',
+		thirdApp: '三方应用',
+		thirdApps: '应用管理',
+		cms: '内容管理',
+		cmsBanner: '幻灯片管理',
+		cmsChannel: '栏目管理',
+		cmsArticle: '文章管理',
 		limits: '权限管理',
 		limitsFrontEnd: '前端控制',
 		limitsFrontEndPage: '页面权限',
diff --git a/src/i18n/lang/zh-tw.ts b/src/i18n/lang/zh-tw.ts
index 35e406fe76783f17bee56c662aec6b3f5efbb338..b53f718e941b5a13e874c8fc7446863ecf4445de 100644
--- a/src/i18n/lang/zh-tw.ts
+++ b/src/i18n/lang/zh-tw.ts
@@ -6,7 +6,13 @@ export default {
 		systemMenu: '選單管理',
 		systemRole: '角色管理',
 		systemUser: '用戶管理',
-		systemDept: '部門管理',
+		systemStudentUser: '学生管理',
+		systemManagerUser: '管理员管理',
+		BOEUser:'教育局管理',
+		systemTeacherUser: '教师管理',
+		noRoleUser: '无角色用户管理',
+		parentUser: '家长管理',
+		systemOrg: '部門管理',
 		systemDic: '字典管理',
 		limits: '許可權管理',
 		limitsFrontEnd: '前端控制',
diff --git a/src/i18n/pages/login/en.ts b/src/i18n/pages/login/en.ts
index 2654a188c4c3880393fd4fd8f50d6fb0bf6ecf4a..a51c5d8fb721202f55c2e0fcb4023e4d2d7341af 100644
--- a/src/i18n/pages/login/en.ts
+++ b/src/i18n/pages/login/en.ts
@@ -9,8 +9,8 @@ export default {
 		two4: 'Links',
 	},
 	account: {
-		accountPlaceholder1: 'The user name admin or not is common',
-		accountPlaceholder2: 'Password: 123456',
+		accountPlaceholder1: 'Please enter the account',
+		accountPlaceholder2: 'Please enter the Password',
 		accountPlaceholder3: 'Please enter the verification code',
 		accountBtnText: 'Sign in',
 	},
diff --git a/src/i18n/pages/login/zh-cn.ts b/src/i18n/pages/login/zh-cn.ts
index 3367b539f2d1cc68641673c007bc04f84048288f..96714becc5fd41135756781d55ec212bebf39570 100644
--- a/src/i18n/pages/login/zh-cn.ts
+++ b/src/i18n/pages/login/zh-cn.ts
@@ -9,8 +9,8 @@ export default {
 		two4: '友情链接',
 	},
 	account: {
-		accountPlaceholder1: '用户名 admin 或不输均为 common',
-		accountPlaceholder2: '密码：123456',
+		accountPlaceholder1: '请输入用户名',
+		accountPlaceholder2: '请输入密码',
 		accountPlaceholder3: '请输入验证码',
 		accountBtnText: '登 录',
 	},
diff --git a/src/i18n/pages/login/zh-tw.ts b/src/i18n/pages/login/zh-tw.ts
index 138e8c826ab2835238f038627349338bbbde73f5..39210f1bb07800ab1cfb67090f0a7fa1595d2778 100644
--- a/src/i18n/pages/login/zh-tw.ts
+++ b/src/i18n/pages/login/zh-tw.ts
@@ -9,8 +9,8 @@ export default {
 		two4: '友情連結',
 	},
 	account: {
-		accountPlaceholder1: '用戶名admin或不輸均為common',
-		accountPlaceholder2: '密碼：123456',
+		accountPlaceholder1: '请输入用户名',
+		accountPlaceholder2: '请输入密码',
 		accountPlaceholder3: '請輸入驗證碼',
 		accountBtnText: '登入',
 	},
diff --git a/src/layout/navBars/topBar/user.vue b/src/layout/navBars/topBar/user.vue
index 7dfcbf3176a25008585e5e4c85ea4d1ed601b2b3..fd2ee86b2a08feb5ad545119083898a79aa1261c 100644
--- a/src/layout/navBars/topBar/user.vue
+++ b/src/layout/navBars/topBar/user.vue
@@ -28,21 +28,21 @@
 				</el-dropdown-menu>
 			</template>
 		</el-dropdown>
-		<div class="layout-navbars-breadcrumb-user-icon" @click="onSearchClick">
-			<el-icon :title="$t('message.user.title2')">
-				<ele-Search />
-			</el-icon>
-		</div>
+<!--		<div class="layout-navbars-breadcrumb-user-icon" @click="onSearchClick">-->
+<!--			<el-icon :title="$t('message.user.title2')">-->
+<!--				<ele-Search />-->
+<!--			</el-icon>-->
+<!--		</div>-->
 		<div class="layout-navbars-breadcrumb-user-icon" @click="onLayoutSetingClick">
 			<i class="icon-skin iconfont" :title="$t('message.user.title3')"></i>
 		</div>
-		<div class="layout-navbars-breadcrumb-user-icon" ref="userNewsBadgeRef" v-click-outside="onUserNewsClick">
-			<el-badge :is-dot="true">
-				<el-icon :title="$t('message.user.title4')">
-					<ele-Bell />
-				</el-icon>
-			</el-badge>
-		</div>
+<!--		<div class="layout-navbars-breadcrumb-user-icon" ref="userNewsBadgeRef" v-click-outside="onUserNewsClick">-->
+<!--			<el-badge :is-dot="true">-->
+<!--				<el-icon :title="$t('message.user.title4')">-->
+<!--					<ele-Bell />-->
+<!--				</el-icon>-->
+<!--			</el-badge>-->
+<!--		</div>-->
 		<el-popover
 			ref="userNewsRef"
 			:virtual-ref="userNewsBadgeRef"
@@ -73,10 +73,10 @@
 			<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="/401">{{ $t('message.user.dropdown4') }}</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="/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>
diff --git a/src/layout/sponsors/index.vue b/src/layout/sponsors/index.vue
index 1950232143b13105cca9815ee338afa67aff9db2..307c7ac4d8e7f59bca8c9ff880f3cd0f5275dfbb 100644
--- a/src/layout/sponsors/index.vue
+++ b/src/layout/sponsors/index.vue
@@ -1,15 +1,15 @@
 <template>
-	<div class="sponsors-container" title="点击前往体验" v-show="state.sponsors.isShow" @click="onSponsorsClick">
-		<el-carousel height="240px" indicator-position="none" :arrow="setCarouselShow" @change="onCarouselChange">
-			<el-carousel-item v-for="(v, k) in state.sponsors.list" :key="k">
-				<img :src="v.url" class="sponsors-img" />
-				<div class="sponsors-text" v-html="v.text"></div>
-			</el-carousel-item>
-		</el-carousel>
-		<div class="sponsors-close">
-			<SvgIcon name="ele-Close" :size="12" title="关闭赞助商" @click.stop="onCloseSponsors" />
-		</div>
-	</div>
+<!--	<div class="sponsors-container" title="点击前往体验" v-show="state.sponsors.isShow" @click="onSponsorsClick">-->
+<!--		<el-carousel height="240px" indicator-position="none" :arrow="setCarouselShow" @change="onCarouselChange">-->
+<!--			<el-carousel-item v-for="(v, k) in state.sponsors.list" :key="k">-->
+<!--				<img :src="v.url" class="sponsors-img" />-->
+<!--				<div class="sponsors-text" v-html="v.text"></div>-->
+<!--			</el-carousel-item>-->
+<!--		</el-carousel>-->
+<!--		<div class="sponsors-close">-->
+<!--			<SvgIcon name="ele-Close" :size="12" title="关闭赞助商" @click.stop="onCloseSponsors" />-->
+<!--		</div>-->
+<!--	</div>-->
 </template>
 
 <script setup lang="ts" name="layoutSponsors">
diff --git a/src/router/index.ts b/src/router/index.ts
index a92deabc00c07ca2bab73e115dda0cd56c83b354..790068b2856600051986ac4bee53bf0dde40a521 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -104,7 +104,7 @@ router.beforeEach(async (to, from, next) => {
 			Session.clear();
 			NProgress.done();
 		} else if (token && to.path === '/login') {
-			next('/home');
+			next('/system/managerUser');
 			NProgress.done();
 		} else {
 			const storesRoutesList = useRoutesList(pinia);
diff --git a/src/router/route.ts b/src/router/route.ts
index 21a9f3f4da1e5513a69fc42ca575f0238e86f57d..308fe72a7e9d69bafca3bf066919600740010051 100644
--- a/src/router/route.ts
+++ b/src/router/route.ts
@@ -42,31 +42,31 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 		path: '/',
 		name: '/',
 		component: () => import('/@/layout/index.vue'),
-		redirect: '/home',
+		redirect: '/system/managerUser',
 		meta: {
 			isKeepAlive: true,
 		},
 		children: [
-			{
-				path: '/home',
-				name: 'home',
-				component: () => import('/@/views/home/index.vue'),
-				meta: {
-					title: 'message.router.home',
-					isLink: '',
-					isHide: false,
-					isKeepAlive: true,
-					isAffix: true,
-					isIframe: false,
-					roles: ['admin', 'common'],
-					icon: 'iconfont icon-shouye',
-				},
-			},
+			// {
+			// 	path: '/home',
+			// 	name: 'home',
+			// 	component: () => import('/@/views/home/index.vue'),
+			// 	meta: {
+			// 		title: 'message.router.home',
+			// 		isLink: '',
+			// 		isHide: false,
+			// 		isKeepAlive: true,
+			// 		isAffix: true,
+			// 		isIframe: false,
+			// 		roles: ['admin', 'common'],
+			// 		icon: 'iconfont icon-shouye',
+			// 	},
+			// },
 			{
 				path: '/system',
 				name: 'system',
 				component: () => import('/@/layout/routerView/parent.vue'),
-				redirect: '/system/menu',
+				redirect: '/system/managerUser',
 				meta: {
 					title: 'message.router.system',
 					isLink: '',
@@ -78,42 +78,72 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 					icon: 'iconfont icon-xitongshezhi',
 				},
 				children: [
+					// {
+					// 	path: '/system/menu',
+					// 	name: 'systemMenu',
+					// 	component: () => import('/@/views/system/menu/index.vue'),
+					// 	meta: {
+					// 		title: 'message.router.systemMenu',
+					// 		isLink: '',
+					// 		isHide: false,
+					// 		isKeepAlive: true,
+					// 		isAffix: false,
+					// 		isIframe: false,
+					// 		roles: ['admin'],
+					// 		icon: 'iconfont icon-caidan',
+					// 	},
+					// },
+					// {
+					// 	path: '/system/role',
+					// 	name: 'systemRole',
+					// 	component: () => import('/@/views/system/role/index.vue'),
+					// 	meta: {
+					// 		title: 'message.router.systemRole',
+					// 		isLink: '',
+					// 		isHide: false,
+					// 		isKeepAlive: true,
+					// 		isAffix: false,
+					// 		isIframe: false,
+					// 		roles: ['admin'],
+					// 		icon: 'ele-ColdDrink',
+					// 	},
+					// },
 					{
-						path: '/system/menu',
-						name: 'systemMenu',
-						component: () => import('/@/views/system/menu/index.vue'),
+						path: '/system/managerUser',
+						name: 'systemManagerUser',
+						component: () => import('/@/views/system/managerUser/index.vue'),
 						meta: {
-							title: 'message.router.systemMenu',
+							title: 'message.router.systemManagerUser',
 							isLink: '',
 							isHide: false,
 							isKeepAlive: true,
 							isAffix: false,
 							isIframe: false,
 							roles: ['admin'],
-							icon: 'iconfont icon-caidan',
+							icon: 'ele-ColdDrink',
 						},
 					},
 					{
-						path: '/system/role',
-						name: 'systemRole',
-						component: () => import('/@/views/system/role/index.vue'),
+						path: '/system/BOEUser',
+						name: 'BOEUser',
+						component: () => import('/@/views/system/BOEUser/index.vue'),
 						meta: {
-							title: 'message.router.systemRole',
+							title: 'message.router.BOEUser',
 							isLink: '',
 							isHide: false,
 							isKeepAlive: true,
 							isAffix: false,
 							isIframe: false,
 							roles: ['admin'],
-							icon: 'ele-ColdDrink',
+							icon: 'ele-School',
 						},
 					},
 					{
-						path: '/system/user',
-						name: 'systemUser',
-						component: () => import('/@/views/system/user/index.vue'),
+						path: '/system/studentUser',
+						name: 'systemStudentUser',
+						component: () => import('/src/views/system/studentUser/index.vue'),
 						meta: {
-							title: 'message.router.systemUser',
+							title: 'message.router.systemStudentUser',
 							isLink: '',
 							isHide: false,
 							isKeepAlive: true,
@@ -124,1061 +154,1220 @@ export const dynamicRoutes: Array<RouteRecordRaw> = [
 						},
 					},
 					{
-						path: '/system/dept',
-						name: 'systemDept',
-						component: () => import('/@/views/system/dept/index.vue'),
+						path: '/system/teacherUser',
+						name: 'systemTeacherUser',
+						component: () => import('/src/views/system/teacherUser/index.vue'),
 						meta: {
-							title: 'message.router.systemDept',
+							title: 'message.router.systemTeacherUser',
 							isLink: '',
 							isHide: false,
 							isKeepAlive: true,
 							isAffix: false,
 							isIframe: false,
 							roles: ['admin'],
-							icon: 'ele-OfficeBuilding',
-						},
-					},
+                            icon: 'iconfont icon-gerenzhongxin',
+                        },
+                    },
 					{
-						path: '/system/dic',
-						name: 'systemDic',
-						component: () => import('/@/views/system/dic/index.vue'),
+						path: '/system/noRoleUser',
+						name: 'noRoleUser',
+						component: () => import('/@/views/system/noRole/index.vue'),
 						meta: {
-							title: 'message.router.systemDic',
+							title: 'message.router.noRoleUser',
 							isLink: '',
 							isHide: false,
 							isKeepAlive: true,
 							isAffix: false,
 							isIframe: false,
 							roles: ['admin'],
-							icon: 'ele-SetUp',
-						},
-					},
-				],
-			},
-			{
-				path: '/limits',
-				name: 'limits',
-				component: () => import('/@/layout/routerView/parent.vue'),
-				redirect: '/limits/frontEnd',
-				meta: {
-					title: 'message.router.limits',
-					isLink: '',
-					isHide: false,
-					isKeepAlive: true,
-					isAffix: false,
-					isIframe: false,
-					roles: ['admin', 'common'],
-					icon: 'iconfont icon-quanxian',
-				},
-				children: [
-					{
-						path: '/limits/frontEnd',
-						name: 'limitsFrontEnd',
-						component: () => import('/@/layout/routerView/parent.vue'),
-						redirect: '/limits/frontEnd/page',
-						meta: {
-							title: 'message.router.limitsFrontEnd',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: '',
+							icon: 'ele-Guide',
 						},
-						children: [
-							{
-								path: '/limits/frontEnd/page',
-								name: 'limitsFrontEndPage',
-								component: () => import('/@/views/limits/frontEnd/page/index.vue'),
-								meta: {
-									title: 'message.router.limitsFrontEndPage',
-									isLink: '',
-									isHide: false,
-									isKeepAlive: true,
-									isAffix: false,
-									isIframe: false,
-									roles: ['admin', 'common'],
-									icon: '',
-								},
-							},
-							{
-								path: '/limits/frontEnd/btn',
-								name: 'limitsFrontEndBtn',
-								component: () => import('/@/views/limits/frontEnd/btn/index.vue'),
-								meta: {
-									title: 'message.router.limitsFrontEndBtn',
-									isLink: '',
-									isHide: false,
-									isKeepAlive: true,
-									isAffix: false,
-									isIframe: false,
-									roles: ['admin', 'common'],
-									icon: '',
-								},
-							},
-						],
 					},
 					{
-						path: '/limits/backEnd',
-						name: 'limitsBackEnd',
-						component: () => import('/@/layout/routerView/parent.vue'),
+						path: '/system/parentUser',
+						name: 'parentUser',
+						component: () => import('/@/views/system/parentUser/index.vue'),
 						meta: {
-							title: 'message.router.limitsBackEnd',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: '',
-						},
-						children: [
-							{
-								path: '/limits/backEnd/page',
-								name: 'limitsBackEndEndPage',
-								component: () => import('/@/views/limits/backEnd/page/index.vue'),
-								meta: {
-									title: 'message.router.limitsBackEndEndPage',
-									isLink: '',
-									isHide: false,
-									isKeepAlive: true,
-									isAffix: false,
-									isIframe: false,
-									roles: ['admin', 'common'],
-									icon: '',
-								},
-							},
-						],
-					},
-				],
-			},
-			{
-				path: '/menu',
-				name: 'menu',
-				component: () => import('/@/layout/routerView/parent.vue'),
-				redirect: '/menu/menu1',
-				meta: {
-					title: 'message.router.menu',
-					isLink: '',
-					isHide: false,
-					isKeepAlive: true,
-					isAffix: false,
-					isIframe: false,
-					roles: ['admin', 'common'],
-					icon: 'iconfont icon-caidan',
-				},
-				children: [
-					{
-						path: '/menu/menu1',
-						name: 'menu1',
-						component: () => import('/@/layout/routerView/parent.vue'),
-						redirect: '/menu/menu1/menu11',
-						meta: {
-							title: 'message.router.menu1',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'iconfont icon-caidan',
-						},
-						children: [
-							{
-								path: '/menu/menu1/menu11',
-								name: 'menu11',
-								component: () => import('/@/views/menu/menu1/menu11/index.vue'),
-								meta: {
-									title: 'message.router.menu11',
-									isLink: '',
-									isHide: false,
-									isKeepAlive: true,
-									isAffix: false,
-									isIframe: false,
-									roles: ['admin', 'common'],
-									icon: 'iconfont icon-caidan',
-								},
-							},
-							{
-								path: '/menu/menu1/menu12',
-								name: 'menu12',
-								component: () => import('/@/layout/routerView/parent.vue'),
-								redirect: '/menu/menu1/menu12/menu121',
-								meta: {
-									title: 'message.router.menu12',
-									isLink: '',
-									isHide: false,
-									isKeepAlive: true,
-									isAffix: false,
-									isIframe: false,
-									roles: ['admin', 'common'],
-									icon: 'iconfont icon-caidan',
-								},
-								children: [
-									{
-										path: '/menu/menu1/menu12/menu121',
-										name: 'menu121',
-										component: () => import('/@/views/menu/menu1/menu12/menu121/index.vue'),
-										meta: {
-											title: 'message.router.menu121',
-											isLink: '',
-											isHide: false,
-											isKeepAlive: true,
-											isAffix: false,
-											isIframe: false,
-											roles: ['admin', 'common'],
-											icon: 'iconfont icon-caidan',
-										},
-									},
-									{
-										path: '/menu/menu1/menu12/menu122',
-										name: 'menu122',
-										component: () => import('/@/views/menu/menu1/menu12/menu122/index.vue'),
-										meta: {
-											title: 'message.router.menu122',
-											isLink: '',
-											isHide: false,
-											isKeepAlive: true,
-											isAffix: false,
-											isIframe: false,
-											roles: ['admin', 'common'],
-											icon: 'iconfont icon-caidan',
-										},
-									},
-								],
-							},
-							{
-								path: '/menu/menu1/menu13',
-								name: 'menu13',
-								component: () => import('/@/views/menu/menu1/menu13/index.vue'),
-								meta: {
-									title: 'message.router.menu13',
-									isLink: '',
-									isHide: false,
-									isKeepAlive: true,
-									isAffix: false,
-									isIframe: false,
-									roles: ['admin', 'common'],
-									icon: 'iconfont icon-caidan',
-								},
-							},
-						],
-					},
-					{
-						path: '/menu/menu2',
-						name: 'menu2',
-						component: () => import('/@/views/menu/menu2/index.vue'),
-						meta: {
-							title: 'message.router.menu2',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'iconfont icon-caidan',
-						},
-					},
-				],
-			},
-			{
-				path: '/fun',
-				name: 'funIndex',
-				component: () => import('/@/layout/routerView/parent.vue'),
-				redirect: '/fun/tagsView',
-				meta: {
-					title: 'message.router.funIndex',
-					isLink: '',
-					isHide: false,
-					isKeepAlive: true,
-					isAffix: false,
-					isIframe: false,
-					roles: ['admin', 'common'],
-					icon: 'iconfont icon-crew_feature',
-				},
-				children: [
-					{
-						path: '/fun/tagsView',
-						name: 'funTagsView',
-						component: () => import('/@/views/fun/tagsView/index.vue'),
-						meta: {
-							title: 'message.router.funTagsView',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'ele-Pointer',
-						},
-					},
-					{
-						path: '/fun/countup',
-						name: 'funCountup',
-						component: () => import('/@/views/fun/countup/index.vue'),
-						meta: {
-							title: 'message.router.funCountup',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'ele-Odometer',
-						},
-					},
-					{
-						path: '/fun/wangEditor',
-						name: 'funWangEditor',
-						component: () => import('/@/views/fun/wangEditor/index.vue'),
-						meta: {
-							title: 'message.router.funWangEditor',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'iconfont icon-fuwenbenkuang',
-						},
-					},
-					{
-						path: '/fun/cropper',
-						name: 'funCropper',
-						component: () => import('/@/views/fun/cropper/index.vue'),
-						meta: {
-							title: 'message.router.funCropper',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'iconfont icon-caijian',
-						},
-					},
-					{
-						path: '/fun/qrcode',
-						name: 'funQrcode',
-						component: () => import('/@/views/fun/qrcode/index.vue'),
-						meta: {
-							title: 'message.router.funQrcode',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'iconfont icon-ico',
-						},
-					},
-					{
-						path: '/fun/echartsMap',
-						name: 'funEchartsMap',
-						component: () => import('/@/views/fun/echartsMap/index.vue'),
-						meta: {
-							title: 'message.router.funEchartsMap',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'iconfont icon-ditu',
-						},
-					},
-					{
-						path: '/fun/printJs',
-						name: 'funPrintJs',
-						component: () => import('/@/views/fun/printJs/index.vue'),
-						meta: {
-							title: 'message.router.funPrintJs',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'ele-Printer',
-						},
-					},
-					{
-						path: '/fun/clipboard',
-						name: 'funClipboard',
-						component: () => import('/@/views/fun/clipboard/index.vue'),
-						meta: {
-							title: 'message.router.funClipboard',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'ele-DocumentCopy',
-						},
-					},
-					{
-						path: '/fun/gridLayout',
-						name: 'funGridLayout',
-						component: () => import('/@/views/fun/gridLayout/index.vue'),
-						meta: {
-							title: 'message.router.funGridLayout',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'iconfont icon-tuodong',
-						},
-					},
-					{
-						path: '/fun/splitpanes',
-						name: 'funSplitpanes',
-						component: () => import('/@/views/fun/splitpanes/index.vue'),
-						meta: {
-							title: 'message.router.funSplitpanes',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'iconfont icon--chaifenlie',
-						},
-					},
-				],
-			},
-			{
-				path: '/pages',
-				name: 'pagesIndex',
-				component: () => import('/@/layout/routerView/parent.vue'),
-				redirect: '/pages/filtering',
-				meta: {
-					title: 'message.router.pagesIndex',
-					isLink: '',
-					isHide: false,
-					isKeepAlive: true,
-					isAffix: false,
-					isIframe: false,
-					roles: ['admin', 'common'],
-					icon: 'iconfont icon-fuzhiyemian',
-				},
-				children: [
-					{
-						path: '/pages/filtering',
-						name: 'pagesFiltering',
-						component: () => import('/@/views/pages/filtering/index.vue'),
-						meta: {
-							title: 'message.router.pagesFiltering',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'ele-Sell',
-						},
-						/**
-						 * 注意此处详情写法：
-						 * 1、嵌套进父级里时，面包屑显示为：首页/页面/过滤筛选组件/过滤筛选组件详情
-						 * 2、不嵌套进父级时，面包屑显示为：首页/页面/过滤筛选组件/过滤筛选组件详情
-						 * 3、想要父级不高亮，面包屑显示为：首页/页面/过滤筛选组件详情，设置路径为：/pages/filteringDetails
-						 */
-						children: [
-							{
-								path: '/pages/filtering/details',
-								name: 'pagesFilteringDetails',
-								component: () => import('/@/views/pages/filtering/details.vue'),
-								meta: {
-									title: 'message.router.pagesFilteringDetails',
-									isLink: '',
-									isHide: true,
-									isKeepAlive: false,
-									isAffix: false,
-									isIframe: false,
-									roles: ['admin', 'common'],
-									icon: 'ele-Sunny',
-								},
-							},
-						],
-					},
-					{
-						path: '/pages/filtering/details1',
-						name: 'pagesFilteringDetails1',
-						component: () => import('/@/views/pages/filtering/details1.vue'),
-						meta: {
-							title: 'message.router.pagesFilteringDetails1',
-							isLink: '',
-							isHide: true,
-							isKeepAlive: false,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'ele-Sunny',
-						},
-					},
-					{
-						path: '/pages/iocnfont',
-						name: 'pagesIocnfont',
-						component: () => import('/@/views/pages/iocnfont/index.vue'),
-						meta: {
-							title: 'message.router.pagesIocnfont',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'ele-Present',
-						},
-					},
-					{
-						path: '/pages/element',
-						name: 'pagesElement',
-						component: () => import('/@/views/pages/element/index.vue'),
-						meta: {
-							title: 'message.router.pagesElement',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'ele-Eleme',
-						},
-					},
-					{
-						path: '/pages/awesome',
-						name: 'pagesAwesome',
-						component: () => import('/@/views/pages/awesome/index.vue'),
-						meta: {
-							title: 'message.router.pagesAwesome',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'ele-SetUp',
-						},
-					},
-					{
-						path: '/pages/formAdapt',
-						name: 'pagesFormAdapt',
-						component: () => import('/@/views/pages/formAdapt/index.vue'),
-						meta: {
-							title: 'message.router.pagesFormAdapt',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'iconfont icon-biaodan',
-						},
-					},
-					{
-						path: '/pages/tableRules',
-						name: 'pagesTableRules',
-						component: () => import('/@/views/pages/tableRules/index.vue'),
-						meta: {
-							title: 'message.router.pagesTableRules',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'iconfont icon-jiliandongxuanzeqi',
-						},
-					},
-					{
-						path: '/pages/formI18n',
-						name: 'pagesFormI18n',
-						component: () => import('/@/views/pages/formI18n/index.vue'),
-						meta: {
-							title: 'message.router.pagesFormI18n',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'iconfont icon-diqiu',
-						},
-					},
-					{
-						path: '/pages/formRules',
-						name: 'pagesFormRules',
-						component: () => import('/@/views/pages/formRules/index.vue'),
-						meta: {
-							title: 'message.router.pagesFormRules',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'iconfont icon-shuxing',
-						},
-					},
-					{
-						path: '/pages/listAdapt',
-						name: 'pagesListAdapt',
-						component: () => import('/@/views/pages/listAdapt/index.vue'),
-						meta: {
-							title: 'message.router.pagesListAdapt',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'iconfont icon-chazhaobiaodanliebiao',
-						},
-					},
-					{
-						path: '/pages/waterfall',
-						name: 'pagesWaterfall',
-						component: () => import('/@/views/pages/waterfall/index.vue'),
-						meta: {
-							title: 'message.router.pagesWaterfall',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'iconfont icon-zidingyibuju',
-						},
-					},
-					{
-						path: '/pages/steps',
-						name: 'pagesSteps',
-						component: () => import('/@/views/pages/steps/index.vue'),
-						meta: {
-							title: 'message.router.pagesSteps',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'iconfont icon-step',
-						},
-					},
-					{
-						path: '/pages/preview',
-						name: 'pagesPreview',
-						component: () => import('/@/views/pages/preview/index.vue'),
-						meta: {
-							title: 'message.router.pagesPreview',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'iconfont icon-15tupianyulan',
-						},
-					},
-					{
-						path: '/pages/waves',
-						name: 'pagesWaves',
-						component: () => import('/@/views/pages/waves/index.vue'),
-						meta: {
-							title: 'message.router.pagesWaves',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'iconfont icon-bolangneng',
-						},
-					},
-					{
-						path: '/pages/tree',
-						name: 'pagesTree',
-						component: () => import('/@/views/pages/tree/index.vue'),
-						meta: {
-							title: 'message.router.pagesTree',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'iconfont icon-shuxingtu',
-						},
-					},
-					{
-						path: '/pages/drag',
-						name: 'pagesDrag',
-						component: () => import('/@/views/pages/drag/index.vue'),
-						meta: {
-							title: 'message.router.pagesDrag',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'ele-Pointer',
-						},
-					},
-					{
-						path: '/pages/lazyImg',
-						name: 'pagesLazyImg',
-						component: () => import('/@/views/pages/lazyImg/index.vue'),
-						meta: {
-							title: 'message.router.pagesLazyImg',
+							title: 'message.router.parentUser',
 							isLink: '',
 							isHide: false,
 							isKeepAlive: true,
 							isAffix: false,
 							isIframe: false,
 							roles: ['admin'],
-							icon: 'ele-PictureFilled',
+							icon: 'ele-CollectionTag',
 						},
 					},
+                    // {
+                    //     path: '/system/orgTenant',
+                    //     name: 'systemOrgTenant',
+                    //     component: () => import('/@/views/system/orgTenant/index.vue'),
+                    //     meta: {
+                    //         title: 'message.router.systemOrgTenant',
+                    //         isLink: '',
+                    //         isHide: false,
+                    //         isKeepAlive: true,
+                    //         isAffix: false,
+                    //         isIframe: false,
+                    //         roles: ['admin'],
+                    //         icon: 'ele-OfficeBuilding',
+                    //     },
+                    // },
 					{
-						path: '/pages/dynamicForm',
-						name: 'pagesDynamicForm',
-						component: () => import('/@/views/pages/dynamicForm/index.vue'),
+						path: '/system/org',
+						name: 'systemOrg',
+						component: () => import('/@/views/system/org/index.vue'),
 						meta: {
-							title: 'message.router.pagesDynamicForm',
+							title: 'message.router.systemOrg',
 							isLink: '',
 							isHide: false,
 							isKeepAlive: true,
 							isAffix: false,
 							isIframe: false,
 							roles: ['admin'],
-							icon: 'iconfont icon-wenducanshu-05',
-						},
-					},
-					{
-						path: '/pages/workflow',
-						name: 'pagesWorkflow',
-						component: () => import('/@/views/pages/workflow/index.vue'),
-						meta: {
-							title: 'message.router.pagesWorkflow',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin'],
-							icon: 'ele-Connection',
-						},
-					},
-				],
-			},
-			{
-				path: '/make',
-				name: 'makeIndex',
-				component: () => import('/@/layout/routerView/parent.vue'),
-				redirect: '/make/selector',
-				meta: {
-					title: 'message.router.makeIndex',
-					isLink: '',
-					isHide: false,
-					isKeepAlive: true,
-					isAffix: false,
-					isIframe: false,
-					roles: ['admin'],
-					icon: 'iconfont icon-siweidaotu',
-				},
-				children: [
-					{
-						path: '/make/selector',
-						name: 'makeSelector',
-						component: () => import('/@/views/make/selector/index.vue'),
-						meta: {
-							title: 'message.router.makeSelector',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'iconfont icon-xuanzeqi',
-						},
-					},
-					{
-						path: '/make/noticeBar',
-						name: 'makeNoticeBar',
-						component: () => import('/@/views/make/noticeBar/index.vue'),
-						meta: {
-							title: 'message.router.makeNoticeBar',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'ele-Bell',
-						},
-					},
-					{
-						path: '/make/svgDemo',
-						name: 'makeSvgDemo',
-						component: () => import('/@/views/make/svgDemo/index.vue'),
-						meta: {
-							title: 'message.router.makeSvgDemo',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'fa fa-thumbs-o-up',
-						},
-					},
-					{
-						path: '/make/tableDemo',
-						name: 'makeTableDemo',
-						component: () => import('/@/views/make/tableDemo/index.vue'),
-						meta: {
-							title: 'message.router.makeTableDemo',
-							isLink: '',
-							isHide: false,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin', 'common'],
-							icon: 'iconfont icon-shuju',
+							icon: 'ele-OfficeBuilding',
 						},
 					},
-				],
-			},
+                ],
+            },
+            {
+                path: '/thirdApp',
+                name: 'thirdApp',
+                component: () => import('/@/layout/routerView/parent.vue'),
+                redirect: '/thirdApp/apps',
+                meta: {
+                    title: 'message.router.thirdApp',
+                    isLink: '',
+                    isHide: false,
+                    isKeepAlive: true,
+                    isAffix: false,
+                    isIframe: false,
+                    roles: ['admin'],
+                    icon: 'iconfont icon-xitongshezhi',
+                },
+                children: [
+                    {
+                        path: '/thirdApp/apps',
+                        name: 'thirdApps',
+                        component: () => import('/@/views/app/index.vue'),
+                        meta: {
+                            title: 'message.router.thirdApps',
+                            isLink: '',
+                            isHide: false,
+                            isKeepAlive: true,
+                            isAffix: false,
+                            isIframe: false,
+                            roles: ['admin'],
+                            icon: 'iconfont icon-caidan',
+                        },
+                    }
+                ],
+            },
 			{
-				path: '/params',
-				name: 'paramsIndex',
+				path: '/cms',
+				name: 'cms',
 				component: () => import('/@/layout/routerView/parent.vue'),
-				redirect: '/params/common',
+				redirect: '/cms/banner',
 				meta: {
-					title: 'message.router.paramsIndex',
+					title: 'message.router.cms',
 					isLink: '',
 					isHide: false,
 					isKeepAlive: true,
 					isAffix: false,
 					isIframe: false,
 					roles: ['admin'],
-					icon: 'iconfont icon-zhongduancanshu',
+					icon: 'iconfont icon-xitongshezhi',
 				},
 				children: [
 					{
-						path: '/params/common',
-						name: 'paramsCommon',
-						component: () => import('/@/views/params/common/index.vue'),
+						path: '/cms/banner',
+						name: 'banner',
+						component: () => import('/@/views/cms/banner/index.vue'),
 						meta: {
-							title: 'message.router.paramsCommon',
+							title: 'message.router.cmsBanner',
 							isLink: '',
 							isHide: false,
 							isKeepAlive: true,
 							isAffix: false,
 							isIframe: false,
 							roles: ['admin'],
-							icon: 'iconfont icon-putong',
-						},
-					},
-					{
-						path: '/params/common/details',
-						name: 'paramsCommonDetails',
-						component: () => import('/@/views/params/common/details.vue'),
-						meta: {
-							title: 'message.router.paramsCommonDetails',
-							isLink: '',
-							isHide: true,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin'],
-							icon: 'ele-Comment',
+							icon: 'iconfont icon-caidan',
 						},
 					},
 					{
-						path: '/params/dynamic',
-						name: 'paramsDynamic',
-						component: () => import('/@/views/params/dynamic/index.vue'),
+						path: '/cms/channel',
+						name: 'channel',
+						component: () => import('/@/views/cms/channel/index.vue'),
 						meta: {
-							title: 'message.router.paramsDynamic',
+							title: 'message.router.cmsChannel',
 							isLink: '',
 							isHide: false,
 							isKeepAlive: true,
 							isAffix: false,
 							isIframe: false,
 							roles: ['admin'],
-							icon: 'iconfont icon-dongtai',
+							icon: 'iconfont icon-caidan',
 						},
 					},
-					/**
-					 * tagsViewName 为要设置不同的 "tagsView 名称" 字段
-					 * 如若需设置不同 "tagsView 名称"，tagsViewName 字段必须要有
-					 */
 					{
-						path: '/params/dynamic/details/:t/:id/:tagsViewName',
-						name: 'paramsDynamicDetails',
-						component: () => import('/@/views/params/dynamic/details.vue'),
+						path: '/cms/article',
+						name: 'article',
+						component: () => import('/@/views/cms/article/index.vue'),
 						meta: {
-							title: 'message.router.paramsDynamicDetails',
+							title: 'message.router.cmsArticle',
 							isLink: '',
-							isHide: true,
-							isKeepAlive: true,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin'],
-							icon: 'ele-Lightning',
-						},
-					},
-				],
-			},
-			{
-				path: '/visualizing',
-				name: 'visualizingIndex',
-				component: () => import('/@/layout/routerView/parent.vue'),
-				redirect: '/visualizing/visualizingLinkDemo1',
-				meta: {
-					title: 'message.router.visualizingIndex',
-					isLink: '',
-					isHide: false,
-					isKeepAlive: true,
-					isAffix: false,
-					isIframe: false,
-					roles: ['admin'],
-					icon: 'ele-ChatLineRound',
-				},
-				/**
-				 * 打开内置全屏
-				 * component 都为 `() => import('/@/layout/routerView/link.vue')`
-				 * isLink 链接为内置的路由地址，地址为 staticRoutes 中定义
-				 */
-				children: [
-					{
-						path: '/visualizing/visualizingLinkDemo1',
-						name: 'visualizingLinkDemo1',
-						component: () => import('/@/layout/routerView/link.vue'),
-						meta: {
-							title: 'message.router.visualizingLinkDemo1',
-							isLink: '/visualizingDemo1',
-							isHide: false,
-							isKeepAlive: false,
-							isAffix: false,
-							isIframe: false,
-							roles: ['admin'],
-							icon: 'iconfont icon-caozuo-wailian',
-						},
-					},
-					{
-						path: '/visualizing/visualizingLinkDemo2',
-						name: 'visualizingLinkDemo2',
-						component: () => import('/@/layout/routerView/link.vue'),
-						meta: {
-							title: 'message.router.visualizingLinkDemo2',
-							isLink: '/visualizingDemo2',
 							isHide: false,
-							isKeepAlive: false,
+							isKeepAlive: true,
 							isAffix: false,
 							isIframe: false,
 							roles: ['admin'],
-							icon: 'iconfont icon-caozuo-wailian',
-						},
-					},
+							icon: 'iconfont icon-caidan',
+						}
+					}
 				],
 			},
-			{
-				path: '/chart',
-				name: 'chartIndex',
-				component: () => import('/@/views/chart/index.vue'),
-				meta: {
-					title: 'message.router.chartIndex',
-					isLink: '',
-					isHide: false,
-					isKeepAlive: true,
-					isAffix: false,
-					isIframe: false,
-					roles: ['admin', 'common'],
-					icon: 'iconfont icon-ico_shuju',
-				},
-			},
-			{
-				path: '/personal',
-				name: 'personal',
-				component: () => import('/@/views/personal/index.vue'),
-				meta: {
-					title: 'message.router.personal',
-					isLink: '',
-					isHide: false,
-					isKeepAlive: true,
-					isAffix: false,
-					isIframe: false,
-					roles: ['admin', 'common'],
-					icon: 'iconfont icon-gerenzhongxin',
-				},
-			},
-			{
-				path: '/tools',
-				name: 'tools',
-				component: () => import('/@/views/tools/index.vue'),
-				meta: {
-					title: 'message.router.tools',
-					isLink: '',
-					isHide: false,
-					isKeepAlive: true,
-					isAffix: false,
-					isIframe: false,
-					roles: ['admin', 'common'],
-					icon: 'iconfont icon-gongju',
-				},
-			},
-			{
-				path: '/link',
-				name: 'layoutLinkView',
-				component: () => import('/@/layout/routerView/link.vue'),
-				meta: {
-					title: 'message.router.layoutLinkView',
-					isLink: 'https://element-plus.gitee.io/#/zh-CN/component/installation',
-					isHide: false,
-					isKeepAlive: false,
-					isAffix: false,
-					isIframe: false,
-					roles: ['admin'],
-					icon: 'iconfont icon-caozuo-wailian',
-				},
-			},
-			{
-				path: '/iframesOne',
-				name: 'layoutIframeViewOne',
-				component: () => import('/@/layout/routerView/iframes.vue'),
-				meta: {
-					title: 'message.router.layoutIframeViewOne',
-					isLink: 'https://nodejs.org/zh-cn/',
-					isHide: false,
-					isKeepAlive: true,
-					isAffix: true,
-					isIframe: true,
-					roles: ['admin'],
-					icon: 'iconfont icon-neiqianshujuchucun',
-				},
-			},
-			{
-				path: '/iframesTwo',
-				name: 'layoutIframeViewTwo',
-				component: () => import('/@/layout/routerView/iframes.vue'),
-				meta: {
-					title: 'message.router.layoutIframeViewTwo',
-					isLink: 'https://undraw.co/illustrations',
-					isHide: false,
-					isKeepAlive: true,
-					isAffix: true,
-					isIframe: true,
-					roles: ['admin'],
-					icon: 'iconfont icon-neiqianshujuchucun',
-				},
-			},
+			// 		{
+			// 			path: '/system/dic',
+			// 			name: 'systemDic',
+			// 			component: () => import('/@/views/system/dic/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.systemDic',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin'],
+			// 				icon: 'ele-SetUp',
+			// 			},
+			// 		},
+			// 	],
+			// },
+
+			// {
+			// 	path: '/limits',
+			// 	name: 'limits',
+			// 	component: () => import('/@/layout/routerView/parent.vue'),
+			// 	redirect: '/limits/frontEnd',
+			// 	meta: {
+			// 		title: 'message.router.limits',
+			// 		isLink: '',
+			// 		isHide: false,
+			// 		isKeepAlive: true,
+			// 		isAffix: false,
+			// 		isIframe: false,
+			// 		roles: ['admin', 'common'],
+			// 		icon: 'iconfont icon-quanxian',
+			// 	},
+			// 	children: [
+			// 		{
+			// 			path: '/limits/frontEnd',
+			// 			name: 'limitsFrontEnd',
+			// 			component: () => import('/@/layout/routerView/parent.vue'),
+			// 			redirect: '/limits/frontEnd/page',
+			// 			meta: {
+			// 				title: 'message.router.limitsFrontEnd',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: '',
+			// 			},
+			// 			children: [
+			// 				{
+			// 					path: '/limits/frontEnd/page',
+			// 					name: 'limitsFrontEndPage',
+			// 					component: () => import('/@/views/limits/frontEnd/page/index.vue'),
+			// 					meta: {
+			// 						title: 'message.router.limitsFrontEndPage',
+			// 						isLink: '',
+			// 						isHide: false,
+			// 						isKeepAlive: true,
+			// 						isAffix: false,
+			// 						isIframe: false,
+			// 						roles: ['admin', 'common'],
+			// 						icon: '',
+			// 					},
+			// 				},
+			// 				{
+			// 					path: '/limits/frontEnd/btn',
+			// 					name: 'limitsFrontEndBtn',
+			// 					component: () => import('/@/views/limits/frontEnd/btn/index.vue'),
+			// 					meta: {
+			// 						title: 'message.router.limitsFrontEndBtn',
+			// 						isLink: '',
+			// 						isHide: false,
+			// 						isKeepAlive: true,
+			// 						isAffix: false,
+			// 						isIframe: false,
+			// 						roles: ['admin', 'common'],
+			// 						icon: '',
+			// 					},
+			// 				},
+			// 			],
+			// 		},
+			// 		{
+			// 			path: '/limits/backEnd',
+			// 			name: 'limitsBackEnd',
+			// 			component: () => import('/@/layout/routerView/parent.vue'),
+			// 			meta: {
+			// 				title: 'message.router.limitsBackEnd',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: '',
+			// 			},
+			// 			children: [
+			// 				{
+			// 					path: '/limits/backEnd/page',
+			// 					name: 'limitsBackEndEndPage',
+			// 					component: () => import('/@/views/limits/backEnd/page/index.vue'),
+			// 					meta: {
+			// 						title: 'message.router.limitsBackEndEndPage',
+			// 						isLink: '',
+			// 						isHide: false,
+			// 						isKeepAlive: true,
+			// 						isAffix: false,
+			// 						isIframe: false,
+			// 						roles: ['admin', 'common'],
+			// 						icon: '',
+			// 					},
+			// 				},
+			// 			],
+			// 		},
+			// 	],
+			// },
+			// {
+			// 	path: '/menu',
+			// 	name: 'menu',
+			// 	component: () => import('/@/layout/routerView/parent.vue'),
+			// 	redirect: '/menu/menu1',
+			// 	meta: {
+			// 		title: 'message.router.menu',
+			// 		isLink: '',
+			// 		isHide: false,
+			// 		isKeepAlive: true,
+			// 		isAffix: false,
+			// 		isIframe: false,
+			// 		roles: ['admin', 'common'],
+			// 		icon: 'iconfont icon-caidan',
+			// 	},
+			// 	children: [
+			// 		{
+			// 			path: '/menu/menu1',
+			// 			name: 'menu1',
+			// 			component: () => import('/@/layout/routerView/parent.vue'),
+			// 			redirect: '/menu/menu1/menu11',
+			// 			meta: {
+			// 				title: 'message.router.menu1',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'iconfont icon-caidan',
+			// 			},
+			// 			children: [
+			// 				{
+			// 					path: '/menu/menu1/menu11',
+			// 					name: 'menu11',
+			// 					component: () => import('/@/views/menu/menu1/menu11/index.vue'),
+			// 					meta: {
+			// 						title: 'message.router.menu11',
+			// 						isLink: '',
+			// 						isHide: false,
+			// 						isKeepAlive: true,
+			// 						isAffix: false,
+			// 						isIframe: false,
+			// 						roles: ['admin', 'common'],
+			// 						icon: 'iconfont icon-caidan',
+			// 					},
+			// 				},
+			// 				{
+			// 					path: '/menu/menu1/menu12',
+			// 					name: 'menu12',
+			// 					component: () => import('/@/layout/routerView/parent.vue'),
+			// 					redirect: '/menu/menu1/menu12/menu121',
+			// 					meta: {
+			// 						title: 'message.router.menu12',
+			// 						isLink: '',
+			// 						isHide: false,
+			// 						isKeepAlive: true,
+			// 						isAffix: false,
+			// 						isIframe: false,
+			// 						roles: ['admin', 'common'],
+			// 						icon: 'iconfont icon-caidan',
+			// 					},
+			// 					children: [
+			// 						{
+			// 							path: '/menu/menu1/menu12/menu121',
+			// 							name: 'menu121',
+			// 							component: () => import('/@/views/menu/menu1/menu12/menu121/index.vue'),
+			// 							meta: {
+			// 								title: 'message.router.menu121',
+			// 								isLink: '',
+			// 								isHide: false,
+			// 								isKeepAlive: true,
+			// 								isAffix: false,
+			// 								isIframe: false,
+			// 								roles: ['admin', 'common'],
+			// 								icon: 'iconfont icon-caidan',
+			// 							},
+			// 						},
+			// 						{
+			// 							path: '/menu/menu1/menu12/menu122',
+			// 							name: 'menu122',
+			// 							component: () => import('/@/views/menu/menu1/menu12/menu122/index.vue'),
+			// 							meta: {
+			// 								title: 'message.router.menu122',
+			// 								isLink: '',
+			// 								isHide: false,
+			// 								isKeepAlive: true,
+			// 								isAffix: false,
+			// 								isIframe: false,
+			// 								roles: ['admin', 'common'],
+			// 								icon: 'iconfont icon-caidan',
+			// 							},
+			// 						},
+			// 					],
+			// 				},
+			// 				{
+			// 					path: '/menu/menu1/menu13',
+			// 					name: 'menu13',
+			// 					component: () => import('/@/views/menu/menu1/menu13/index.vue'),
+			// 					meta: {
+			// 						title: 'message.router.menu13',
+			// 						isLink: '',
+			// 						isHide: false,
+			// 						isKeepAlive: true,
+			// 						isAffix: false,
+			// 						isIframe: false,
+			// 						roles: ['admin', 'common'],
+			// 						icon: 'iconfont icon-caidan',
+			// 					},
+			// 				},
+			// 			],
+			// 		},
+			// 		{
+			// 			path: '/menu/menu2',
+			// 			name: 'menu2',
+			// 			component: () => import('/@/views/menu/menu2/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.menu2',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'iconfont icon-caidan',
+			// 			},
+			// 		},
+			// 	],
+			// },
+			// {
+			// 	path: '/fun',
+			// 	name: 'funIndex',
+			// 	component: () => import('/@/layout/routerView/parent.vue'),
+			// 	redirect: '/fun/tagsView',
+			// 	meta: {
+			// 		title: 'message.router.funIndex',
+			// 		isLink: '',
+			// 		isHide: false,
+			// 		isKeepAlive: true,
+			// 		isAffix: false,
+			// 		isIframe: false,
+			// 		roles: ['admin', 'common'],
+			// 		icon: 'iconfont icon-crew_feature',
+			// 	},
+			// 	children: [
+			// 		{
+			// 			path: '/fun/tagsView',
+			// 			name: 'funTagsView',
+			// 			component: () => import('/@/views/fun/tagsView/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.funTagsView',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'ele-Pointer',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/fun/countup',
+			// 			name: 'funCountup',
+			// 			component: () => import('/@/views/fun/countup/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.funCountup',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'ele-Odometer',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/fun/wangEditor',
+			// 			name: 'funWangEditor',
+			// 			component: () => import('/@/views/fun/wangEditor/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.funWangEditor',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'iconfont icon-fuwenbenkuang',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/fun/cropper',
+			// 			name: 'funCropper',
+			// 			component: () => import('/@/views/fun/cropper/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.funCropper',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'iconfont icon-caijian',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/fun/qrcode',
+			// 			name: 'funQrcode',
+			// 			component: () => import('/@/views/fun/qrcode/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.funQrcode',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'iconfont icon-ico',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/fun/echartsMap',
+			// 			name: 'funEchartsMap',
+			// 			component: () => import('/@/views/fun/echartsMap/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.funEchartsMap',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'iconfont icon-ditu',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/fun/printJs',
+			// 			name: 'funPrintJs',
+			// 			component: () => import('/@/views/fun/printJs/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.funPrintJs',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'ele-Printer',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/fun/clipboard',
+			// 			name: 'funClipboard',
+			// 			component: () => import('/@/views/fun/clipboard/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.funClipboard',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'ele-DocumentCopy',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/fun/gridLayout',
+			// 			name: 'funGridLayout',
+			// 			component: () => import('/@/views/fun/gridLayout/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.funGridLayout',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'iconfont icon-tuodong',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/fun/splitpanes',
+			// 			name: 'funSplitpanes',
+			// 			component: () => import('/@/views/fun/splitpanes/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.funSplitpanes',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'iconfont icon--chaifenlie',
+			// 			},
+			// 		},
+			// 	],
+			// },
+			// {
+			// 	path: '/pages',
+			// 	name: 'pagesIndex',
+			// 	component: () => import('/@/layout/routerView/parent.vue'),
+			// 	redirect: '/pages/filtering',
+			// 	meta: {
+			// 		title: 'message.router.pagesIndex',
+			// 		isLink: '',
+			// 		isHide: false,
+			// 		isKeepAlive: true,
+			// 		isAffix: false,
+			// 		isIframe: false,
+			// 		roles: ['admin', 'common'],
+			// 		icon: 'iconfont icon-fuzhiyemian',
+			// 	},
+			// 	children: [
+			// 		{
+			// 			path: '/pages/filtering',
+			// 			name: 'pagesFiltering',
+			// 			component: () => import('/@/views/pages/filtering/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.pagesFiltering',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'ele-Sell',
+			// 			},
+			// 			/**
+			// 			 * 注意此处详情写法：
+			// 			 * 1、嵌套进父级里时，面包屑显示为：首页/页面/过滤筛选组件/过滤筛选组件详情
+			// 			 * 2、不嵌套进父级时，面包屑显示为：首页/页面/过滤筛选组件/过滤筛选组件详情
+			// 			 * 3、想要父级不高亮，面包屑显示为：首页/页面/过滤筛选组件详情，设置路径为：/pages/filteringDetails
+			// 			 */
+			// 			children: [
+			// 				{
+			// 					path: '/pages/filtering/details',
+			// 					name: 'pagesFilteringDetails',
+			// 					component: () => import('/@/views/pages/filtering/details.vue'),
+			// 					meta: {
+			// 						title: 'message.router.pagesFilteringDetails',
+			// 						isLink: '',
+			// 						isHide: true,
+			// 						isKeepAlive: false,
+			// 						isAffix: false,
+			// 						isIframe: false,
+			// 						roles: ['admin', 'common'],
+			// 						icon: 'ele-Sunny',
+			// 					},
+			// 				},
+			// 			],
+			// 		},
+			// 		{
+			// 			path: '/pages/filtering/details1',
+			// 			name: 'pagesFilteringDetails1',
+			// 			component: () => import('/@/views/pages/filtering/details1.vue'),
+			// 			meta: {
+			// 				title: 'message.router.pagesFilteringDetails1',
+			// 				isLink: '',
+			// 				isHide: true,
+			// 				isKeepAlive: false,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'ele-Sunny',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/pages/iocnfont',
+			// 			name: 'pagesIocnfont',
+			// 			component: () => import('/@/views/pages/iocnfont/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.pagesIocnfont',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'ele-Present',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/pages/element',
+			// 			name: 'pagesElement',
+			// 			component: () => import('/@/views/pages/element/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.pagesElement',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'ele-Eleme',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/pages/awesome',
+			// 			name: 'pagesAwesome',
+			// 			component: () => import('/@/views/pages/awesome/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.pagesAwesome',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'ele-SetUp',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/pages/formAdapt',
+			// 			name: 'pagesFormAdapt',
+			// 			component: () => import('/@/views/pages/formAdapt/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.pagesFormAdapt',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'iconfont icon-biaodan',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/pages/tableRules',
+			// 			name: 'pagesTableRules',
+			// 			component: () => import('/@/views/pages/tableRules/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.pagesTableRules',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'iconfont icon-jiliandongxuanzeqi',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/pages/formI18n',
+			// 			name: 'pagesFormI18n',
+			// 			component: () => import('/@/views/pages/formI18n/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.pagesFormI18n',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'iconfont icon-diqiu',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/pages/formRules',
+			// 			name: 'pagesFormRules',
+			// 			component: () => import('/@/views/pages/formRules/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.pagesFormRules',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'iconfont icon-shuxing',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/pages/listAdapt',
+			// 			name: 'pagesListAdapt',
+			// 			component: () => import('/@/views/pages/listAdapt/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.pagesListAdapt',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'iconfont icon-chazhaobiaodanliebiao',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/pages/waterfall',
+			// 			name: 'pagesWaterfall',
+			// 			component: () => import('/@/views/pages/waterfall/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.pagesWaterfall',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'iconfont icon-zidingyibuju',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/pages/steps',
+			// 			name: 'pagesSteps',
+			// 			component: () => import('/@/views/pages/steps/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.pagesSteps',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'iconfont icon-step',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/pages/preview',
+			// 			name: 'pagesPreview',
+			// 			component: () => import('/@/views/pages/preview/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.pagesPreview',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'iconfont icon-15tupianyulan',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/pages/waves',
+			// 			name: 'pagesWaves',
+			// 			component: () => import('/@/views/pages/waves/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.pagesWaves',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'iconfont icon-bolangneng',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/pages/tree',
+			// 			name: 'pagesTree',
+			// 			component: () => import('/@/views/pages/tree/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.pagesTree',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'iconfont icon-shuxingtu',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/pages/drag',
+			// 			name: 'pagesDrag',
+			// 			component: () => import('/@/views/pages/drag/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.pagesDrag',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'ele-Pointer',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/pages/lazyImg',
+			// 			name: 'pagesLazyImg',
+			// 			component: () => import('/@/views/pages/lazyImg/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.pagesLazyImg',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin'],
+			// 				icon: 'ele-PictureFilled',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/pages/dynamicForm',
+			// 			name: 'pagesDynamicForm',
+			// 			component: () => import('/@/views/pages/dynamicForm/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.pagesDynamicForm',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin'],
+			// 				icon: 'iconfont icon-wenducanshu-05',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/pages/workflow',
+			// 			name: 'pagesWorkflow',
+			// 			component: () => import('/@/views/pages/workflow/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.pagesWorkflow',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin'],
+			// 				icon: 'ele-Connection',
+			// 			},
+			// 		},
+			// 	],
+			// },
+			// {
+			// 	path: '/make',
+			// 	name: 'makeIndex',
+			// 	component: () => import('/@/layout/routerView/parent.vue'),
+			// 	redirect: '/make/selector',
+			// 	meta: {
+			// 		title: 'message.router.makeIndex',
+			// 		isLink: '',
+			// 		isHide: false,
+			// 		isKeepAlive: true,
+			// 		isAffix: false,
+			// 		isIframe: false,
+			// 		roles: ['admin'],
+			// 		icon: 'iconfont icon-siweidaotu',
+			// 	},
+			// 	children: [
+			// 		{
+			// 			path: '/make/selector',
+			// 			name: 'makeSelector',
+			// 			component: () => import('/@/views/make/selector/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.makeSelector',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'iconfont icon-xuanzeqi',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/make/noticeBar',
+			// 			name: 'makeNoticeBar',
+			// 			component: () => import('/@/views/make/noticeBar/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.makeNoticeBar',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'ele-Bell',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/make/svgDemo',
+			// 			name: 'makeSvgDemo',
+			// 			component: () => import('/@/views/make/svgDemo/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.makeSvgDemo',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'fa fa-thumbs-o-up',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/make/tableDemo',
+			// 			name: 'makeTableDemo',
+			// 			component: () => import('/@/views/make/tableDemo/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.makeTableDemo',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin', 'common'],
+			// 				icon: 'iconfont icon-shuju',
+			// 			},
+			// 		},
+			// 	],
+			// },
+			// {
+			// 	path: '/params',
+			// 	name: 'paramsIndex',
+			// 	component: () => import('/@/layout/routerView/parent.vue'),
+			// 	redirect: '/params/common',
+			// 	meta: {
+			// 		title: 'message.router.paramsIndex',
+			// 		isLink: '',
+			// 		isHide: false,
+			// 		isKeepAlive: true,
+			// 		isAffix: false,
+			// 		isIframe: false,
+			// 		roles: ['admin'],
+			// 		icon: 'iconfont icon-zhongduancanshu',
+			// 	},
+			// 	children: [
+			// 		{
+			// 			path: '/params/common',
+			// 			name: 'paramsCommon',
+			// 			component: () => import('/@/views/params/common/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.paramsCommon',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin'],
+			// 				icon: 'iconfont icon-putong',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/params/common/details',
+			// 			name: 'paramsCommonDetails',
+			// 			component: () => import('/@/views/params/common/details.vue'),
+			// 			meta: {
+			// 				title: 'message.router.paramsCommonDetails',
+			// 				isLink: '',
+			// 				isHide: true,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin'],
+			// 				icon: 'ele-Comment',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/params/dynamic',
+			// 			name: 'paramsDynamic',
+			// 			component: () => import('/@/views/params/dynamic/index.vue'),
+			// 			meta: {
+			// 				title: 'message.router.paramsDynamic',
+			// 				isLink: '',
+			// 				isHide: false,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin'],
+			// 				icon: 'iconfont icon-dongtai',
+			// 			},
+			// 		},
+			// 		/**
+			// 		 * tagsViewName 为要设置不同的 "tagsView 名称" 字段
+			// 		 * 如若需设置不同 "tagsView 名称"，tagsViewName 字段必须要有
+			// 		 */
+			// 		{
+			// 			path: '/params/dynamic/details/:t/:id/:tagsViewName',
+			// 			name: 'paramsDynamicDetails',
+			// 			component: () => import('/@/views/params/dynamic/details.vue'),
+			// 			meta: {
+			// 				title: 'message.router.paramsDynamicDetails',
+			// 				isLink: '',
+			// 				isHide: true,
+			// 				isKeepAlive: true,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin'],
+			// 				icon: 'ele-Lightning',
+			// 			},
+			// 		},
+			// 	],
+			// },
+			// {
+			// 	path: '/visualizing',
+			// 	name: 'visualizingIndex',
+			// 	component: () => import('/@/layout/routerView/parent.vue'),
+			// 	redirect: '/visualizing/visualizingLinkDemo1',
+			// 	meta: {
+			// 		title: 'message.router.visualizingIndex',
+			// 		isLink: '',
+			// 		isHide: false,
+			// 		isKeepAlive: true,
+			// 		isAffix: false,
+			// 		isIframe: false,
+			// 		roles: ['admin'],
+			// 		icon: 'ele-ChatLineRound',
+			// 	},
+			// 	/**
+			// 	 * 打开内置全屏
+			// 	 * component 都为 `() => import('/@/layout/routerView/link.vue')`
+			// 	 * isLink 链接为内置的路由地址，地址为 staticRoutes 中定义
+			// 	 */
+			// 	children: [
+			// 		{
+			// 			path: '/visualizing/visualizingLinkDemo1',
+			// 			name: 'visualizingLinkDemo1',
+			// 			component: () => import('/@/layout/routerView/link.vue'),
+			// 			meta: {
+			// 				title: 'message.router.visualizingLinkDemo1',
+			// 				isLink: '/visualizingDemo1',
+			// 				isHide: false,
+			// 				isKeepAlive: false,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin'],
+			// 				icon: 'iconfont icon-caozuo-wailian',
+			// 			},
+			// 		},
+			// 		{
+			// 			path: '/visualizing/visualizingLinkDemo2',
+			// 			name: 'visualizingLinkDemo2',
+			// 			component: () => import('/@/layout/routerView/link.vue'),
+			// 			meta: {
+			// 				title: 'message.router.visualizingLinkDemo2',
+			// 				isLink: '/visualizingDemo2',
+			// 				isHide: false,
+			// 				isKeepAlive: false,
+			// 				isAffix: false,
+			// 				isIframe: false,
+			// 				roles: ['admin'],
+			// 				icon: 'iconfont icon-caozuo-wailian',
+			// 			},
+			// 		},
+			// 	],
+			// },
+			// {
+			// 	path: '/chart',
+			// 	name: 'chartIndex',
+			// 	component: () => import('/@/views/chart/index.vue'),
+			// 	meta: {
+			// 		title: 'message.router.chartIndex',
+			// 		isLink: '',
+			// 		isHide: false,
+			// 		isKeepAlive: true,
+			// 		isAffix: false,
+			// 		isIframe: false,
+			// 		roles: ['admin', 'common'],
+			// 		icon: 'iconfont icon-ico_shuju',
+			// 	},
+			// },
+			// {
+			// 	path: '/personal',
+			// 	name: 'personal',
+			// 	component: () => import('/@/views/personal/index.vue'),
+			// 	meta: {
+			// 		title: 'message.router.personal',
+			// 		isLink: '',
+			// 		isHide: false,
+			// 		isKeepAlive: true,
+			// 		isAffix: false,
+			// 		isIframe: false,
+			// 		roles: ['admin', 'common'],
+			// 		icon: 'iconfont icon-gerenzhongxin',
+			// 	},
+			// },
+			// {
+			// 	path: '/tools',
+			// 	name: 'tools',
+			// 	component: () => import('/@/views/tools/index.vue'),
+			// 	meta: {
+			// 		title: 'message.router.tools',
+			// 		isLink: '',
+			// 		isHide: false,
+			// 		isKeepAlive: true,
+			// 		isAffix: false,
+			// 		isIframe: false,
+			// 		roles: ['admin', 'common'],
+			// 		icon: 'iconfont icon-gongju',
+			// 	},
+			// },
+			// {
+			// 	path: '/link',
+			// 	name: 'layoutLinkView',
+			// 	component: () => import('/@/layout/routerView/link.vue'),
+			// 	meta: {
+			// 		title: 'message.router.layoutLinkView',
+			// 		isLink: 'https://element-plus.gitee.io/#/zh-CN/component/installation',
+			// 		isHide: false,
+			// 		isKeepAlive: false,
+			// 		isAffix: false,
+			// 		isIframe: false,
+			// 		roles: ['admin'],
+			// 		icon: 'iconfont icon-caozuo-wailian',
+			// 	},
+			// },
+			// {
+			// 	path: '/iframesOne',
+			// 	name: 'layoutIframeViewOne',
+			// 	component: () => import('/@/layout/routerView/iframes.vue'),
+			// 	meta: {
+			// 		title: 'message.router.layoutIframeViewOne',
+			// 		isLink: 'https://nodejs.org/zh-cn/',
+			// 		isHide: false,
+			// 		isKeepAlive: true,
+			// 		isAffix: true,
+			// 		isIframe: true,
+			// 		roles: ['admin'],
+			// 		icon: 'iconfont icon-neiqianshujuchucun',
+			// 	},
+			// },
+			// {
+			// 	path: '/iframesTwo',
+			// 	name: 'layoutIframeViewTwo',
+			// 	component: () => import('/@/layout/routerView/iframes.vue'),
+			// 	meta: {
+			// 		title: 'message.router.layoutIframeViewTwo',
+			// 		isLink: 'https://undraw.co/illustrations',
+			// 		isHide: false,
+			// 		isKeepAlive: true,
+			// 		isAffix: true,
+			// 		isIframe: true,
+			// 		roles: ['admin'],
+			// 		icon: 'iconfont icon-neiqianshujuchucun',
+			// 	},
+			// },
 		],
 	},
 ];
diff --git a/src/stores/themeConfig.ts b/src/stores/themeConfig.ts
index 3e8e683b959d2cc668fc6a6e897f042ee8f840a4..a6478f798941142399e53acaa5a8d34f95ee3747 100644
--- a/src/stores/themeConfig.ts
+++ b/src/stores/themeConfig.ts
@@ -102,7 +102,7 @@ export const useThemeConfig = defineStore('themeConfig', {
 			// 是否开启色弱模式
 			isInvert: false,
 			// 是否开启水印
-			isWartermark: true,
+			isWartermark: false,
 			// 水印文案
 			wartermarkText: 'vue-next-admin',
 
@@ -137,11 +137,11 @@ export const useThemeConfig = defineStore('themeConfig', {
 			 * 全局网站标题 / 副标题
 			 */
 			// 网站主标题（菜单导航、浏览器当前网页标题）
-			globalTitle: 'vue-next-admin',
+			globalTitle: '教育云平台管理端',
 			// 网站副标题（登录页顶部文字）
-			globalViceTitle: 'vueNextAdmin',
+			globalViceTitle: '智慧昆都仑教育云平台',
 			// 网站副标题（登录页顶部文字）
-			globalViceTitleMsg: '专注、免费、开源、维护、解疑',
+			globalViceTitleMsg: '专注、专业、专心、专精',
 			// 默认初始语言，可选值"<zh-cn|en|zh-tw>"，默认 zh-cn
 			globalI18n: 'zh-cn',
 			// 默认全局组件大小，可选值"<large|'default'|small>"，默认 'large'
diff --git a/src/stores/userInfo.ts b/src/stores/userInfo.ts
index 33e7970cc32572fd145e1a53f6fd979355be9be0..2d64c35f2b03218e3345e16112f68aef7a08dced 100644
--- a/src/stores/userInfo.ts
+++ b/src/stores/userInfo.ts
@@ -41,17 +41,19 @@ export const useUserInfo = defineStore('userInfo', {
 					// admin 按钮权限标识
 					let adminAuthBtnList: Array<string> = ['btn.add', 'btn.del', 'btn.edit', 'btn.link'];
 					// test 页面权限标识，对应路由 meta.roles，用于控制路由的显示/隐藏
-					let testRoles: Array<string> = ['common'];
+					// let testRoles: Array<string> = ['common'];
 					// test 按钮权限标识
-					let testAuthBtnList: Array<string> = ['btn.add', 'btn.link'];
+					// let testAuthBtnList: Array<string> = ['btn.add', 'btn.link'];
+					defaultRoles = adminRoles;
+					defaultAuthBtnList = adminAuthBtnList;
 					// 不同用户模拟不同的用户权限
-					if (userName === 'admin') {
-						defaultRoles = adminRoles;
-						defaultAuthBtnList = adminAuthBtnList;
-					} else {
-						defaultRoles = testRoles;
-						defaultAuthBtnList = testAuthBtnList;
-					}
+					// if (userName === 'admin') {
+					// 	defaultRoles = adminRoles;
+					// 	defaultAuthBtnList = adminAuthBtnList;
+					// } else {
+					// 	defaultRoles = testRoles;
+					// 	defaultAuthBtnList = testAuthBtnList;
+					// }
 					// 用户信息模拟数据
 					const userInfos = {
 						userName: userName,
diff --git a/src/types/axios.d.ts b/src/types/axios.d.ts
index bcd0a210f9d6ef20d776307717cdeba22d5ebf51..9a9ee86cb8a4a5a885c39f89dd22bbe0710a4dc0 100644
--- a/src/types/axios.d.ts
+++ b/src/types/axios.d.ts
@@ -8,6 +8,7 @@ declare module 'axios' {
 		data: T;
 		message: string;
 		type?: string;
+		status?: string;
 		[key: string]: T;
 	}
 }
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index 27a321c89d49622f8837e5cb7dc36828860daaae..8b17747452987aaa34c05ef996db10c456f52372 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -115,3 +115,13 @@ declare interface TableType<T = any> {
 		[key: string]: T;
 	};
 }
+
+declare interface TableTypeNew<T = any> {
+	total: number;
+	loading: boolean;
+	param: {
+		current: number;
+		pageSize: number;
+		[key: string]: T;
+	};
+}
diff --git a/src/types/views.d.ts b/src/types/views.d.ts
index 7dabd25ae635d7e83cf766068bce0bd115f67e41..dfd6e87d6010d31952718456531889391cf2ddf4 100644
--- a/src/types/views.d.ts
+++ b/src/types/views.d.ts
@@ -81,6 +81,139 @@ declare type TreeType = {
 	children?: TreeType[];
 };
 
+// 三方应用
+declare type RowAppsType<T = any> = {
+	id: string;
+	orgId: string[];
+	accountId: string;
+	comId: string;
+	devId: string;
+	appId: string;
+	appName: string;
+	appShortName: string;
+	appShortDesc: string;
+	appLogo: string;
+	appSuitCrowds: number[];
+	appApplyLevel: number;
+	appPayType: number;
+	appChargeCycle: number;
+	appTerminal: number[];
+	appStatus: number;
+	appConfigHomePage: string;
+	appConfigMiniProgramPage: string;
+	appConfigH5Page: string;
+	appConfigAuthorizeRedirectUrl: string;
+	appConfigEventNotifyUrl: string;
+	reviewUserId: string;
+	reviewStatus: number;
+	reviewMessage: string;
+	viewNum: string;
+	evaluateStar: string;
+	isDelete: number;
+	gmtCreate: T;
+	gmtModified: T;
+
+};
+
+interface AppsTableType extends TableType {
+	data: RowAppsType[];
+}
+
+declare interface AppsState {
+	tableData: AppsTableType;
+}
+// 三方应用
+
+// 栏目
+declare type RowCmsChannelType<T = any> = {
+	id: string;
+	parentId: string;
+	orgId: string;
+	channelName: string;
+	channelOrder: number;
+	tenantId: string;
+	isDelete: number;
+	gmtCreate: T;
+	gmtModified: T;
+};
+
+interface CmsChannelTableType extends TableType {
+	data: RowCmsChannelType[];
+}
+
+declare interface CmsChannelState {
+	tableData: CmsChannelTableType;
+}
+// 栏目end
+
+// 文章
+declare type RowCmsArticleType<T = any> = {
+	id: string;
+	channelId: string;
+	channelName: string;
+	articleTitle: string;
+	publishTime: string;
+	article: number;
+	orgId: string;
+	tenantId: string;
+	isDelete: number;
+	gmtCreate: T;
+	gmtModified: T;
+};
+
+interface CmsArticleTableType extends TableType {
+	data: RowCmsArticleType[];
+}
+
+declare interface CmsArticleState {
+	tableData: CmsArticleTableType;
+}
+// 文章end
+
+// 幻灯片
+declare type RowCmsBannerType<T = any> = {
+	id: string;
+	channelId: string;
+	bannerTitle: string;
+	bannerUrl: string;
+	linkUrl: string;
+	bannerPriority: number;
+	bannerDisable: number;
+	orgId: string;
+	tenantId: string;
+	isDelete: number;
+	gmtCreate: T;
+	gmtModified: T;
+};
+
+interface CmsBannerTableType extends TableType {
+	data: RowCmsBannerType[];
+}
+
+declare interface CmsBannerState {
+	tableData: CmsBannerTableType;
+}
+// 幻灯片end
+
+// 机构租户关系
+declare type RowOrgTenantType<T = any> = {
+	id: string;
+	orgId: string;
+	tenantId: string;
+	isDelete: number;
+	gmtCreate: T;
+	gmtModified: T;
+};
+
+interface OrgTenantTableType extends TableType {
+	data: RowCmsArticleType[];
+}
+
+declare interface OrgTenantState {
+	tableData: OrgTenantTableType;
+}
+// 机构租户关系end
+
 // user
 declare type RowUserType<T = any> = {
 	userName: string;
@@ -97,14 +230,79 @@ declare type RowUserType<T = any> = {
 	createTime: T;
 };
 
+declare type RowStudentUserType<T = any> = {
+	id: string;
+	username: string;
+	orgId: string;
+	orgName: string;
+	nickName: string;
+	gender: number;
+	userType: number;
+	userMobile: string;
+	idType: string;
+	userIdCardNumber: string;
+	nth: string;
+	gmtCreate: T;
+	isDelete: number;
+	gmtModified: T;
+};
+
+declare type RowManagerUserType<T = any> = {
+	id: string;
+	username: string;
+	orgId: string;
+	orgName: string;
+	nickName: string;
+	gender: number;
+	userType: number;
+	userRole: string;
+	userRoles: string[];
+	userMobile: string;
+	idType: string;
+	userIdCardNumber: string;
+	nth: string;
+	gmtCreate: T;
+	isDelete: number;
+	gmtModified: T;
+};
+
+declare type RowTeachType<> = {
+	id:string;
+	isDelete:number;
+	isHeadTeacher:number;
+	orgId:string;
+	orgName:string;
+	teachSubject:string;
+	teacherId:string;
+	teacherName:string;
+};
+
 interface SysUserTableType extends TableType {
 	data: RowUserType[];
 }
 
+interface StudentSysUserTableType extends TableTypeNew {
+	data: RowStudentUserType[];
+	sysOrgData: [];
+}
+interface ManagerSysUserTableType extends TableTypeNew {
+	data: RowManagerUserType[];
+}
+
+
 declare interface SysUserState {
 	tableData: SysUserTableType;
 }
 
+declare interface StudentSysUserState {
+	tableData: StudentSysUserTableType;
+}
+
+declare interface ManagerSysUserState {
+	tableData: ManagerSysUserTableType;
+}
+
+
 declare type DeptTreeType = {
 	deptName: string;
 	createTime: string;
@@ -115,7 +313,22 @@ declare type DeptTreeType = {
 	children?: DeptTreeType[];
 };
 
-// dept
+declare type OrgTreeType<T = any> = {
+	label: string;
+	title: string;
+	orderNo: number;
+	parentId: string;
+	id: string;
+	gmtCreate: T;
+	gmtModified: T;
+	aliasClassName: string;
+	isDelete:number;
+	orgType:number;
+	schoolType:number;
+	children?: OrgTreeType[];
+};
+
+// org
 declare interface RowDeptType extends DeptTreeType {
 	deptLevel: string[];
 	person: string;
@@ -126,11 +339,24 @@ declare interface RowDeptType extends DeptTreeType {
 interface SysDeptTableType extends TableType {
 	data: DeptTreeType[];
 }
+interface SysOrgTableType extends TableType {
+	data: OrgTreeType[];
+}
+
 
 declare interface SysDeptState {
 	tableData: SysDeptTableType;
 }
 
+declare interface SysOrgState {
+	tableData: SysOrgTableType;
+	expandedRowKeys:string[];
+}
+
+declare interface TypeMap {
+	[key: number]: { label: string; description: string };
+}
+
 // dic
 type ListType = {
 	id: number;
diff --git a/src/utils/encrypt.ts b/src/utils/encrypt.ts
new file mode 100644
index 0000000000000000000000000000000000000000..97ffbde92e75f14036ff2ab23d876f068ab5375c
--- /dev/null
+++ b/src/utils/encrypt.ts
@@ -0,0 +1,7 @@
+import JSEncrypt from 'jsencrypt';
+
+export const encryptData = (data: string, publicKey: string): string => {
+    const encrypt = new JSEncrypt();
+    encrypt.setPublicKey(publicKey);
+    return encrypt.encrypt(data) || '';
+};
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 6212fc4cabac172904ef085a5f0642c9b8697a58..1887731ab6bfe1aa2a644b459ab57e1c40378587 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -1,66 +1,78 @@
-import axios, { AxiosInstance } from 'axios';
-import { ElMessage, ElMessageBox } from 'element-plus';
-import { Session } from '/@/utils/storage';
+import axios, {AxiosInstance} from 'axios';
+import {ElMessage, ElMessageBox} from 'element-plus';
+import {Session} from '/@/utils/storage';
 import qs from 'qs';
 
 // 配置新建一个 axios 实例
 const service: AxiosInstance = axios.create({
-	baseURL: import.meta.env.VITE_API_URL,
-	timeout: 50000,
-	headers: { 'Content-Type': 'application/json' },
-	paramsSerializer: {
-		serialize(params) {
-			return qs.stringify(params, { allowDots: true });
-		},
-	},
+    baseURL: import.meta.env.VITE_API_URL,
+    timeout: 50000,
+    headers: {
+        'Content-Type': 'application/json',
+        'Access-Control-Allow-Origin': '*',
+    },
+    paramsSerializer: {
+        serialize(params) {
+            return qs.stringify(params, {allowDots: true});
+        },
+    },
 });
 
 // 添加请求拦截器
 service.interceptors.request.use(
-	(config) => {
-		// 在发送请求之前做些什么 token
-		if (Session.get('token')) {
-			config.headers!['Authorization'] = `${Session.get('token')}`;
-		}
-		return config;
-	},
-	(error) => {
-		// 对请求错误做些什么
-		return Promise.reject(error);
-	}
+    (config) => {
+        // 在发送请求之前做些什么 token
+        if (Session.get('token')) {
+            config.headers!['Authorization'] = `Bearer ${Session.get('token')}`;
+        }
+        return config;
+    },
+    (error) => {
+        // 对请求错误做些什么
+        return Promise.reject(error);
+    }
 );
 
 // 添加响应拦截器
 service.interceptors.response.use(
-	(response) => {
-		// 对响应数据做点什么
-		const res = response.data;
-		if (res.code && res.code !== 0) {
-			// `token` 过期或者账号已在别处登录
-			if (res.code === 401 || res.code === 4001) {
-				Session.clear(); // 清除浏览器全部临时缓存
-				window.location.href = '/'; // 去登录页
-				ElMessageBox.alert('你已被登出，请重新登录', '提示', {})
-					.then(() => {})
-					.catch(() => {});
-			}
-			return Promise.reject(service.interceptors.response);
-		} else {
-			return res;
-		}
-	},
-	(error) => {
-		// 对响应错误做点什么
-		if (error.message.indexOf('timeout') != -1) {
-			ElMessage.error('网络超时');
-		} else if (error.message == 'Network Error') {
-			ElMessage.error('网络连接错误');
-		} else {
-			if (error.response.data) ElMessage.error(error.response.statusText);
-			else ElMessage.error('接口路径找不到');
-		}
-		return Promise.reject(error);
-	}
+    (response) => {
+        // 对响应数据做点什么
+        const res = response.data;
+        if (res.status != 200) {
+            // `token` 过期或者账号已在别处登录
+            if (res.data.errCode === 20010 || res.data.errCode === 20009) {
+                ElMessageBox.alert('会话超时，请重新登录', '提示', {})
+                .then(() => {
+                })
+                .catch(() => {
+                });
+                Session.clear(); // 清除浏览器全部临时缓存
+                window.location.href = '/'; // 去登录页
+            }
+            if (res.status === -1) {
+                if (res.data.errMsg) {
+                    ElMessage.error(res.data.errMsg);
+                } else if (res.data) {
+                    ElMessage.error(res.data);
+                }
+            }
+            return Promise.reject(res);
+        } else {
+            return res;
+        }
+    },
+    (error) => {
+        // 对响应错误做点什么
+        if (error.message.indexOf('timeout') != -1) {
+            ElMessage.error('网络超时');
+        } else if (error.message == 'Network Error') {
+            ElMessage.error('网络连接错误');
+        } else {
+            if (error.response.data) ElMessage.error(error.response.data?.errMsg);
+            else ElMessage.error('接口路径找不到');
+        }
+        return Promise.reject(error);
+    }
 );
 
 // 导出 axios 实例
diff --git a/src/utils/setIconfont.ts b/src/utils/setIconfont.ts
index 2f396f1b02a76e647662a06caff944592bbde449..f43c779e4d890f6f0a16414d21c95783aa97b93f 100644
--- a/src/utils/setIconfont.ts
+++ b/src/utils/setIconfont.ts
@@ -1,7 +1,7 @@
 // 字体图标 url
 const cssCdnUrlList: Array<string> = [
 	'//at.alicdn.com/t/c/font_2298093_rnp72ifj3ba.css',
-	'https://cdn.jsdelivr.net/npm/font-awesome@4.7.0/css/font-awesome.min.css',
+	'https://cdn.bootcdn.net/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css',
 ];
 // 第三方 js url
 const jsCdnUrlList: Array<string> = [];
diff --git a/src/views/app/appKeyDialog.vue b/src/views/app/appKeyDialog.vue
new file mode 100644
index 0000000000000000000000000000000000000000..adc854c7d626229fcd6ed98af29db3273d513405
--- /dev/null
+++ b/src/views/app/appKeyDialog.vue
@@ -0,0 +1,95 @@
+<template>
+  <div class="system-user-dialog-container">
+    <el-dialog title="查看应用访问信息" v-model="state.dialog.isShowDialog" width="1000px">
+
+      <el-form ref="appKeyDialogFormRef" size="default" label-width="auto">
+        <el-row :gutter="35">
+          <el-col :span="24" class="mb20">
+            <el-alert title="以下信息，请一定要保密" type="error" effect="light" :closable="false" :center="true"/>
+          </el-col>
+        </el-row>
+        <el-row :gutter="35">
+          <el-col :span="24" class="mb20">
+            <el-text class="mx-1" size="large">appId: {{ state.appId }}</el-text>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="35">
+          <el-col :span="24" class="mb20">
+            <el-text class="mx-1" size="large">secretKey: {{ state.appSecret }}</el-text>
+          </el-col>
+        </el-row>
+
+      </el-form>
+      <template #footer>
+				<span class="dialog-footer">
+					<el-button @click="onCancel" size="default">取 消</el-button>
+					<el-button @click="copyText">一键复制</el-button>
+				</span>
+      </template>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script setup lang="ts" name="appKeyDialog">
+import {nextTick, onMounted, reactive, ref} from 'vue';
+import type {FormRules, UploadProps, FormInstance} from 'element-plus'
+import {ElMessage} from "element-plus";
+
+const textToCopy = ref('要复制的文本');
+// 定义变量内容
+const appKeyDialogFormRef = ref<FormInstance>();
+const state = reactive({
+  appId: '',
+  appSecret: '',
+  dialog: {
+    isShowDialog: false,
+    type: '',
+    title: '',
+    submitTxt: '',
+  },
+});
+// 打开弹窗
+const openDialog = async (type: string, row: RowAppsType) => {
+  state.appId = row.appId;
+  state.appSecret = row.appSecret;
+  state.dialog.isShowDialog = true;
+};
+// 关闭弹窗
+const closeDialog = () => {
+  state.dialog.isShowDialog = false;
+};
+// 取消
+const onCancel = () => {
+  closeDialog();
+};
+const copyText = async () => {
+  try {
+    textToCopy.value = `appId: ${state.appId}  secretKey: ${state.appSecret}`
+    await navigator.clipboard.writeText(textToCopy.value);
+    ElMessage.success('复制成功！');
+  } catch (err) {
+    console.error('复制失败', err);
+    ElMessage.error('复制失败！');
+  }
+};
+// 暴露变量
+defineExpose({
+  openDialog,
+});
+</script>
+<style scoped lang="scss">
+.croppers-container {
+  .cropper-img-warp {
+    text-align: center;
+
+    .cropper-img {
+      margin: auto;
+      width: 150px;
+      height: 150px;
+      border-radius: 100%;
+    }
+  }
+}
+</style>
diff --git a/src/views/app/dialog.vue b/src/views/app/dialog.vue
new file mode 100644
index 0000000000000000000000000000000000000000..3610988b5439b24445f4e836bd2bc35f836302a8
--- /dev/null
+++ b/src/views/app/dialog.vue
@@ -0,0 +1,644 @@
+<template>
+  <div class="system-user-dialog-container">
+    <el-dialog :title="state.dialog.title" v-model="state.dialog.isShowDialog" width="1000px">
+      <el-form ref="appsDialogFormRef" :model="state.ruleForm" :rules="rules" size="default" label-width="auto">
+        <el-row :gutter="35">
+          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+            <el-form-item label="应用logo" prop="appLogo">
+              <el-input type="hidden" v-model="state.ruleForm.appLogo" placeholder="请输入" clearable></el-input>
+              <el-upload
+                  v-model:file-list="fileList"
+                  list-type="picture-card"
+                  action="https://www.slkjyun.cn/api/admin/file/upload"
+                  :on-success="handleAvatarSuccess"
+                  :before-upload="beforeAvatarUpload"
+                  :on-preview="handlePictureCardPreview"
+                  :on-remove="handleRemove"
+              >
+                <el-icon>
+                  <Plus/>
+                </el-icon>
+              </el-upload>
+
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="35">
+          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+            <el-form-item label="应用名称" prop="appName">
+              <el-input v-model="state.ruleForm.appName"
+                        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="应用简称" prop="appShortName">
+              <el-input v-model="state.ruleForm.appShortName"
+                        placeholder="请输入应用简称"
+                        clearable>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="35">
+          <el-col :span="24" class="mb20">
+            <el-form-item label="应用描述" prop="appShortDesc">
+              <el-input type="textarea"
+                        v-model="state.ruleForm.appShortDesc"
+                        placeholder="请输入应用描述"
+                        clearable></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="35">
+          <el-col :span="24" class="mb20">
+            <el-form-item label="所属学校" prop="orgId">
+              <el-tree-select
+                  v-model="state.ruleForm.orgId"
+                  :data="state.sysOrgData"
+                  :render-after-expand="false"
+                  style="width: 500px"
+                  check-strictly
+                  filterable
+                  show-all-levels
+                  multiple
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="35">
+          <el-col :span="24" class="mb20">
+            <el-form-item label="所属地区" prop="orgId">
+              <el-tree-select
+                  v-model="state.ruleForm.areaOrgIds"
+                  :data="state.areaOrgData"
+                  :render-after-expand="true"
+                  style="width: 500px"
+                  check-strictly
+                  filterable
+                  show-all-levels
+                  multiple
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="35">
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="12" class="mb20">
+            <el-form-item label="应用使用人群" prop="appSuitCrowds">
+              <el-select v-model="state.ruleForm.appSuitCrowds" placeholder="请选择应用使用人群"
+                         multiple clearable class="w100">
+                <el-option
+                    v-for="item in state.appSuitCrowdOptions"
+                    :key="item.key"
+                    :label="item.label"
+                    :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="12" class="mb20">
+            <el-form-item label="应用终端类型" prop="appTerminal">
+              <el-select v-model="state.ruleForm.appTerminal"
+                         placeholder="请选择应用终端类型"
+                         multiple
+                         clearable
+                         class="w100"
+                         @change="appTerminalChange"
+                         @clear="appTerminalClear">
+                <el-option
+                    v-for="item in state.appTerminalOptions"
+                    :key="item.key"
+                    :label="item.label"
+                    :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="12" class="mb20">
+            <el-form-item label="应用分类" prop="appCategory">
+              <el-select v-model="state.ruleForm.appCategory"
+                         placeholder="请选择应用分类"
+                         clearable
+                         class="w100">
+                <el-option
+                    v-for="item in state.appCategoryOptions"
+                    :key="item.key"
+                    :label="item.label"
+                    :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <el-row :gutter="35">
+          <el-col :span="24" class="mb20">
+            <el-form-item label="是否需要登录" prop="needLogin">
+              <el-select v-model="state.ruleForm.needLogin"
+                         placeholder="请选择是否需要登录"
+                         clearable
+                         class="w100">
+                <el-option
+                    v-for="item in state.needLoginOptions"
+                    :key="item.key"
+                    :label="item.label"
+                    :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="35">
+          <el-col :span="24" class="mb20" v-show="state.visible.isWebShow">
+            <el-form-item label="应用主页url地址" prop="appConfigHomePage">
+              <el-input v-model="state.ruleForm.appConfigHomePage"
+                        placeholder="请输入应用主页url地址"
+                        clearable>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="35" v-show="state.visible.isMiniProgramShow">
+          <el-col :span="24" class="mb20">
+            <el-form-item label="小程序链接" prop="appConfigMiniProgramPage">
+              <el-input v-model="state.ruleForm.appConfigMiniProgramPage"
+                        placeholder="请输入小程序链接"
+                        clearable>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="35" v-show="state.visible.isH5Show">
+          <el-col :span="24" class="mb20">
+            <el-form-item label="H5链接" prop="appConfigH5Page">
+              <el-input v-model="state.ruleForm.appConfigH5Page"
+                        placeholder="请输入小程序链接"
+                        clearable>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="35">
+          <el-col :span="24" class="mb20">
+            <el-form-item label="网页授权回调地址" prop="appConfigAuthorizeRedirectUrl">
+              <el-input v-model="state.ruleForm.appConfigAuthorizeRedirectUrl"
+                        placeholder="请输入网页授权回调地址"
+                        clearable>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="35">
+          <el-col :span="24" class="mb20">
+            <el-form-item label="消息推送地址" prop="appConfigEventNotifyUrl">
+              <el-input v-model="state.ruleForm.appConfigEventNotifyUrl"
+                        placeholder="请输入消息推送地址"
+                        clearable>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="35">
+          <el-col :span="24" class="mb20">
+            <el-form-item label="排序序号" prop="priorityNum">
+              <el-input-number v-model="state.ruleForm.priorityNum" :min="1"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+      </el-form>
+      <template #footer>
+				<span class="dialog-footer">
+					<el-button @click="onCancel" size="default">取 消</el-button>
+					<el-button type="primary" @click="onSubmit(appsDialogFormRef)" size="default">{{
+              state.dialog.submitTxt
+            }}</el-button>
+				</span>
+      </template>
+    </el-dialog>
+
+    <el-dialog v-model="dialogVisible">
+      <img w-full h-full style="width: 100%;height: 100%" :src="dialogImageUrl" alt="Preview Image"/>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script setup lang="ts" name="appsDialog">
+import {nextTick, onMounted, reactive, ref} from 'vue';
+import {Plus} from '@element-plus/icons-vue'
+import type {FormRules, UploadProps, FormInstance} from 'element-plus'
+import {ElMessage, UploadUserFile} from "element-plus";
+
+import {useAppsApi} from "/@/api/apps";
+
+const {add, edit} = useAppsApi();
+// 定义变量内容
+const appsDialogFormRef = ref<FormInstance>();
+const state = reactive({
+  visible: {
+    isWebShow: false,
+    isH5Show: false,
+    isMiniProgramShow: false,
+  },
+  // 学校org树数据
+  sysOrgData: [] as OrgTreeType[],
+  // 区域org树数据
+  areaOrgData: [] as OrgTreeType[],
+  ruleForm: {
+    id: '',
+    orgId: '',
+    areaOrgIds: '',
+    accountId: '',
+    comId: '',
+    devId: '',
+    appId: '',
+    appName: '',
+    appShortName: '',
+    appShortDesc: '',
+    appLogo: '',
+    appCategory: '',
+    appSuitCrowds: [],
+    appApplyLevel: '',
+    appPayType: '',
+    appChargeCycle: '',
+    appTerminal: [],
+    appStatus: '',
+    appConfigHomePage: '',
+    appConfigMiniProgramPage: '',
+    appConfigH5Page: '',
+    appConfigAuthorizeRedirectUrl: '',
+    appConfigEventNotifyUrl: '',
+    reviewUserId: '',
+    reviewStatus: '',
+    reviewMessage: '',
+    viewNum: '',
+    evaluateStar: '',
+    priorityNum: '',
+    needLogin: '',
+    isDelete: '',
+  },
+  dialog: {
+    isShowDialog: false,
+    type: '',
+    title: '',
+    submitTxt: '',
+  },
+  appSuitCrowdOptions: [
+    {value: '0', key: '0', label: '不限'},
+    {value: '1', key: '1', label: '学生'},
+    {value: '2', key: '2', label: '老师'},
+    {value: '3', key: '3', label: '家长'},
+    {value: '4', key: '4', label: '学校工作人员'},
+    {value: '5', key: '5', label: '机构工作人员'}
+  ],
+  appTerminalOptions: [
+    {value: '1', key: '1', label: 'web端'},
+    {value: '2', key: '2', label: '小程序'},
+    {value: '3', key: '3', label: 'H5'},
+  ],
+  appCategoryOptions: [
+    {value: '1', key: '1', label: '教育教学'},
+    {value: '2', key: '2', label: '教育管理'},
+    {value: '3', key: '3', label: '教育评价'},
+    {value: '4', key: '4', label: '教育服务'},
+  ],
+  needLoginOptions: [
+    {value: '1', key: '1', label: '是'},
+    {value: '0', key: '0', label: '否'},
+  ],
+  sysOrgTreeData: {
+    data: [],
+    total: 0,
+    loading: false,
+    param: {
+      pageNum: 1,
+      pageSize: 2100,
+    },
+  },
+});
+const fileList = ref<UploadUserFile[]>([])
+const imageUrl = ref('')
+const dialogImageUrl = ref('')
+const dialogVisible = ref(false)
+
+// 定义子组件向父组件传值/事件
+const emit = defineEmits(['refresh']);
+const props = defineProps(['orgTree', 'areaOrgTree'])
+
+const rules = reactive<FormRules<RowAppsType>>({
+  appName: [
+    {required: true, message: '应用名称不能为空', trigger: 'blur'},
+    {min: 3, max: 10, message: '应用名称长度应该在3到10个字符之间', trigger: 'blur'},
+  ],
+  appShortName: [
+    {required: true, message: '应用简称不能为空', trigger: 'blur'},
+    {min: 3, max: 20, message: '应用简称长度,至少3个字符，最多20个字符', trigger: 'blur'},
+  ],
+  appShortDesc: [
+    {required: true, message: '应用描述不能为空', trigger: 'blur'},
+    {min: 3, max: 50, message: '应用描述长度,至少3个字符，最多50个字符', trigger: 'blur'},
+  ],
+  appLogo: [
+    {required: true, message: '必须上传应用logo', trigger: 'blur'},
+  ],
+  orgId: [
+    {type: 'array', required: true, message: '请在所属机构中至少选择一项，可多选'},
+  ],
+  appSuitCrowds: [
+    {type: 'array', required: true, message: '请在适用人群中至少选择一项，可多选'},
+  ],
+  appTerminal: [
+    {required: true, message: '请选择应用终端类型', trigger: 'change'},
+  ],
+  appCategory: [
+      {required: true, message: '请选择应用分类', trigger: 'change'},
+  ],
+  needLogin:  [
+    {required: true, message: '请选择是否需要登录', trigger: 'change'},
+  ],
+  // appConfigHomePage: [
+  //   {required: false, message: '请填写web端应用主页', trigger: 'blur'},
+  // ],
+  // appConfigMiniProgramPage: [
+  //   {required: false, message: '请填写小程序链接', trigger: 'blur'},
+  // ],
+  // appConfigH5Page: [
+  //   {required: false, message: '请填写H5链接', trigger: 'blur'},
+  // ],
+  // appConfigAuthorizeRedirectUrl: [
+  //   {required: true, message: '请填写授权地址', trigger: 'blur'},
+  // ],
+  appConfigEventNotifyUrl: [
+    {required: true, message: '请填写消息推送地址', trigger: 'blur'},
+  ]
+})
+
+const handleAvatarSuccess: UploadProps['onSuccess'] = (
+    response,
+    uploadFile
+) => {
+  imageUrl.value = URL.createObjectURL(uploadFile.raw!)
+  state.ruleForm.appLogo = response.data
+}
+
+const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
+
+  if (fileList.value.length === 1) {
+    ElMessage.error('只能上传一张图片!')
+    return false
+  }
+
+  if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/png') {
+    ElMessage.error('必须为png或jpeg格式的图片!')
+    return false
+  } else if (rawFile.size / 1024 / 1024 > 2) {
+    ElMessage.error('图片大小不能超过2MB!')
+    return false
+  }
+  return true
+}
+
+const handleRemove: UploadProps['onRemove'] = (uploadFile, uploadFiles) => {
+  console.log(uploadFile, uploadFiles)
+}
+
+const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => {
+  dialogImageUrl.value = uploadFile.url!
+  dialogVisible.value = true
+}
+
+// 打开弹窗
+const openDialog = async (type: string, row: RowAppsType) => {
+  state.sysOrgData = props.orgTree;
+  state.areaOrgData = props.areaOrgTree;
+  if (type === 'edit') {
+    state.dialog.title = '修改应用信息';
+    state.dialog.submitTxt = '修 改';
+    state.ruleForm = row;
+    fileList.value = [];
+    fileList.value.push({name: row.appLogo, url: row.appLogo})
+    checkAppTerminalForUpdate(state.ruleForm.appTerminal, row)
+  } else {
+    state.dialog.title = '创建应用';
+    state.dialog.submitTxt = '新 增';
+    fileList.value = [];
+    state.ruleForm =  {
+          id: '',
+          orgId: '',
+          areaOrgIds: '',
+          accountId: '',
+          comId: '',
+          devId: '',
+          appId: '',
+          appName: '',
+          appShortName: '',
+          appShortDesc: '',
+          appLogo: '',
+          appSuitCrowds: [],
+          appApplyLevel: '',
+          appPayType: '',
+          appChargeCycle: '',
+          appTerminal: [],
+          appStatus: '',
+          appConfigHomePage: '',
+          appConfigMiniProgramPage: '',
+          appConfigH5Page: '',
+          appConfigAuthorizeRedirectUrl: '',
+          appConfigEventNotifyUrl: '',
+          reviewUserId: '',
+          reviewStatus: '',
+          reviewMessage: '',
+          viewNum: '',
+          evaluateStar: '',
+          isDelete: '',
+    }
+    clearAppTerminal();
+    // await nextTick(() => {
+    //   if (appsDialogFormRef.value) {
+    //     appsDialogFormRef.value.resetFields();
+    //   }
+    // });
+  }
+  state.dialog.isShowDialog = true;
+};
+// 关闭弹窗
+const closeDialog = () => {
+  state.dialog.isShowDialog = false;
+};
+// 取消
+const onCancel = () => {
+  closeDialog();
+};
+// 提交
+const onSubmit = async (formEl: FormInstance | undefined) => {
+  if (!formEl) return
+  await formEl.validate(async (valid, fields) => {
+    if (!valid) {
+      console.log('error submit!!', fields);
+      ElMessage.error('数据校验失败!');
+      return false;
+    }
+    const res = state.ruleForm.id ? await edit(state.ruleForm) : await add(state.ruleForm)
+    if (res.status === 200) {
+      ElMessage.success(state.ruleForm.id ? '更改成功' : '新增成功');
+    }
+    closeDialog();
+    emit('refresh');
+  });
+
+  // if (state.dialog.type === 'add') { }
+};
+
+const clearAppTerminal = () => {
+  state.visible.isWebShow = false
+  state.ruleForm.appConfigHomePage = ''
+  state.visible.isMiniProgramShow = false
+  state.ruleForm.appConfigMiniProgramPage = ''
+  state.visible.isH5Show = false
+  state.ruleForm.appConfigH5Page = ''
+  rules.appConfigHomePage = [
+    {required: false, message: '请填写web端应用主页', trigger: 'blur'}
+  ]
+  rules.appConfigMiniProgramPage = [
+    {required: false, message: '请填写小程序链接', trigger: 'blur'}
+  ]
+  rules.appConfigH5Page = [
+    {required: false, message: '请填写H5链接', trigger: 'blur'}
+  ]
+}
+
+const checkAppTerminalForUpdate = (value: any, row: RowAppsType) => {
+  if (value.includes('1')) {
+    state.ruleForm.appConfigHomePage = row.appConfigHomePage;
+    state.visible.isWebShow = true
+    rules.appConfigHomePage = [
+      {required: true, message: '请填写web端应用主页', trigger: 'blur'}
+    ]
+  } else {
+    state.ruleForm.appConfigHomePage = ''
+    state.visible.isWebShow = false
+    rules.appConfigHomePage = [
+      {required: false, message: '请填写web端应用主页', trigger: 'blur'}
+    ]
+  }
+  if (value.includes('2')) {
+    state.ruleForm.appConfigMiniProgramPage = row.appConfigMiniProgramPage;
+    state.visible.isMiniProgramShow = true
+    rules.appConfigMiniProgramPage = [
+      {required: true, message: '请填写小程序链接', trigger: 'blur'}
+    ]
+  } else {
+    state.ruleForm.appConfigMiniProgramPage = ''
+    state.visible.isMiniProgramShow = false
+    rules.appConfigMiniProgramPage = [
+      {required: false, message: '请填写小程序链接', trigger: 'blur'}
+    ]
+  }
+  if (value.includes('3')) {
+    state.ruleForm.appConfigH5Page = row.appConfigH5Page;
+    state.visible.isH5Show = true
+    rules.appConfigH5Page = [
+      {required: true, message: '请填写H5链接', trigger: 'blur'}
+    ]
+  } else {
+    state.ruleForm.appConfigH5Page = ''
+    state.visible.isH5Show = false
+    rules.appConfigH5Page = [
+      {required: false, message: '请填写H5链接', trigger: 'blur'}
+    ]
+  }
+}
+
+const checkAppTerminal = (value: any) => {
+  if (value.includes('1')) {
+    state.visible.isWebShow = true
+    rules.appConfigHomePage = [
+      {required: true, message: '请填写web端应用主页', trigger: 'blur'}
+    ]
+  } else {
+    state.ruleForm.appConfigHomePage = ''
+    state.visible.isWebShow = false
+    rules.appConfigHomePage = [
+      {required: false, message: '请填写web端应用主页', trigger: 'blur'}
+    ]
+  }
+  if (value.includes('2')) {
+    state.visible.isMiniProgramShow = true
+    rules.appConfigMiniProgramPage = [
+      {required: true, message: '请填写小程序链接', trigger: 'blur'}
+    ]
+  } else {
+    state.ruleForm.appConfigMiniProgramPage = ''
+    state.visible.isMiniProgramShow = false
+    rules.appConfigMiniProgramPage = [
+      {required: false, message: '请填写小程序链接', trigger: 'blur'}
+    ]
+  }
+  if (value.includes('3')) {
+    state.visible.isH5Show = true
+    rules.appConfigH5Page = [
+      {required: true, message: '请填写H5链接', trigger: 'blur'}
+    ]
+  } else {
+    state.ruleForm.appConfigH5Page = ''
+    state.visible.isH5Show = false
+    rules.appConfigH5Page = [
+      {required: false, message: '请填写H5链接', trigger: 'blur'}
+    ]
+  }
+}
+
+const appTerminalChange = (value: any) => {
+  console.log(value)
+  if (value.length === 0) {
+    clearAppTerminal();
+  } else {
+    checkAppTerminal(value)
+  }
+}
+const appTerminalClear = () => {
+  console.log('清空')
+}
+
+onMounted(() => {
+
+})
+
+// 暴露变量
+defineExpose({
+  openDialog,
+});
+</script>
+<style scoped lang="scss">
+.croppers-container {
+  .cropper-img-warp {
+    text-align: center;
+
+    .cropper-img {
+      margin: auto;
+      width: 150px;
+      height: 150px;
+      border-radius: 100%;
+    }
+  }
+}
+</style>
diff --git a/src/views/app/index.vue b/src/views/app/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..80acad356fc3fe0d34fd9780df793840613a7ac4
--- /dev/null
+++ b/src/views/app/index.vue
@@ -0,0 +1,405 @@
+<template>
+  <div class="system-user-container layout-padding">
+    <el-card shadow="hover" class="layout-padding-auto">
+      <div class="system-user-search mb15">
+        <el-row :gutter="20">
+          <el-col :span="2" class="mb15">
+            <el-input size="large" placeholder="请输入应用名称" v-model="appName" style="max-width: 240px"></el-input>
+          </el-col>
+          <el-col :span="4" class="mb15">
+            <el-tree-select
+                placeholder="请选择学校"
+                v-model="searchState.orgId"
+                :data="searchState.sysOrgData"
+                :render-after-expand="false"
+                style="width: 200px"
+                check-strictly
+                filterable
+                show-all-levels
+                multiple
+            />
+          </el-col>
+          <el-col :span="4" class="mb15">
+            <el-tree-select
+                placeholder="请选择教育局"
+                v-model="searchState.areaOrgId"
+                :data="searchState.areaOrgData"
+                :render-after-expand="false"
+                style="width: 200px"
+                check-strictly
+                filterable
+                show-all-levels
+                multiple
+            />
+          </el-col>
+          <el-col :span="4" class="mb15">
+            <el-select v-model="searchState.appCategory"
+                       placeholder="请选择应用分类"
+                       clearable
+                       class="w100">
+              <el-option
+                  v-for="item in searchState.appCategoryOptions"
+                  :key="item.key"
+                  :label="item.label"
+                  :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-col>
+          <el-col :span="4" class="mb15">
+            <el-select v-model="searchState.appSuitCrowds" placeholder="请选择应用适用人群"
+                       multiple clearable class="w100">
+              <el-option
+                  v-for="item in searchState.appSuitCrowdOptions"
+                  :key="item.key"
+                  :label="item.label"
+                  :value="item.value">
+              </el-option>
+            </el-select>
+          </el-col>
+          <el-col :span="6" class="mb15">
+            <el-button size="large" type="primary" class="ml10" @click="getTableData">
+              <el-icon>
+                <ele-Search/>
+              </el-icon>
+              查询
+            </el-button>
+            <el-button size="large" type="success" class="ml10" @click="onOpenAdd('add')">
+              <el-icon>
+                <ele-FolderAdd/>
+              </el-icon>
+              创建应用
+            </el-button>
+          </el-col>
+        </el-row>
+
+      </div>
+      <el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%">
+        <el-table-column type="index" label="序号" width="80"/>
+        <el-table-column prop="appName" label="应用名称" show-overflow-tooltip width="200"></el-table-column>
+        <el-table-column prop="appShortName" label="应用简称" show-overflow-tooltip width="200"></el-table-column>
+        <el-table-column prop="appLogo" label="应用logo" show-overflow-tooltip width="130">
+          <template #default="scope">
+            <el-image
+                style="width: 40px; height: 40px"
+                :src="scope.row.appLogo"
+                :preview-src-list="[scope.row.appLogo]"
+            ></el-image>
+          </template>
+        </el-table-column>
+        <el-table-column prop="appTerminal" label="应用终端" show-overflow-tooltip width="130">
+          <template #default="scope">
+            <p v-for="terminal in scope.row.appTerminal" :key="terminal">
+              {{ getTerminalLabel(terminal) }}
+            </p>
+          </template>
+        </el-table-column>
+        <el-table-column prop="appCategory" label="应用分类" show-overflow-tooltip width="130">
+          <template #default="scope">
+            <div v-if="scope.row.appCategory==1">教育教学</div>
+            <div v-if="scope.row.appCategory==2">教育管理</div>
+            <div v-if="scope.row.appCategory==3">教育评价</div>
+            <div v-if="scope.row.appCategory==4">教育服务</div>
+            <div v-if="scope.row.appCategory==0" style="color: red">尚未选择</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="appStatus" label="应用状态" show-overflow-tooltip width="130">
+          <template #default="scope">
+            <el-tag type="" color="yellow" v-if="scope.row.appStatus==0">初始提交审核</el-tag>
+            <el-tag type="" color="green" v-if="scope.row.appStatus==1">api调试中</el-tag>
+            <el-tag type="" color="red" v-if="scope.row.appStatus==2">申请上线中</el-tag>
+            <el-tag type="info" v-if="scope.row.appStatus==3">申请上线未通过</el-tag>
+            <el-tag type="success" v-if="scope.row.appStatus==4">已上线</el-tag>
+            <el-tag type="warning" v-if="scope.row.appStatus==5">申请下线</el-tag>
+            <el-tag type="danger" v-if="scope.row.appStatus==6">已下线</el-tag>
+            <el-tag type="danger" v-if="scope.row.appStatus==7">已下线</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="reviewStatus" label="审核状态" show-overflow-tooltip width="130">
+          <template #default="scope">
+            <div v-if="scope.row.reviewStatus==0">待审核</div>
+            <div v-if="scope.row.reviewStatus==1">通过</div>
+            <div v-if="scope.row.reviewStatus==2">拒绝</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip width="130">
+          <template #default="scope">
+            <div style="font-size: 12px">
+              {{ scope.row.gmtCreate }}
+            </div>
+          </template>
+        </el-table-column>
+        <!--        <el-table-column prop="priorityNum" label="排序序号" show-overflow-tooltip width="130">-->
+        <!--          <template #default="scope">-->
+        <!--            <div style="font-size: 12px">-->
+        <!--              {{ scope.row.priorityNum }}-->
+        <!--            </div>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <el-table-column label="操作" width="300">
+          <template #default="scope">
+            <el-button :disabled="scope.row.userName === 'admin'" size="small" type="primary"
+                       @click="onOpenEdit('edit', scope.row)">修改
+            </el-button>
+
+            <el-button v-show="scope.row.appStatus==4" size="small" type="danger"
+                       @click="onLineOffline(scope.row, 7)">下线
+            </el-button>
+
+            <el-button v-show="scope.row.appStatus==7" size="small" type="primary"
+                       @click="onLineOffline(scope.row, 4)">上线
+            </el-button>
+
+            <el-button size="small" type="primary"
+                       @click="seeAppKey('edit', scope.row)">查看应用秘钥
+            </el-button>
+
+            <el-button size="small" type="danger"
+                       @click="onRowDel(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="[100, 200, 500]"
+          v-model:current-page="state.tableData.param.pageNum"
+          background
+          v-model:page-size="state.tableData.param.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="state.tableData.total"
+      >
+      </el-pagination>
+    </el-card>
+    <AppsDialog ref="appsDialogRef"
+                @refresh="getTableData()"
+                :orgTree="searchState.sysOrgData"
+                :areaOrgTree="searchState.areaOrgData"
+    />
+    <AppKeyDialog ref="appKeyDialogFormRef"/>
+
+  </div>
+</template>
+
+<script setup lang="ts" name="apps">
+import {defineAsyncComponent, reactive, onMounted, ref} from 'vue';
+import {ElMessageBox, ElMessage} from 'element-plus';
+import {useAppsApi} from '/@/api/apps'
+
+const {listByAppPage, removeById, applyAppOnLineOffline} = useAppsApi();
+import {systemApi} from "/@/api/system";
+
+const {orgSchoolOnlyTree, orgAreaTree} = systemApi();
+// 引入组件
+const AppsDialog = defineAsyncComponent(() => import('/src/views/app/dialog.vue'));
+const AppKeyDialog = defineAsyncComponent(() => import('/src/views/app/appKeyDialog.vue'));
+const appName = ref('');
+// 定义变量内容
+const appsDialogRef = ref();
+const appKeyDialogFormRef = ref();
+const state = reactive<AppsState>({
+  tableData: {
+    data: [],
+    total: 0,
+    loading: false,
+    param: {
+      pageNum: 1,
+      pageSize: 10,
+    },
+  },
+});
+
+const searchState = ref({
+  orgId: '',
+  areaOrgId: '',
+  appSuitCrowds: [],
+  sysOrgData: [] as OrgTreeType[],
+  areaOrgData: [] as OrgTreeType[],
+  appSuitCrowdOptions: [
+    {value: '0', key: '0', label: '不限'},
+    {value: '1', key: '1', label: '学生'},
+    {value: '2', key: '2', label: '老师'},
+    {value: '3', key: '3', label: '家长'},
+    {value: '4', key: '4', label: '学校工作人员'},
+    {value: '5', key: '5', label: '机构工作人员'}
+  ],
+  appTerminalOptions: [
+    {value: '1', key: '1', label: 'web端'},
+    {value: '2', key: '2', label: '手机APP'},
+    {value: '3', key: '3', label: 'H5'},
+  ],
+  appCategory: [],
+  appCategoryOptions: [
+    {value: '1', key: '1', label: '教育教学'},
+    {value: '2', key: '2', label: '教育管理'},
+    {value: '3', key: '3', label: '教育评价'},
+    {value: '4', key: '4', label: '教育服务'},
+  ]
+})
+
+// 加载学校树数据
+const loadSchoolOrgTreeData = async () => {
+  state.tableData.loading = true;
+  searchState.value.sysOrgData = [];
+  const res = await orgSchoolOnlyTree()
+  if (res.status === 200) {
+    searchState.value.sysOrgData = res.data;
+    state.tableData.loading = false;
+  }
+};
+
+// 加载区域树
+const loadOrgTreeData = async () => {
+  state.tableData.loading = true;
+  searchState.value.areaOrgData = [];
+  const res = await orgAreaTree()
+  if (res.status === 200) {
+    searchState.value.areaOrgData = res.data;
+    state.tableData.loading = false;
+  }
+};
+
+// 初始化表格数据
+const getTableData = async () => {
+  state.tableData.loading = true;
+  const data = [];
+  const res = await listByAppPage({
+    current: state.tableData.param.pageNum,
+    pageSize: state.tableData.param.pageSize,
+    appName: appName.value,
+    // 学校id
+    orgId: searchState.value.orgId,
+    areaOrgId: searchState.value.areaOrgId,
+    appSuitCrowds: searchState.value.appSuitCrowds,
+    appCategory: searchState.value.appCategory,
+  });
+  if (res.status === 200) {
+    res.data.records.forEach((item: any) => {
+      if (item.appSuitCrowds) {
+        item.appSuitCrowds = item.appSuitCrowds.split(',');
+      }
+      if (item.orgId) {
+        item.orgId = item.orgId.split(',');
+      }
+      if (item.areaOrgIds) {
+        item.areaOrgIds = item.areaOrgIds.split(',');
+      }
+      if (item.appTerminal) {
+        item.appTerminal = item.appTerminal.split(',');
+      }
+    })
+    data.push(...res.data.records);
+    // console.log('最终结果为', data)
+  }
+  state.tableData.data = data;
+  state.tableData.total = res.data.total;
+  state.tableData.loading = false;
+};
+// 打开新增弹窗
+const onOpenAdd = (type: string) => {
+  appsDialogRef.value.openDialog(type);
+};
+// 打开修改弹窗
+const onOpenEdit = (type: string, row: RowAppsType) => {
+  appsDialogRef.value.openDialog(type, row);
+};
+
+const seeAppKey = (type: string, row: RowAppsType) => {
+  appKeyDialogFormRef.value.openDialog(type, row);
+};
+
+const onLineOffline = async (row: RowAppsType, status: number) => {
+  ElMessageBox.confirm(`确定要 ${status == 4 ? '上架' : '下架'} 名为：“${row.appName}的应用吗？”，是否继续?`, '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    const res = await applyAppOnLineOffline({id: row.id, appStatus: status})
+    if (res.status === 200) {
+      await getTableData();
+      ElMessage.success('操作成功');
+    }
+  }).catch(() => {
+  });
+};
+
+// 删除
+const onRowDel = (row: RowAppsType) => {
+  ElMessageBox.confirm(`确定要删除名为：“${row.appName}的应用吗？”，是否继续?`, '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    const res = await removeById({id: row.id})
+    if (res.status === 200) {
+      await getTableData();
+      ElMessage.success('删除成功');
+    }
+  }).catch(() => {
+  });
+};
+
+// 分页改变
+const onHandleSizeChange = (val: number) => {
+  state.tableData.param.pageSize = val;
+  getTableData();
+};
+// 分页改变
+const onHandleCurrentChange = (val: number) => {
+  state.tableData.param.pageNum = val;
+  getTableData();
+};
+// 页面加载时
+onMounted(() => {
+  loadOrgTreeData();
+  loadSchoolOrgTreeData();
+  getTableData();
+});
+
+// 获取终端标签类型
+const getTagType = (terminal: string) => {
+  switch (terminal) {
+    case '1':
+      return 'success';
+    case '2':
+      return 'warning';
+    case '3':
+      return 'danger';
+    default:
+      return '';
+  }
+};
+
+// 获取终端标签文本
+const getTerminalLabel = (terminal: string) => {
+  switch (terminal) {
+    case '1':
+      return 'web';
+    case '2':
+      return '小程序';
+    case '3':
+      return 'H5';
+    default:
+      return '';
+  }
+};
+
+</script>
+
+<style scoped lang="scss">
+.system-user-container {
+  :deep(.el-card__body) {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    overflow: auto;
+
+    .el-table {
+      flex: 1;
+    }
+  }
+}
+</style>
diff --git a/src/views/cms/article/dialog.vue b/src/views/cms/article/dialog.vue
new file mode 100644
index 0000000000000000000000000000000000000000..2c3ff12b0ddbf2e55fa83265fd89ad8dda08d18b
--- /dev/null
+++ b/src/views/cms/article/dialog.vue
@@ -0,0 +1,331 @@
+<template>
+  <div class="system-user-dialog-container">
+    <el-dialog :title="state.dialog.title" v-model="state.dialog.isShowDialog" width="1000px">
+      <el-form ref="articleDialogFormRef" :model="state.ruleForm" :rules="rules" size="default" label-width="auto">
+        <el-row :gutter="35">
+          <el-col :span="24" class="mb20">
+            <el-form-item label="所属机构" prop="orgId">
+              <el-tree-select
+                  v-model="state.ruleForm.orgId"
+                  :data="props.orgTree??[]"
+                  :render-after-expand="false"
+                  style="width: 500px"
+                  check-strictly
+                  filterable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="35">
+          <el-col :span="24" class="mb20">
+            <el-form-item label="所属栏目" prop="channelId">
+              <el-tree-select
+                  v-model="state.ruleForm.channelId"
+                  :data="props.channelTree??[]"
+                  :render-after-expand="true"
+                  style="width: 500px"
+                  check-strictly
+                  filterable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="35">
+          <el-col :span="24" class="mb20">
+            <el-form-item label="文章标题" prop="articleTitle">
+              <el-input v-model="state.ruleForm.articleTitle"
+                        placeholder="请输入文章标题"
+                        clearable>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="35">
+          <el-col :span="24" class="mb20">
+            <el-form-item label="是否外部链接" prop="isExternalLink">
+              <el-select v-model="state.ruleForm.isExternalLink" placeholder="请选择是否外部链接">
+                <el-option label="否" value="0"></el-option>
+                <el-option label="是" value="1"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="35" v-show="state.ruleForm.isExternalLink==1">
+          <el-col :span="24" class="mb20" >
+            <el-form-item label="外部链接" prop="externalLink">
+              <el-input v-model="state.ruleForm.externalLink" placeholder="请输入外部链接" clearable></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="35" v-show="state.ruleForm.isExternalLink==0">
+          <el-col :span="24" class="mb20">
+            <el-form-item label="文章内容" prop="article">
+              <Editor v-model:get-html="state.editor.htmlVal"
+                      v-model:get-text="state.editor.textVal"
+                      :disable="state.editor.disable"
+                      :server="state.editor.server"
+                      :videoServer="state.editor.videoServer"
+                      :field-name="state.editor.fileName"
+                      :max-file-size="state.editor.maxFileSize"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="35">
+          <el-col :span="24" class="mb20">
+            <el-form-item label="排序优先级" prop="articlePriority">
+              <el-input-number v-model="state.ruleForm.articlePriority" :min="1"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="35">
+          <el-col :span="24" class="mb20">
+            <el-form-item label="发布时间" prop="publishTime">
+              <el-date-picker
+                  v-model="state.ruleForm.publishTime"
+                  type="datetime"
+                  placeholder="请选择发布时间"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  time-format="HH:mm:ss"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+      </el-form>
+      <template #footer>
+				<span class="dialog-footer">
+					<el-button @click="onCancel" size="default">取 消</el-button>
+					<el-button type="primary" @click="onSubmit(articleDialogFormRef)" size="default">{{ state.dialog.submitTxt }}</el-button>
+				</span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup lang="ts" name="articleDialog">
+import {nextTick, reactive, ref, defineAsyncComponent, watch} from 'vue';
+import {systemApi} from "/@/api/system";
+import {ElMessage, FormInstance, FormRules} from "element-plus";
+import {useArticleApi} from "/@/api/cms/article";
+import {IEditorConfig} from "@wangeditor/editor";
+
+const {add, edit} = useArticleApi();
+const {orgTree} = systemApi();
+// 定义子组件向父组件传值/事件
+const emit = defineEmits(['refresh']);
+// 定义属性，父传子
+const props = defineProps(['orgId', 'orgTree', 'channelTree']);
+const Editor = defineAsyncComponent(() => import('/@/components/editor/index.vue'));
+// 定义变量内容
+const articleDialogFormRef = ref();
+const state = reactive({
+  sysOrgData: [] as OrgTreeType[],
+  ruleForm: {
+    id: '',
+    orgId: '',
+    channelId: '',
+    channelName: '',
+    articleTitle: '',
+    article: '',
+    // 是否外部链接
+    isExternalLink: 0,
+    externalLink: '',
+    articlePriority: 1,
+    articleDisable: '',
+    publishTime: '',
+    tenantId: '',
+    isDelete: ''
+  },
+  editor: {
+    htmlVal: '',
+    textVal: '',
+    disable: false,
+    server: 'https://www.slkjyun.cn/api/admin/file/editorUpload',
+    videoServer: 'https://www.slkjyun.cn/api/admin/file/editorUploadVideo',
+    fileName: 'file',
+    maxFileSize: 1024 * 1024 * 1024
+  },
+  dialog: {
+    isShowDialog: false,
+    type: '',
+    title: '',
+    submitTxt: '',
+  },
+  sysOrgTreeData: {
+    data: [],
+    total: 0,
+    loading: false,
+    param: {
+      pageNum: 1,
+      pageSize: 2100,
+    },
+  }
+});
+
+const rules = reactive<FormRules<any>>({
+  orgId: [
+    {required: true, message: '请选择栏目所属机构', trigger: 'change'},
+  ],
+  channelId: [
+    {required: true, message: '请选择栏目', trigger: 'change'},
+  ],
+  articleTitle: [
+    {required: true, message: '文章标题不能为空', trigger: 'blur'},
+    {min: 3, max: 30, message: '文章标题长度应该在3到30个字符之间', trigger: 'blur'},
+  ],
+  isExternalLink: [
+    {required: true, message: '请选择是否外部链接', trigger: 'change'},
+  ],
+  article: [],
+  externalLink: [],
+  publishTime: [
+    {required: true, message: '发布时间不能为空', trigger: 'blur'},
+  ],
+  articlePriority: [
+    {required: true, message: '排序优先级不能为空'},
+    {type: 'number', message: '排序优先级必须为数字'},
+  ]
+})
+
+// 监听 isExternalLink 的变化，动态更新 rules
+watch(() => state.ruleForm.isExternalLink, (newVal) => {
+  if (newVal === '0') {
+    rules.article = [
+      {required: true, message: '文章内容不能为空', trigger: 'blur'}
+    ];
+    rules.externalLink = [];
+  } else if (newVal === '1') {
+    rules.externalLink = [
+      {required: true, message: '外部链接不能为空', trigger: 'blur'}
+    ];
+    rules.article = [];
+  }
+});
+
+// 从 UTC 转换为本地时间显示的方法
+const convertToLocalTime = (utcTimeStr: string) => {
+  const date = new Date(utcTimeStr);
+  return date.toLocaleString().replaceAll(/\//g, '-');
+}
+// 打开弹窗
+const openDialog = async (type: string, row: RowCmsArticleType) => {
+  state.ruleForm.orgId = props.orgId;
+  state.sysOrgData = props.orgTree;
+  if (type === 'edit') {
+    state.dialog.title = '修改文章';
+    state.ruleForm = row;
+    state.editor.htmlVal = row.article;
+    if (state.ruleForm.publishTime) {
+      state.ruleForm.publishTime = convertToLocalTime(row.publishTime);
+    } else {
+      state.ruleForm.publishTime = '';
+    }
+  } else {
+    state.dialog.title = '新建文章';
+    // 重置表单和编辑器状态
+    clearForm()
+  }
+
+  // 根据 isExternalLink 的值初始化 rules
+  if (state.ruleForm.isExternalLink === '0') {
+    rules.article = [
+      {required: true, message: '文章内容不能为空', trigger: 'blur'}
+    ];
+    rules.externalLink = [];
+  } else if (state.ruleForm.isExternalLink === '1') {
+    rules.externalLink = [
+      {required: true, message: '外部链接不能为空', trigger: 'blur'}
+    ];
+    rules.article = [];
+  }
+
+  state.dialog.submitTxt = '保存并发布';
+  state.dialog.isShowDialog = true;
+};
+
+const clearForm = () => {
+  state.ruleForm = {
+    id: '',
+    orgId: '',
+    channelId: '',
+    channelName: '',
+    articleTitle: '',
+    article: '',
+    articlePriority: 1,
+    articleDisable: '',
+    publishTime: '',
+    tenantId: '',
+    isDelete: ''
+  }
+  state.editor.htmlVal = '';
+  state.editor.textVal = '';
+}
+
+// 关闭弹窗
+const closeDialog = () => {
+  state.dialog.isShowDialog = false;
+};
+// 取消
+const onCancel = () => {
+  closeDialog();
+};
+// 提交
+const onSubmit = async (formEl: FormInstance | undefined) => {
+  state.ruleForm.article = state.editor.htmlVal;
+  if (!formEl) return
+  await formEl.validate(async (valid, fields) => {
+    if (!valid) {
+      console.log('error submit!!', fields);
+      ElMessage.error('数据校验失败!');
+      return false;
+    }
+    // 根据 isExternalLink 的值动态调整 rules
+    if (state.ruleForm.isExternalLink === 0) {
+      rules.externalLink = [];
+    } else {
+      rules.article = [];
+    }
+    // TODO state.ruleForm.orgId = props.orgId;
+    const res = state.ruleForm.id ? await edit(state.ruleForm) : await add(state.ruleForm)
+    if (res.status === 200) {
+      await nextTick(() => {
+        if (articleDialogFormRef.value) {
+          articleDialogFormRef.value.resetFields();
+        }
+      });
+      ElMessage.success(state.ruleForm.id ? '保存成功' : '保存成功');
+    }
+    closeDialog();
+    emit('refresh');
+    // if (state.dialog.type === 'add') { }
+  });
+};
+
+// 暴露变量
+defineExpose({
+  openDialog,
+});
+</script>
+<style scoped lang="scss">
+.croppers-container {
+  .cropper-img-warp {
+    text-align: center;
+
+    .cropper-img {
+      margin: auto;
+      width: 150px;
+      height: 150px;
+      border-radius: 100%;
+    }
+  }
+}
+</style>
diff --git a/src/views/cms/article/index.vue b/src/views/cms/article/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..8467128f5c3c7f0a09c8dd634a764cd2d9c42871
--- /dev/null
+++ b/src/views/cms/article/index.vue
@@ -0,0 +1,308 @@
+<template>
+  <div class="cms-article-container layout-padding">
+    <el-card shadow="hover" class="layout-padding-auto">
+      <div class="cms-article-search mb15">
+        <el-tree-select
+            v-model="searchState.search.orgId"
+            :data="loadState.sysOrgData"
+            :render-after-expand="true"
+            :default-expanded-keys="defaultExpandedKeys"
+            style="width: 400px"
+            check-strictly
+            filterable
+            @change="orgChange"
+        />
+        <el-tree-select
+            v-model="searchState.search.channelId"
+            :data="loadState.channelTreeData"
+            :render-after-expand="true"
+            style="width: 200px; margin-left: 10px"
+            check-strictly
+            filterable
+            @change="channelTreeChange"
+        />
+        <el-input size="default" placeholder="请输入文章标题" v-model="articleTitle" class="ml10"
+                  style="margin-right:5px;max-width: 200px;height: 40px"></el-input>
+
+        <el-button size="default" type="primary" class="ml10" @click="getTableData">
+          <el-icon>
+            <ele-Search/>
+          </el-icon>
+          查询
+        </el-button>
+        <el-button size="default" type="success" class="ml10" @click="onOpenAdd('add')">
+          <el-icon>
+            <ele-FolderAdd/>
+          </el-icon>
+          新增
+        </el-button>
+      </div>
+      <el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%" stripe>
+        <el-table-column type="index" label="序号" width="100"/>
+        <el-table-column prop="articleTitle" label="文章标题" show-overflow-tooltip width="400"></el-table-column>
+        <el-table-column prop="channelName" label="所属栏目" show-overflow-tooltip width="160"></el-table-column>
+        <el-table-column prop="articleDisable" label="发布状态" show-overflow-tooltip width="130">
+          <template #default="scope">
+            <el-tag type="success" v-if="scope.row.articleDisable==0">已发布</el-tag>
+            <el-tag type="info" v-else>停止发布</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="publishTime" label="发布时间" show-overflow-tooltip width="180"></el-table-column>
+
+        <el-table-column prop="articlePriority" label="优先级" show-overflow-tooltip width="120"></el-table-column>
+        <el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip width="180"></el-table-column>
+        <el-table-column label="操作" >
+          <template #default="scope">
+            <el-button  size="small" type="primary"
+                       @click="onOpenEdit('edit', scope.row)">
+              修改
+            </el-button>
+            <!--            <el-button :disabled="scope.row.userName === 'admin'" size="small" text type="primary"-->
+            <!--                       @click="onRowTopping(scope.row)">-->
+            <!--              置顶-->
+            <!--            </el-button>-->
+            <el-button
+                v-if="scope.row.articleDisable==0"
+                size="small" type="warning"
+                @click="onRowStopPublish(scope.row)">
+              停止发布
+            </el-button>
+            <el-button
+                v-if="scope.row.articleDisable==1"
+                size="small" type="primary"
+                @click="onRowPublish(scope.row)">
+              重新发布
+            </el-button>
+            <el-button size="small" type="danger"
+                       @click="onRowDel(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="[100, 200, 500]"
+          v-model:current-page="state.tableData.param.pageNum"
+          background
+          v-model:page-size="state.tableData.param.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="state.tableData.total"
+      >
+      </el-pagination>
+    </el-card>
+    <ArticleDialog ref="articleDialogRef"
+                   @refresh="getTableData()"
+                   :orgId="searchState.search.orgId"
+                   :orgTree="loadState.sysOrgData"
+                   :channelTree="loadState.channelTreeData"
+    />
+  </div>
+</template>
+
+<script setup lang="ts" name="articleIndex">
+import {defineAsyncComponent, reactive, onMounted, ref} from 'vue';
+import {ElMessageBox, ElMessage} from 'element-plus';
+import {useArticleApi} from "/@/api/cms/article";
+import {useChannelApi} from "/@/api/cms/channel";
+import {systemApi} from "/@/api/system";
+
+const {listByPage, add, edit, removeById, topping, shelf} = useArticleApi();
+const {orgTree, orgAreaTree} = systemApi();
+const {channelTree} = useChannelApi();
+// 引入组件
+const ArticleDialog = defineAsyncComponent(() => import('/src/views/cms/article/dialog.vue'));
+const articleTitle = ref('');
+// 定义变量内容
+const articleDialogRef = ref();
+const defaultExpandedKeys = ref<string[]>([]); // 新增默认展开的节点
+const state = reactive<CmsArticleState>({
+  tableData: {
+    data: [],
+    total: 0,
+    loading: false,
+    param: {
+      pageNum: 1,
+      pageSize: 10,
+    },
+  },
+});
+
+const searchState = ref<any>({
+  search: {
+    orgId: '',
+    channelId: ''
+  }
+});
+const loadState = ref<any>({
+  sysOrgData: [],
+  channelTreeData: [],
+});
+
+const orgChange = async (val: string) => {
+  if (val) {
+    searchState.value.search.orgId = val;
+    await loadChannelTree();
+    await getTableData();
+  }
+}
+
+const channelTreeChange = async (val: string) => {
+  if (val) {
+    searchState.value.search.channelId = val;
+    await getTableData();
+  }
+}
+
+// 初始化表格数据
+const getTableData = async () => {
+  state.tableData.loading = true;
+  const data = [];
+  const res = await listByPage({
+    current: state.tableData.param.pageNum,
+    pageSize: state.tableData.param.pageSize,
+    articleTitle: articleTitle.value,
+    orgId: searchState.value.search.orgId,
+    channelId: searchState.value.search.channelId
+  });
+  if (res.status === 200) {
+    data.push(...res.data.records);
+    state.tableData.data = data;
+    state.tableData.total = res.data.total;
+    state.tableData.loading = false;
+  }
+};
+
+const loadOrgTree = async () => {
+  const res = await orgAreaTree();
+  if (res.status === 200) {
+    loadState.value.sysOrgData = res.data;
+    // 设置默认展开的节点为第一个节点的ID
+    if (loadState.value.sysOrgData.length > 0) {
+      defaultExpandedKeys.value = [loadState.value.sysOrgData[0].id];
+    }
+  }
+};
+const loadChannelTree = async () => {
+  if (searchState.value.search.orgId) {
+    const res = await channelTree({orgId: searchState.value.search.orgId});
+    if (res.status === 200) {
+      loadState.value.channelTreeData = res.data;
+    }
+  }
+};
+// 打开新增弹窗
+const onOpenAdd = (type: string) => {
+  articleDialogRef.value.openDialog(type);
+};
+// 打开修改弹窗
+const onOpenEdit = (type: string, row: RowCmsArticleType) => {
+  console.log('edit', row.orgId)
+  articleDialogRef.value.openDialog(type, row);
+};
+// 删除
+const onRowDel = (row: RowCmsArticleType) => {
+  ElMessageBox.confirm(`确定要删除标题为：“${row.articleTitle}的文章吗？”，是否继续?`, '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    const res = await removeById({id: row.id})
+    if (res.status === 200) {
+      await getTableData();
+      ElMessage.success('删除成功');
+    }
+  }).catch(() => {
+  });
+};
+
+// 置顶
+const onRowTopping = (row: RowCmsArticleType) => {
+  ElMessageBox.confirm(`确定要置顶名称为：${row.articleTitle}的文章吗？`, '提示', {
+    confirmButtonText: '置顶',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    const res = await topping({
+      id: row.id
+    })
+    if (res.status === 200) {
+      ElMessage.success('置顶成功');
+      await getTableData();
+    } else {
+      ElMessage.error('置顶失败');
+    }
+  })
+}
+
+/**
+ * 停止发布
+ * @param row
+ */
+const onRowStopPublish = (row: RowCmsArticleType) => {
+  ElMessageBox.confirm(`确定要 停止发布 名称为：${row.articleTitle}的文章吗？`, '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    const res = await shelf({
+      id: row.id,
+      shelfOp: 1,
+    })
+    if (res.status === 200) {
+      ElMessage.success('停止发布成功');
+      await getTableData();
+    } else {
+      ElMessage.error('停止发布失败');
+    }
+  })
+}
+
+const onRowPublish = async (row: RowCmsArticleType) => {
+  const res = await shelf({
+    id: row.id,
+    shelfOp: 0,
+  })
+  if (res.status === 200) {
+    ElMessage.success('重新发布成功');
+    await getTableData();
+  } else {
+    ElMessage.error('重新发布失败');
+  }
+}
+
+// 分页改变
+const onHandleSizeChange = (val: number) => {
+  state.tableData.param.pageSize = val;
+  getTableData();
+};
+// 分页改变
+const onHandleCurrentChange = (val: number) => {
+  state.tableData.param.pageNum = val;
+  getTableData();
+};
+// 页面加载时
+onMounted(async () => {
+  await getTableData();
+  await loadOrgTree();
+  await loadChannelTree()
+});
+</script>
+
+<style scoped lang="scss">
+.system-user-container {
+  :deep(.el-card__body) {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    overflow: auto;
+
+    .el-table {
+      flex: 1;
+    }
+  }
+}
+</style>
diff --git a/src/views/cms/banner/dialog.vue b/src/views/cms/banner/dialog.vue
new file mode 100644
index 0000000000000000000000000000000000000000..ef1dd5dc8de9959a815761b86d17dc85f3430f87
--- /dev/null
+++ b/src/views/cms/banner/dialog.vue
@@ -0,0 +1,300 @@
+<template>
+  <div class="system-user-dialog-container">
+    <el-dialog :title="state.dialog.title" v-model="state.dialog.isShowDialog" width="1000px">
+      <el-form ref="bannerDialogFormRef" :model="state.ruleForm" :rules="rules" size="default" label-width="auto">
+
+        <el-row :gutter="35">
+          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+            <el-form-item label="轮播图" prop="bannerUrl">
+              <el-input type="hidden" v-model="state.ruleForm.bannerUrl" placeholder="请输入" clearable></el-input>
+              <el-upload
+                  v-model:file-list="fileList"
+                  list-type="picture-card"
+                  action="https://www.slkjyun.cn/api/admin/file/upload"
+                  :on-success="handleAvatarSuccess"
+                  :before-upload="beforeAvatarUpload"
+                  :on-preview="handlePictureCardPreview"
+                  :on-remove="handleRemove"
+              >
+                <el-icon>
+                  <Plus/>
+                </el-icon>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="35">
+          <el-col :span="24" class="mb20">
+            <el-form-item label="所属机构" prop="orgId">
+              <el-tree-select
+                  v-model="state.ruleForm.orgId"
+                  :data="props.orgTree??[]"
+                  :render-after-expand="false"
+                  style="width: 500px"
+                  check-strictly
+                  filterable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="35">
+          <el-col :span="24" class="mb20">
+            <el-form-item label="轮播图标题" prop="bannerTitle">
+              <el-input v-model="state.ruleForm.bannerTitle"
+                        placeholder="请输入轮播图标题"
+                        clearable>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="35">
+          <el-col :span="24" class="mb20">
+            <el-form-item label="轮播优先级" prop="bannerPriority">
+              <el-input-number v-model="state.ruleForm.bannerPriority" :min="1"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="35">
+          <el-col :span="24" class="mb20">
+            <el-form-item label="轮播图跳转链接" prop="linkUrl">
+              <el-input v-model="state.ruleForm.linkUrl" placeholder="请输入轮播图跳转链接" clearable></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+      </el-form>
+      <template #footer>
+				<span class="dialog-footer">
+					<el-button @click="onCancel" size="default">取 消</el-button>
+					<el-button type="primary" @click="onSubmit(bannerDialogFormRef)" size="default">{{ state.dialog.submitTxt }}</el-button>
+				</span>
+      </template>
+    </el-dialog>
+
+    <el-dialog v-model="dialogVisible">
+      <img w-full h-full style="width: 100%;height: 100%" :src="dialogImageUrl" alt="Preview Image"/>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script setup lang="ts" name="BannerDialog">
+import {nextTick, reactive, ref} from 'vue';
+import {systemApi} from "/@/api/system";
+import type {UploadProps, UploadUserFile} from 'element-plus'
+import {ElMessage, FormInstance, FormRules} from "element-plus";
+import {useBannerApi} from "/@/api/cms/banner";
+import {Plus} from "@element-plus/icons-vue";
+
+const {add, edit} = useBannerApi();
+
+const {orgTree} = systemApi();
+// 定义子组件向父组件传值/事件
+const emit = defineEmits(['refresh']);
+// 定义属性，父传子
+const props = defineProps(['orgId', 'orgTree', 'channelTree']);
+// 定义变量内容
+const bannerDialogFormRef = ref();
+const state = reactive({
+  sysOrgData: [] as OrgTreeType[],
+  ruleForm: {
+    id: '',
+    orgId: '',
+    bannerUrl: '',
+    bannerTitle: '',
+    bannerPriority: '',
+    bannerDisable: '',
+    tenantId: '',
+    isDelete: '',
+    linkUrl: ''
+  },
+  editor: {
+    htmlVal: '',
+    textVal: '',
+    disable: false,
+  },
+  dialog: {
+    isShowDialog: false,
+    type: '',
+    title: '',
+    submitTxt: '',
+  },
+  sysOrgTreeData: {
+    data: [],
+    total: 0,
+    loading: false,
+    param: {
+      pageNum: 1,
+      pageSize: 2100,
+    },
+  }
+});
+
+const rules = reactive<FormRules<any>>({
+  orgId: [
+    {required: true, message: '请选择栏目区域', trigger: 'change'},
+  ],
+  bannerUrl: [
+    {required: true, message: '请上传幻灯片图片不能为空', trigger: 'blur'},
+  ],
+  bannerTitle: [
+    {required: true, message: '幻灯片标题不能为空', trigger: 'blur'},
+    {min: 3, max: 40, message: '幻灯片标题长度应该在3到40个字符之间', trigger: 'blur'},
+  ],
+  bannerPriority: [
+    {required: true, message: '栏目序号不能为空'},
+    {type: 'number', message: '栏目序号必须为数字'},
+  ]
+})
+
+// 打开弹窗
+const openDialog = async (type: string, row: RowCmsBannerType) => {
+  state.ruleForm.orgId = props.orgId;
+  if (type === 'edit') {
+    state.dialog.title = '修改轮播图';
+    state.ruleForm = row;
+    fileList.value = [];
+    fileList.value.push({name: row.bannerUrl, url: row.bannerUrl})
+    console.log('update', state.ruleForm)
+  } else {
+    state.dialog.title = '新建录播图';
+    state.ruleForm.bannerTitle = '';
+    fileList.value = [];
+    clearForm();
+    console.log('new', state.ruleForm)
+    // await nextTick(() => {
+    //   if (bannerDialogFormRef.value) {
+    //     bannerDialogFormRef.value.resetFields();
+    //   }
+    // });
+  }
+  state.dialog.submitTxt = '保存并发布';
+  state.dialog.isShowDialog = true;
+};
+// 关闭弹窗
+const closeDialog = async () => {
+  state.dialog.isShowDialog = false;
+  await nextTick(() => {
+    if (bannerDialogFormRef.value) {
+      console.log('bannerDialogFormRef', bannerDialogFormRef.value)
+      bannerDialogFormRef.value.resetFields();
+    }
+  });
+};
+// 取消
+const onCancel = () => {
+  closeDialog();
+};
+// 提交
+const onSubmit = async (formEl: FormInstance | undefined) => {
+  if (!formEl) return
+  await formEl.validate(async (valid, fields) => {
+    if (!valid) {
+      console.log('error submit!!', fields);
+      ElMessage.error('数据校验失败!');
+      return false;
+    }
+    state.ruleForm.orgId = props.orgId;
+    const res = state.ruleForm.id ? await edit(state.ruleForm) : await add(state.ruleForm)
+    if (res.status === 200) {
+      await nextTick(() => {
+        if (bannerDialogFormRef.value) {
+          console.log('bannerDialogFormRef', bannerDialogFormRef.value)
+          bannerDialogFormRef.value.resetFields();
+        }
+      });
+      ElMessage.success(state.ruleForm.id ? '保存成功' : '保存成功');
+    }
+    closeDialog();
+    emit('refresh');
+    // if (state.dialog.type === 'add') { }
+  });
+};
+
+const clearForm = () => {
+  state.ruleForm.id = '';
+  state.ruleForm.orgId = '';
+  state.ruleForm.bannerUrl = '';
+  state.ruleForm.bannerTitle = '';
+  state.ruleForm.bannerPriority = '';
+  state.ruleForm.bannerDisable = '';
+  state.ruleForm.tenantId = '';
+  state.ruleForm.isDelete = '';
+  state.ruleForm.linkUrl = '';
+  state.ruleForm = {
+    id: '',
+    orgId: '',
+    bannerUrl: '',
+    bannerTitle: '',
+    bannerPriority: '',
+    bannerDisable: '',
+    tenantId: '',
+    isDelete: '',
+    linkUrl: ''
+  }
+}
+
+const fileList = ref<UploadUserFile[]>([])
+
+const imageUrl = ref('')
+
+const handleAvatarSuccess: UploadProps['onSuccess'] = (
+    response,
+    uploadFile
+) => {
+  imageUrl.value = URL.createObjectURL(uploadFile.raw!)
+  state.ruleForm.bannerUrl = response.data
+}
+
+const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
+
+  if (fileList.value.length === 1) {
+    ElMessage.error('只能上传一张图片!')
+    return false
+  }
+
+  if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/png') {
+    ElMessage.error('必须为png或jpeg格式的图片!')
+    return false
+  } else if (rawFile.size / 1024 / 1024 > 2) {
+    ElMessage.error('图片大小不能超过2MB!')
+    return false
+  }
+  return true
+}
+
+const dialogImageUrl = ref('')
+const dialogVisible = ref(false)
+
+const handleRemove: UploadProps['onRemove'] = (uploadFile, uploadFiles) => {
+  console.log(uploadFile, uploadFiles)
+}
+
+const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => {
+  dialogImageUrl.value = uploadFile.url!
+  dialogVisible.value = true
+}
+
+// 暴露变量
+defineExpose({
+  openDialog,
+});
+</script>
+<style scoped lang="scss">
+.croppers-container {
+  .cropper-img-warp {
+    text-align: center;
+
+    .cropper-img {
+      margin: auto;
+      width: 150px;
+      height: 150px;
+      border-radius: 100%;
+    }
+  }
+}
+</style>
diff --git a/src/views/cms/banner/index.vue b/src/views/cms/banner/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..186231a982e4755ccde9112673d39faf3313c55f
--- /dev/null
+++ b/src/views/cms/banner/index.vue
@@ -0,0 +1,275 @@
+<template>
+  <div class="cms-article-container layout-padding">
+    <el-card shadow="hover" class="layout-padding-auto">
+      <div class="cms-article-search mb15">
+        <el-tree-select
+            v-model="searchState.search.orgId"
+            :data="loadState.sysOrgData"
+            :render-after-expand="true"
+            :default-expanded-keys="defaultExpandedKeys"
+            style="width: 500px"
+            check-strictly
+            filterable
+            @change="orgChange"
+        />
+        <el-input size="default" placeholder="请输入文章标题" v-model="bannerDesc" class="ml10"
+                  style="margin-right:5px;max-width: 200px; height: 40px"></el-input>
+        <el-button size="default" type="primary" class="ml10" @click="getTableData">
+          <el-icon>
+            <ele-Search/>
+          </el-icon>
+          查询
+        </el-button>
+        <el-button size="default" type="success" class="ml10" @click="onOpenAdd('add')">
+          <el-icon>
+            <ele-FolderAdd/>
+          </el-icon>
+          新增
+        </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="bannerTitle" label="轮播图标题" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="bannerUrl" label="轮播图" show-overflow-tooltip>
+          <template #default="scope">
+            <el-image
+                style="width: 200px; height: 100px"
+                :src="scope.row.bannerUrl"
+                :preview-src-list="[scope.row.bannerUrl]"
+            ></el-image>
+          </template>
+        </el-table-column>
+        <el-table-column prop="bannerDisable" label="发布状态" width="120" show-overflow-tooltip>
+          <template #default="scope">
+            <el-tag type="success" v-if="scope.row.bannerDisable==0">已发布</el-tag>
+            <el-tag type="info" v-else>停止发布</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="bannerPriority" label="优先级" width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip></el-table-column>
+        <el-table-column label="操作" width="300">
+          <template #default="scope">
+            <el-button  size="small" type="primary"
+                       @click="onOpenEdit('edit', scope.row)">修改
+            </el-button>
+            <el-button  size="small" type="warning"
+                       @click="onRowTopping(scope.row)">置顶
+            </el-button>
+            <el-button  v-if="scope.row.bannerDisable==0" size="small"
+                       type="info" @click="onRowStopPublish(scope.row)">停止发布
+            </el-button>
+<!--            :disabled="scope.row.userName === 'admin'"-->
+            <el-button  v-if="scope.row.bannerDisable==1" size="small"
+                       type="primary" @click="onRowPublish(scope.row)">重新发布
+            </el-button>
+            <el-button size="small" type="danger"
+                       @click="onRowDel(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="[100, 200, 500]"
+          v-model:current-page="state.tableData.param.pageNum"
+          background
+          v-model:page-size="state.tableData.param.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="state.tableData.total"
+      >
+      </el-pagination>
+    </el-card>
+    <BannerDialog ref="BannerDialogRef"
+                  @refresh="getTableData()"
+                  :orgId="searchState.search.orgId"
+                  :orgTree="loadState.sysOrgData"
+    />
+  </div>
+</template>
+
+<script setup lang="ts" name="articleIndex">
+import {defineAsyncComponent, reactive, onMounted, ref} from 'vue';
+import {ElMessageBox, ElMessage} from 'element-plus';
+import {systemApi} from "/@/api/system";
+import {useBannerApi} from "/@/api/cms/banner";
+
+const {listByPage, add, edit, removeById, topping, shelf} = useBannerApi();
+const {orgTree, orgAreaTree} = systemApi();
+// 引入组件
+const BannerDialog = defineAsyncComponent(() => import('/src/views/cms/banner/dialog.vue'));
+const bannerDesc = ref('');
+// 定义变量内容
+const BannerDialogRef = ref();
+const defaultExpandedKeys = ref<string[]>([]); // 新增默认展开的节点
+const state = reactive<CmsArticleState>({
+  tableData: {
+    data: [],
+    total: 0,
+    loading: false,
+    param: {
+      pageNum: 1,
+      pageSize: 10,
+    },
+  },
+});
+
+const searchState = ref<any>({
+  search: {
+    orgId: '',
+  }
+});
+const loadState = ref<any>({
+  sysOrgData: [],
+  channelTreeData: [],
+});
+
+const orgChange = (val: string) => {
+  if (val) {
+    searchState.value.search.orgId = val;
+    getTableData();
+  }
+}
+
+// 初始化表格数据
+const getTableData = async () => {
+  state.tableData.loading = true;
+  const data = [];
+  const res = await listByPage({
+    current: state.tableData.param.pageNum,
+    pageSize: state.tableData.param.pageSize,
+    bannerDesc: bannerDesc.value,
+    orgId: searchState.value.search.orgId,
+  });
+  if (res.status === 200) {
+    data.push(...res.data.records);
+  }
+  state.tableData.data = data;
+  state.tableData.total = res.data.total;
+  state.tableData.loading = false;
+};
+
+const loadOrgTree = async () => {
+  const res = await orgAreaTree();
+  if (res.status === 200) {
+    loadState.value.sysOrgData = res.data;
+    // 设置默认展开的节点为第一个节点的ID
+    if (loadState.value.sysOrgData.length > 0) {
+      defaultExpandedKeys.value = [loadState.value.sysOrgData[0].id];
+    }
+  }
+};
+
+// 打开新增弹窗
+const onOpenAdd = (type: string) => {
+  BannerDialogRef.value.openDialog(type);
+};
+// 打开修改弹窗
+const onOpenEdit = (type: string, row: RowCmsBannerType) => {
+  console.log('edit', row.orgId)
+  BannerDialogRef.value.openDialog(type, row);
+};
+
+// 置顶
+const onRowTopping = (row: RowCmsBannerType) => {
+  ElMessageBox.confirm(`确定要置顶名称为：${row.bannerTitle}的文章吗？`, '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    const res = await topping({
+      id: row.id
+    })
+    if (res.status === 200) {
+      ElMessage.success('置顶成功');
+      await getTableData();
+    } else {
+      ElMessage.error('置顶失败');
+    }
+  })
+}
+
+/**
+ * 停止发布
+ * @param row
+ */
+const onRowStopPublish = (row: RowCmsBannerType) => {
+  ElMessageBox.confirm(`确定要 停止发布 名称为：${row.bannerTitle}的文章吗？`, '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    const res = await shelf({
+      id: row.id,
+      shelfOp: 1,
+    })
+    if (res.status === 200) {
+      ElMessage.success('停止发布成功');
+      await getTableData();
+    } else {
+      ElMessage.error('停止发布失败');
+    }
+  })
+}
+
+const onRowPublish = async (row: RowCmsBannerType) => {
+  const res = await shelf({
+    id: row.id,
+    shelfOp: 0,
+  })
+  if (res.status === 200) {
+    ElMessage.success('重新发布成功');
+    await getTableData();
+  } else {
+    ElMessage.error('重新发布失败');
+  }
+}
+
+// 删除
+const onRowDel = (row: RowCmsBannerType) => {
+  ElMessageBox.confirm(`确定要删除标题为：“${row.bannerTitle}的应用吗？”，是否继续?`, '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    const res = await removeById({id: row.id})
+    if (res.status === 200) {
+      await getTableData();
+      ElMessage.success('删除成功');
+    }
+  })
+      .catch(() => {
+      });
+};
+// 分页改变
+const onHandleSizeChange = (val: number) => {
+  state.tableData.param.pageSize = val;
+  getTableData();
+};
+// 分页改变
+const onHandleCurrentChange = (val: number) => {
+  state.tableData.param.pageNum = val;
+  getTableData();
+};
+// 页面加载时
+onMounted(async () => {
+  await loadOrgTree();
+});
+</script>
+
+<style scoped lang="scss">
+.system-user-container {
+  :deep(.el-card__body) {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    overflow: auto;
+
+    .el-table {
+      flex: 1;
+    }
+  }
+}
+</style>
diff --git a/src/views/cms/channel/dialog.vue b/src/views/cms/channel/dialog.vue
new file mode 100644
index 0000000000000000000000000000000000000000..4164cd574da0ec333d8082ec4d47b6243d7df161
--- /dev/null
+++ b/src/views/cms/channel/dialog.vue
@@ -0,0 +1,190 @@
+<template>
+  <div class="cms-channel-dialog-container">
+    <el-dialog :title="state.dialog.title" v-model="state.dialog.isShowDialog" width="769px">
+      <el-form ref="cmsChannelDialogFormRef" :model="state.ruleForm" :rules="rules" size="default" label-width="90px">
+        <el-row :gutter="35">
+          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
+            <el-form-item label="所属机构" prop="orgId">
+              <el-tree-select
+                  v-model="state.ruleForm.orgId"
+                  :data="state.sysOrgData"
+                  :render-after-expand="false"
+                  style="width: 500px"
+                  check-strictly
+                  filterable
+                  @change="orgChange"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" style="display: none">
+            <el-form-item label="上级栏目" prop="parentId">
+              <el-tree-select
+                  v-model="state.ruleForm.parentId"
+                  :data="state.channelTreeData"
+                  :render-after-expand="true"
+                  style="width: 500px"
+                  check-strictly
+                  filterable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+            <el-form-item label="栏目名称" prop="channelName">
+              <el-input v-model="state.ruleForm.channelName" 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="排序" prop="channelOrder">
+              <el-input-number v-model="state.ruleForm.channelOrder" :min="0" :max="999" controls-position="right"
+                               placeholder="请输入排序" class="w100"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+				<span class="dialog-footer">
+					<el-button @click="onCancel" size="default">取 消</el-button>
+					<el-button type="primary" @click="onSubmit(cmsChannelDialogFormRef)" size="default">{{ state.dialog.submitTxt }}</el-button>
+				</span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup lang="ts" name="channelDialog">
+import {nextTick, onMounted, reactive, ref} from 'vue';
+import {ElMessage, FormInstance, FormRules} from "element-plus";
+import {useChannelApi} from "/@/api/cms/channel";
+import {systemApi} from "/@/api/system";
+
+// 定义子组件向父组件传值/事件
+const emit = defineEmits(['refresh']);
+const props = defineProps(['orgId', 'orgTree', 'channelTree']);
+const {add, edit, channelTree} = useChannelApi();
+const {orgTree} = systemApi();
+const orgChange = async (val: string) => {
+  if (val) {
+    state.ruleForm.orgId = val;
+    await loadChannelTree();
+  }
+};
+// 定义变量内容
+const cmsChannelDialogFormRef = ref();
+const state = reactive({
+  ruleForm: {
+    id: '',
+    orgId: '',
+    channelName: '',
+    channelOrder: 1,
+    parentId: '0',
+    tenantId: '',
+  },
+  sysOrgData: [] as OrgTreeType[], // 机构数据
+  channelTreeData: [] as OrgTreeType[], // 栏目数据
+  dialog: {
+    isShowDialog: false,
+    type: '',
+    title: '',
+    submitTxt: '',
+  }
+});
+const loadChannelTree = async () => {
+  if (props.orgId) {
+    const res = await channelTree({orgId: props.orgId});
+    if (res.status === 200) {
+      state.channelTreeData = res.data;
+    }
+  }
+};
+
+const clearForm = () => {
+  state.ruleForm = {
+    id: '',
+    orgId: '',
+    channelName: '',
+    channelOrder: 1,
+    parentId: '0',
+    tenantId: '',
+  }
+}
+
+onMounted(async () => {
+  await loadChannelTree()
+})
+
+// 打开弹窗
+const openDialog = async (type: string, row: RowCmsChannelType) => {
+  state.sysOrgData = props.orgTree;
+  if (type === 'edit') {
+    state.dialog.title = '修改栏目';
+    state.dialog.submitTxt = '修 改';
+    state.ruleForm = row;
+    state.ruleForm.channelName = row.label;
+    state.ruleForm.channelOrder = row.orderNo;
+    state.ruleForm.orgId = props.orgId;
+    console.log('update', state.ruleForm)
+  } else {
+    state.dialog.title = '新增机构';
+    state.dialog.submitTxt = '新 增';
+    clearForm()
+    // 清空表单，此项需加表单验证才能使用
+    // await nextTick(() => {
+    //   if (cmsChannelDialogFormRef.value) {
+    //     cmsChannelDialogFormRef.value.resetFields();
+    //   }
+    // });
+  }
+  state.dialog.isShowDialog = true;
+};
+// 关闭弹窗
+const closeDialog = () => {
+  state.dialog.isShowDialog = false;
+};
+// 取消
+const onCancel = () => {
+  closeDialog();
+};
+
+const rules = reactive<FormRules<any>>({
+  orgId: [
+    {required: true, message: '请选择栏目所属机构(教育局)', trigger: 'change'},
+  ],
+  channelName: [
+    {required: true, message: '栏目名称不能为空', trigger: 'blur'},
+    {min: 3, max: 10, message: '栏目名称长度应该在3到10个字符之间', trigger: 'blur'},
+  ],
+  channelOrder: [
+    {required: true, message: '栏目序号不能为空'},
+    {type: 'number', message: '栏目序号必须为数字'},
+  ],
+  // parentId: [
+  //   {required: true, message: '上级栏目不能为空', trigger: 'blur'},
+  //   {min: 3, max: 50, message: '应用描述长度,至少3个字符，最多50个字符', trigger: 'blur'},
+  // ]
+})
+
+// 提交
+const onSubmit = async (formEl: FormInstance | undefined) => {
+  if (!formEl) return
+  await formEl.validate(async (valid, fields) => {
+    if (!valid) {
+      console.log('error submit!!', fields);
+      ElMessage.error('数据校验失败!');
+      return false;
+    }
+    const res = await state.ruleForm.id ? await edit(state.ruleForm) : await add(state.ruleForm)
+    if (res.status === 200) {
+      ElMessage.success('保存成功');
+      await loadChannelTree()
+    }
+    closeDialog();
+    emit('refresh');
+    // if (state.dialog.type === 'add') { }
+  });
+};
+
+// 暴露变量
+defineExpose({
+  openDialog,
+});
+</script>
diff --git a/src/views/cms/channel/index.vue b/src/views/cms/channel/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..918729776911f868fbf75c1d9935f7f9fdc06c45
--- /dev/null
+++ b/src/views/cms/channel/index.vue
@@ -0,0 +1,157 @@
+<template>
+  <div class="cms-channel-container layout-padding">
+    <el-card shadow="hover" class="layout-padding-auto">
+      <div class="cms-channel-search mb15">
+        <el-tree-select
+            v-model="state.search.orgId"
+            :data="state.sysOrgData"
+            :render-after-expand="true"
+            :default-expanded-keys="defaultExpandedKeys"
+            style="width: 500px"
+            check-strictly
+            filterable
+            @change="orgChange"
+        />
+        <el-button size="default" type="success" class="ml10" @click="onOpenAdd('add')">
+          <el-icon>
+            <ele-FolderAdd/>
+          </el-icon>
+          新增栏目
+        </el-button>
+      </div>
+      <el-table
+          :data="state.tableData.data"
+          v-loading="state.tableData.loading"
+          style="width: 100%"
+          row-key="id"
+          :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+          :default-expand-all="true"
+          max-height="700"
+          stripe
+      >
+        <el-table-column prop="label" label="栏目名称" show-overflow-tooltip width="300"></el-table-column>
+        <el-table-column prop="orderNo" label="排序" show-overflow-tooltip width="180">
+          <!--					<template #default="scope">-->
+          <!--						{{ scope.$index }}-->
+          <!--					</template>-->
+        </el-table-column>
+        <el-table-column prop="isDelete" label="状态" show-overflow-tooltip width="200">
+          <template #default="scope">
+            <el-tag type="success" v-if="scope.row.isDelete==0">启用</el-tag>
+            <el-tag type="info" v-else>禁用</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip width="200"></el-table-column>
+        <el-table-column prop="gmtModified" label="修改时间" show-overflow-tooltip width="200"></el-table-column>
+				<el-table-column label="操作" show-overflow-tooltip >
+					<template #default="scope">
+<!--						<el-button size="small" text type="primary" @click="onOpenAdd('add')">新增</el-button>-->
+						<el-button size="small" type="primary" @click="onOpenEdit('edit', scope.row)">修改</el-button>
+						<el-button size="small" type="danger" @click="onTableRowDel(scope.row)" :disabled="scope.row.children.length != 0">删除</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+		</el-card>
+		<channelDialog ref="channelDialogRef" @refresh="getTableData()" :orgId="state.search.orgId" :orgTree="state.sysOrgData"/>
+	</div>
+</template>
+
+<script setup lang="ts" name="cmsChannelScript">
+import {defineAsyncComponent, ref, reactive, onMounted} from 'vue';
+import {ElMessageBox, ElMessage} from 'element-plus';
+import {useChannelApi} from "/@/api/cms/channel";
+const {channelTree, removeById} = useChannelApi();
+import {systemApi} from "/@/api/system";
+const {orgTree, orgAreaTree} = systemApi();
+// 引入组件
+const channelDialog = defineAsyncComponent(() => import('/@/views/cms/channel/dialog.vue'));
+
+// 定义变量内容
+const channelDialogRef = ref();
+const defaultExpandedKeys = ref<string[]>([]); // 新增默认展开的节点
+const state = reactive({
+  search: {
+    orgId: '',
+  },
+  sysOrgData: [],
+  tableData: {
+    data: [],
+    total: 0,
+    loading: false,
+    param: {
+      pageNum: 1,
+      pageSize: 2100,
+    },
+  },
+});
+
+// 在加载数据时设置默认展开的节点
+const loadOrgTree = async () => {
+  const res = await orgAreaTree();
+  if (res.status === 200) {
+    state.sysOrgData = res.data;
+    // 设置默认展开的节点为第一个节点的ID
+    if (state.sysOrgData.length > 0) {
+      defaultExpandedKeys.value = [state.sysOrgData[0].id];
+    }
+  }
+};
+
+const orgChange = async (val: string) => {
+  console.log('val', val)
+  if (val) {
+    state.search.orgId = val;
+    await getTableData();
+  }
+};
+
+// 初始化表格数据
+const getTableData = async () => {
+  console.log('orgId', state.search.orgId)
+  state.tableData.loading = true;
+  state.tableData.data = [];
+  if (state.search.orgId) {
+    const res = await channelTree({orgId: state.search.orgId})
+    if (res.status === 200) {
+      //console.log(res.data);
+      state.tableData.data = res.data;
+      state.tableData.loading = false;
+    }
+    state.tableData.total = state.tableData.data.length;
+  }
+};
+// 打开新增菜单弹窗
+const onOpenAdd = (type: string) => {
+
+  channelDialogRef.value.openDialog(type, {});
+};
+// 打开编辑菜单弹窗
+const onOpenEdit = (type: string, row: RowCmsChannelType) => {
+  channelDialogRef.value.openDialog(type, row);
+};
+
+const onTableRowDel = (row: OrgTreeType) => {
+	ElMessageBox.confirm(`确定要删除名称为：${row.label}的栏目吗？`, '提示', {
+		confirmButtonText: '删除',
+		cancelButtonText: '取消',
+		type: 'warning',
+	})
+		.then( async () => {
+      const res = await removeById({id:row.id})
+      //console.log(res)
+      if (res.status === 200) {
+        ElMessage.success('删除成功');
+        await getTableData();
+      } else {
+        ElMessage.error('删除失败');
+      }
+
+    })
+		.catch(() => {});
+};
+
+// 页面加载时
+onMounted(async () => {
+  await loadOrgTree();
+});
+</script>
diff --git a/src/views/error/404.vue b/src/views/error/404.vue
index 0c1ed44d700eb9191010dbfd810ec6a31a09f167..9e139255978feac36dfdd5ff29651be2768d648a 100644
--- a/src/views/error/404.vue
+++ b/src/views/error/404.vue
@@ -13,7 +13,7 @@
 					</div>
 				</div>
 				<div class="right">
-					<img src="https://i.hd-r.cn/1a0d90a6c1e8b0184c7299dda713effd.png" />
+<!--					<img src="https://i.hd-r.cn/1a0d90a6c1e8b0184c7299dda713effd.png" />-->
 				</div>
 			</div>
 		</div>
diff --git a/src/views/login/component/SmsSecondCheck.vue b/src/views/login/component/SmsSecondCheck.vue
new file mode 100644
index 0000000000000000000000000000000000000000..795daf3b6a1e98e11a9435af0fb4cb069baa8f9b
--- /dev/null
+++ b/src/views/login/component/SmsSecondCheck.vue
@@ -0,0 +1,124 @@
+<template>
+  <el-dialog  v-model="state.isShowDialog" width="350px">
+  <el-form size="large" class="login-content-form">
+    <el-form-item class="login-animation1">
+      <el-input text :placeholder="$t('message.mobile.placeholder1')" v-model="state.userNameShow" clearable autocomplete="off" disabled>
+        <template #prefix>
+          <i class="iconfont icon-dianhua el-input__icon"></i>
+        </template>
+      </el-input>
+    </el-form-item>
+    <el-form-item class="login-animation2">
+      <el-col :span="15">
+        <el-input text maxlength="4" :placeholder="$t('message.mobile.placeholder2')" v-model="state.ruleForm.code" clearable autocomplete="off">
+          <template #prefix>
+            <el-icon class="el-input__icon"><ele-Position /></el-icon>
+          </template>
+        </el-input>
+      </el-col>
+      <el-col :span="1"></el-col>
+      <el-col :span="8">
+        <el-button v-waves class="login-content-code" @click="getCode" v-if="!state.clicked">{{ $t('message.mobile.codeText') }}
+        </el-button>
+        <el-countdown
+            format="mm:ss"
+            :value="state.cutDown"
+            v-if="state.clicked"
+            style="margin-left: 30px"
+            @finish="state.clicked = false"
+        />
+      </el-col>
+    </el-form-item>
+    <el-form-item class="login-animation3">
+      <el-button round type="primary" v-waves class="login-content-submit" @click="checkSms">
+        <span>校 验</span>
+      </el-button>
+    </el-form-item>
+  </el-form>
+  </el-dialog>
+</template>
+
+<script setup lang="ts" name="loginMobile">
+import { reactive } from 'vue';
+import {userApi} from "/@/api/user"
+import {ElMessage} from "element-plus";
+
+const {getLoginSms,checkLoginSms} = userApi()
+const emit = defineEmits(['signIn']);
+// 定义变量内容
+const state = reactive({
+  ruleForm: {
+    userName: '',
+    code: '',
+  },
+  userNameShow:'',
+  cutDown: 0,
+  isShowDialog:false,
+  clicked:false
+});
+async function getCode() {
+  const res = await getLoginSms(
+      {
+        id: state.ruleForm.userName,
+      }
+  )
+  if(res.status === 200){
+    state.clicked = true;
+    state.cutDown = Date.now() + 600000;
+    ElMessage.success(res.data)
+  }else{
+    ElMessage.error(res.data)
+  }
+
+}
+async function checkSms() {
+  const res = await checkLoginSms(state.ruleForm)
+  if(res.status === 200){
+    emit('signIn');
+    closeDialog()
+  }else{
+    ElMessage.error(res.data)
+  }
+}
+const closeDialog = () => {
+  state.isShowDialog = false;
+};
+const openDialog = (userName: string) => {
+  state.ruleForm.userName = userName;
+  state.userNameShow = userName.slice(0, 3) + '****' + userName.slice(-4);
+  state.isShowDialog = true;
+};
+
+// 暴露变量
+defineExpose({
+  openDialog,
+});
+</script>
+
+<style scoped lang="scss">
+.login-content-form {
+  margin-top: 20px;
+  @for $i from 1 through 4 {
+    .login-animation#{$i} {
+      opacity: 0;
+      animation-name: error-num;
+      animation-duration: 0.5s;
+      animation-fill-mode: forwards;
+      animation-delay: calc($i/10) + s;
+    }
+  }
+  .login-content-code {
+    width: 100%;
+    padding: 0;
+  }
+  .login-content-submit {
+    width: 100%;
+    letter-spacing: 2px;
+    font-weight: 300;
+    margin-top: 15px;
+  }
+  .login-msg {
+    color: var(--el-text-color-placeholder);
+  }
+}
+</style>
diff --git a/src/views/login/component/VerifyCode.vue b/src/views/login/component/VerifyCode.vue
new file mode 100644
index 0000000000000000000000000000000000000000..9546b51a73245c3e0b4bbe8e009b85e1f48a1f4f
--- /dev/null
+++ b/src/views/login/component/VerifyCode.vue
@@ -0,0 +1,154 @@
+<template>
+  <div class="s-canvas" :style="{ height: contentHeight + 'px' }">
+    <canvas
+        id="s-canvas"
+        :width="contentWidth"
+        :height="contentHeight"
+        @click="refreshCode"
+    ></canvas>
+  </div>
+</template>
+<script lang="ts" setup>
+import { ref, onMounted, withDefaults, defineProps } from "vue";
+
+// 定义props类型
+interface CodeProps {
+  /** 默认验证码 */
+  defaultCode?: string;
+  /** 容器宽度 */
+  contentWidth?: number;
+  /** 容器高度 */
+  contentHeight?: number;
+  /** 最大干扰线，0时无干扰线 */
+  maxLine?: number;
+  /** 最大干扰点，0时无干扰点 */
+  maxDot?: number;
+  /** 字体最小值 */
+  fontSizeMin?: number;
+  /** 字体最大值 */
+  fontSizeMax?: number;
+}
+// props默认值
+const props = withDefaults(defineProps<CodeProps>(), {
+  contentWidth: 130,
+  contentHeight: 40,
+  fontSizeMin: 25,
+  fontSizeMax: 30,
+  maxLine: 4,
+  maxDot: 10,
+});
+
+const emit = defineEmits(["update:verifyCode"]);
+//验证码
+const verifyCode = ref("");
+
+onMounted(() => {
+  verifyCode.value = props.defaultCode || makeCode();
+  emit("update:verifyCode", verifyCode.value);
+  drawPic(verifyCode.value);
+});
+// 生成校验码
+const makeCode = (len = 4) => {
+  let code = "";
+  const codeLength = len; //验证码的长度
+  // 定义生成验证码的字符集,去除易混淆的字符集1il0oO
+  const identifyCodes = "123456789abcdefjhijkinpqrsduvwxyzABCDEFGHJKLMNPQRSTUVWXYZ";
+  for (let i = 0; i < codeLength; i++) {
+    // 获取随机字符
+    code += identifyCodes[randomNum(0, identifyCodes.length)];
+  }
+  return code; //把code值赋给验证码
+};
+
+// 重置验证码
+const refreshCode = () => {
+  verifyCode.value = makeCode();
+  emit("update:verifyCode", verifyCode.value);
+  drawPic(verifyCode.value);
+};
+// 定义暴露接口
+// defineExpose({ refreshCode });
+
+//随机数生成：根据角标拿字符串的值
+const randomNum = (min = 0, max: number) => Math.floor(Math.random() * (max - min)) + min;
+
+// 生成一个随机的颜色
+function randomColor(min: number, max: number) {
+  let r = randomNum(min, max);
+  let g = randomNum(min, max);
+  let b = randomNum(min, max);
+  return "rgb(" + r + "," + g + "," + b + ")";
+}
+/** 绘制文字 */
+function drawPic(verifyCode: string) {
+  let canvas = document.getElementById("s-canvas") as HTMLCanvasElement;
+  if (!canvas) {
+    console.error("找不到 canvas 元素");
+    return;
+  }
+  //创建一个2D对象作为上下文。
+  let ctx = canvas.getContext("2d") as CanvasRenderingContext2D;
+  ctx.textBaseline = "bottom";
+  // 绘制背景
+  ctx.fillStyle = "#e6ecfd";
+  ctx.fillRect(0, 0, props.contentWidth, props.contentHeight);
+  // 绘制文字
+  for (let i = 0; i < verifyCode.length; i++) {
+    drawText(ctx, verifyCode, i);
+  }
+  drawLine(ctx, props.maxLine);
+  drawDot(ctx, props.maxDot);
+}
+
+/**在画布上显示数据
+ * @param ctx CanvasRenderingContext2D
+ * @param verifyCode 要显示的文字
+ * @param index 字符索引
+ */
+function drawText(ctx: CanvasRenderingContext2D, verifyCode: string, index: number) {
+  ctx.fillStyle = randomColor(50, 160); // 随机生成字体颜色
+  ctx.font = randomNum(props.fontSizeMin, props.fontSizeMax) + "px SimHei"; // 随机生成字体大小
+  let x = (index + 1) * (props.contentWidth / (verifyCode.length + 1));
+  let y = randomNum(props.fontSizeMax, props.contentHeight - 5);
+  var deg = randomNum(-10, 15);
+  // 修改坐标原点和旋转角度
+  ctx.translate(x, y);
+  ctx.rotate((deg * Math.PI) / 180);
+  ctx.fillText(verifyCode[index], 0, 0);
+  // 恢复坐标原点和旋转角度
+  ctx.rotate((-deg * Math.PI) / 180);
+  ctx.translate(-x, -y);
+}
+/** 绘制干扰线
+ * @param ctx CanvasRenderingContext2D
+ * @param max 最大干扰线个数
+ */
+function drawLine(ctx: CanvasRenderingContext2D, maxLine = 4) {
+  if (maxLine <= 0) {
+    return;
+  }
+  for (let i = 0; i < maxLine; i++) {
+    ctx.strokeStyle = randomColor(150, 200);
+    ctx.beginPath();
+    ctx.moveTo(randomNum(0, props.contentWidth), randomNum(0, props.contentHeight));
+    ctx.lineTo(randomNum(0, props.contentWidth), randomNum(0, props.contentHeight));
+    ctx.stroke();
+  }
+}
+/** 绘制干扰点
+ * @param ctx CanvasRenderingContext2D
+ * @param max 最大干扰点个数
+ */
+function drawDot(ctx: CanvasRenderingContext2D, maxDot = 10) {
+  if (maxDot <= 0) {
+    return;
+  }
+  for (let i = 0; i < maxDot; i++) {
+    ctx.fillStyle = randomColor(0, 255);
+    ctx.beginPath();
+    ctx.arc(randomNum(0, props.contentWidth), randomNum(0, props.contentHeight), 1, 0, 2 * Math.PI);
+    ctx.fill();
+  }
+}
+</script>
+
diff --git a/src/views/login/component/account.vue b/src/views/login/component/account.vue
index a646f5a131da8b9f3e2590fa604c02a77bd71573..0917ef9fad05dcfbf8a4b3a13f744bf638c005fb 100644
--- a/src/views/login/component/account.vue
+++ b/src/views/login/component/account.vue
@@ -1,174 +1,299 @@
 <template>
-	<el-form size="large" class="login-content-form">
-		<el-form-item class="login-animation1">
-			<el-input text :placeholder="$t('message.account.accountPlaceholder1')" v-model="state.ruleForm.userName" clearable autocomplete="off">
-				<template #prefix>
-					<el-icon class="el-input__icon"><ele-User /></el-icon>
-				</template>
-			</el-input>
-		</el-form-item>
-		<el-form-item class="login-animation2">
-			<el-input
-				:type="state.isShowPassword ? 'text' : 'password'"
-				:placeholder="$t('message.account.accountPlaceholder2')"
-				v-model="state.ruleForm.password"
-				autocomplete="off"
-			>
-				<template #prefix>
-					<el-icon class="el-input__icon"><ele-Unlock /></el-icon>
-				</template>
-				<template #suffix>
-					<i
-						class="iconfont el-input__icon login-content-password"
-						:class="state.isShowPassword ? 'icon-yincangmima' : 'icon-xianshimima'"
-						@click="state.isShowPassword = !state.isShowPassword"
-					>
-					</i>
-				</template>
-			</el-input>
-		</el-form-item>
-		<el-form-item class="login-animation3">
-			<el-col :span="15">
-				<el-input
-					text
-					maxlength="4"
-					:placeholder="$t('message.account.accountPlaceholder3')"
-					v-model="state.ruleForm.code"
-					clearable
-					autocomplete="off"
-				>
-					<template #prefix>
-						<el-icon class="el-input__icon"><ele-Position /></el-icon>
-					</template>
-				</el-input>
-			</el-col>
-			<el-col :span="1"></el-col>
-			<el-col :span="8">
-				<el-button class="login-content-code" v-waves>1234</el-button>
-			</el-col>
-		</el-form-item>
-		<el-form-item class="login-animation4">
-			<el-button type="primary" class="login-content-submit" round v-waves @click="onSignIn" :loading="state.loading.signIn">
-				<span>{{ $t('message.account.accountBtnText') }}</span>
-			</el-button>
-		</el-form-item>
-	</el-form>
+  <el-form size="large" class="login-content-form">
+    <el-form-item class="login-animation1">
+      <el-input text :placeholder="$t('message.account.accountPlaceholder1')" v-model="state.ruleForm.userName"
+                clearable autocomplete="off">
+        <template #prefix>
+          <el-icon class="el-input__icon">
+            <ele-User/>
+          </el-icon>
+        </template>
+      </el-input>
+    </el-form-item>
+    <el-form-item class="login-animation2">
+      <el-input
+          :type="state.isShowPassword ? 'text' : 'password'"
+          :placeholder="$t('message.account.accountPlaceholder2')"
+          v-model="state.ruleForm.password"
+          autocomplete="off"
+      >
+        <template #prefix>
+          <el-icon class="el-input__icon">
+            <ele-Unlock/>
+          </el-icon>
+        </template>
+        <template #suffix>
+          <i
+              class="iconfont el-input__icon login-content-password"
+              :class="state.isShowPassword ? 'icon-yincangmima' : 'icon-xianshimima'"
+              @click="state.isShowPassword = !state.isShowPassword"
+          >
+          </i>
+        </template>
+      </el-input>
+    </el-form-item>
+    <el-form-item class="login-animation3">
+      <el-col :span="15">
+        <el-input
+            text
+            maxlength="4"
+            :placeholder="$t('message.account.accountPlaceholder3')"
+            v-model="state.ruleForm.code"
+            clearable
+            autocomplete="off"
+        >
+          <template #prefix>
+            <el-icon class="el-input__icon">
+              <ele-Position/>
+            </el-icon>
+          </template>
+        </el-input>
+      </el-col>
+      <el-col :span="1"></el-col>
+      <el-col :span="8">
+        <VerifyCode v-model:verifyCode="identifyCode"></VerifyCode>
+      </el-col>
+    </el-form-item>
+    <el-form-item class="login-animation4">
+      <el-button type="primary" class="login-content-submit" round v-waves @click="openDialog"
+                 :loading="state.loading.signIn">
+        <span>{{ $t('message.account.accountBtnText') }}</span>
+      </el-button>
+    </el-form-item>
+  </el-form>
+  <SmsSecondCheck ref="SmsSecondCheckRef"  @signIn="onSignIn"/>
 </template>
 
 <script setup lang="ts" name="loginAccount">
-import { reactive, computed } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
-import { ElMessage } from 'element-plus';
-import { useI18n } from 'vue-i18n';
+import {reactive, computed, onMounted, ref, defineAsyncComponent} from 'vue';
+import {useRoute, useRouter} from 'vue-router';
+import {ElMessage, ElNotification} from 'element-plus';
+import {useI18n} from 'vue-i18n';
 import Cookies from 'js-cookie';
-import { storeToRefs } from 'pinia';
-import { useThemeConfig } from '/@/stores/themeConfig';
-import { initFrontEndControlRoutes } from '/@/router/frontEnd';
-import { initBackEndControlRoutes } from '/@/router/backEnd';
-import { Session } from '/@/utils/storage';
-import { formatAxis } from '/@/utils/formatTime';
-import { NextLoading } from '/@/utils/loading';
+import {storeToRefs} from 'pinia';
+import {useThemeConfig} from '/@/stores/themeConfig';
+import {initFrontEndControlRoutes} from '/@/router/frontEnd';
+import {initBackEndControlRoutes} from '/@/router/backEnd';
+import {Session} from '/@/utils/storage';
+import {formatAxis} from '/@/utils/formatTime';
+import {NextLoading} from '/@/utils/loading';
+import {useLoginApi} from "/@/api/login";
+import {userApi} from "/@/api/user"
+import {encryptData} from "/@/utils/encrypt";
+import VerifyCode from "/@/views/login/component/VerifyCode.vue";
 
+const SmsSecondCheck = defineAsyncComponent(() => import('/@/views/login/component/SmsSecondCheck.vue'));
+const SmsSecondCheckRef = ref();
+import axios from "axios";
 // 定义变量内容
-const { t } = useI18n();
+const {t} = useI18n();
 const storesThemeConfig = useThemeConfig();
-const { themeConfig } = storeToRefs(storesThemeConfig);
+const {themeConfig} = storeToRefs(storesThemeConfig);
 const route = useRoute();
 const router = useRouter();
+const ticket = ref<string | string[]>('');
+const appId = ref<string | string[]>('');
+//const userId = ref<string | string[]>('');
+
 const state = reactive({
-	isShowPassword: false,
-	ruleForm: {
-		userName: 'admin',
-		password: '123456',
-		code: '1234',
-	},
-	loading: {
-		signIn: false,
-	},
+  isShowPassword: false,
+  ruleForm: {
+    userName: '',
+    password: '',
+    code: '',
+  },
+  loading: {
+    signIn: false,
+  },
+});
+const identifyCode = ref<string>(''); //
+const {signIn, getUserInfo, getPk, getLoginUserInfo} = useLoginApi();
+const {getManagerUserPhone} = userApi()
+// 修改: 将 pkRes 声明为 axios.AxiosResponse<any> 类型，并初始化为 null
+let pkRes: axios.AxiosResponse<any> | null = null;
+
+onMounted(async () => {
+  pkRes = await getPk()
+  if (!pkRes || pkRes.status != 200) {
+    ElMessage.error('安全环境初始化失败');
+    return;
+  }
+  // 从查询参数中获取 ticket 和 appId
+  ticket.value = route.query?.ticket as string;  // 类型断言为 string
+  appId.value = route.query?.appId as string;
+  if (ticket.value && appId.value) {
+    // 获取用户信息
+    const res = await getUserInfo({
+      ticket: ticket.value,
+      appId: appId.value
+    });
+    if (res.status === 200) {
+      const response = await getLoginUserInfo({id: encryptData(res.data.openId, pkRes.data)})
+      if (response.status === 200) {
+        Session.set('token', response.data.accessToken.token);
+        Session.set('currentUserId', response.data.id);
+        Session.set("authTree", JSON.stringify(response.data.currentUserMenu));
+        Session.set("expireTime", response.data.accessToken.expireTime);
+        Session.set("userType", response.data.userType);
+
+        // 模拟数据，对接接口时，记得删除多余代码及对应依赖的引入。用于 `/src/stores/userInfo.ts` 中不同用户登录判断（模拟数据）
+        Cookies.set('userName', response.data.nickName);
+        if (!themeConfig.value.isRequestRoutes) {
+          // 前端控制路由，2、请注意执行顺序
+          const isNoPower = await initFrontEndControlRoutes();
+          signInSuccess(isNoPower);
+        } else {
+          // 模拟后端控制路由，isRequestRoutes 为 true，则开启后端控制路由
+          // 添加完动态路由，再进行 router 跳转，否则可能报错 No match found for location with path "/"
+          const isNoPower = await initBackEndControlRoutes();
+          // 执行完 initBackEndControlRoutes，再执行 signInSuccess
+          signInSuccess(isNoPower);
+          state.loading.signIn = false;
+        }
+      }
+    }
+  }
 });
 
 // 时间获取
 const currentTime = computed(() => {
-	return formatAxis(new Date());
+  return formatAxis(new Date());
 });
+const openDialog = async () => {
+  if (state.ruleForm.userName == "") {
+    ElMessage.error("请先输入账号");
+    return;
+  }
+  if (state.ruleForm.password == "") {
+    ElMessage.error("请先输入密码");
+    return;
+  }
+  if (state.ruleForm.code == "") {
+    ElMessage.error("请先输入验证码");
+    return;
+  }
+  pkRes = await getPk()
+  if (!pkRes || pkRes.status != 200) {
+    ElMessage.error('安全环境初始化失败');
+    return;
+  }
+  state.ruleForm.password = encryptData(state.ruleForm.password, pkRes.data)
+  const res = await getManagerUserPhone(state.ruleForm)
+  if(res.status == 200){
+    if (identifyCode.value.toUpperCase() != state.ruleForm.code.toUpperCase()) {
+      ElMessage.error("验证码错误,请重新输入！");
+      return;
+    }
+    ElNotification({
+      title: '二次校验提醒',
+      message: '用户登录必须通过手机验证码校验！',
+      type: 'warning',
+    })
+    SmsSecondCheckRef.value.openDialog(res.data);
+  }
+};
+
 // 登录
 const onSignIn = async () => {
-	state.loading.signIn = true;
-	// 存储 token 到浏览器缓存
-	Session.set('token', Math.random().toString(36).substr(0));
-	// 模拟数据，对接接口时，记得删除多余代码及对应依赖的引入。用于 `/src/stores/userInfo.ts` 中不同用户登录判断（模拟数据）
-	Cookies.set('userName', state.ruleForm.userName);
-	if (!themeConfig.value.isRequestRoutes) {
-		// 前端控制路由，2、请注意执行顺序
-		const isNoPower = await initFrontEndControlRoutes();
-		signInSuccess(isNoPower);
-	} else {
-		// 模拟后端控制路由，isRequestRoutes 为 true，则开启后端控制路由
-		// 添加完动态路由，再进行 router 跳转，否则可能报错 No match found for location with path "/"
-		const isNoPower = await initBackEndControlRoutes();
-		// 执行完 initBackEndControlRoutes，再执行 signInSuccess
-		signInSuccess(isNoPower);
-	}
+
+  state.loading.signIn = true;
+  try {
+
+    const response = await signIn(state.ruleForm)
+    if (response.status === -1) {
+      ElMessage.error(response.data.errMsg);
+      return;
+    }
+    // const data = await response.json();
+    // 存储 token 到浏览器缓存
+    Session.set('token', response.data.accessToken.token);
+    Session.set('currentUserId', response.data.id);
+    Session.set("authTree", JSON.stringify(response.data.currentUserMenu));
+    Session.set("expireTime", response.data.accessToken.expireTime);
+    Session.set("userType", response.data.userType);
+
+    // 模拟数据，对接接口时，记得删除多余代码及对应依赖的引入。用于 `/src/stores/userInfo.ts` 中不同用户登录判断（模拟数据）
+    Cookies.set('userName', response.data.nickName);
+    if (!themeConfig.value.isRequestRoutes) {
+      // 前端控制路由，2、请注意执行顺序
+      const isNoPower = await initFrontEndControlRoutes();
+      signInSuccess(isNoPower);
+    } else {
+      // 模拟后端控制路由，isRequestRoutes 为 true，则开启后端控制路由
+      // 添加完动态路由，再进行 router 跳转，否则可能报错 No match found for location with path "/"
+      const isNoPower = await initBackEndControlRoutes();
+      // 执行完 initBackEndControlRoutes，再执行 signInSuccess
+      signInSuccess(isNoPower);
+    }
+  } catch (error) {
+    ElMessage.error('登录失败，请检查您的用户名和密码');
+  } finally {
+    state.loading.signIn = false;
+  }
 };
 // 登录成功后的跳转
 const signInSuccess = (isNoPower: boolean | undefined) => {
-	if (isNoPower) {
-		ElMessage.warning('抱歉，您没有登录权限');
-		Session.clear();
-	} else {
-		// 初始化登录成功时间问候语
-		let currentTimeInfo = currentTime.value;
-		// 登录成功，跳到转首页
-		// 如果是复制粘贴的路径，非首页/登录页，那么登录成功后重定向到对应的路径中
-		if (route.query?.redirect) {
-			router.push({
-				path: <string>route.query?.redirect,
-				query: Object.keys(<string>route.query?.params).length > 0 ? JSON.parse(<string>route.query?.params) : '',
-			});
-		} else {
-			router.push('/');
-		}
-		// 登录成功提示
-		const signInText = t('message.signInText');
-		ElMessage.success(`${currentTimeInfo}，${signInText}`);
-		// 添加 loading，防止第一次进入界面时出现短暂空白
-		NextLoading.start();
-	}
-	state.loading.signIn = false;
+  if (isNoPower) {
+    ElMessage.warning('抱歉，您没有登录权限');
+    Session.clear();
+  } else {
+    // 初始化登录成功时间问候语
+    let currentTimeInfo = currentTime.value;
+    // 登录成功，跳到转首页
+    // 如果是复制粘贴的路径，非首页/登录页，那么登录成功后重定向到对应的路径中
+    if (route.query?.redirect) {
+      router.push({
+        path: <string>route.query?.redirect,
+        query: Object.keys(<string>route.query?.params).length > 0 ? JSON.parse(<string>route.query?.params) : '',
+      });
+    } else {
+      router.push('/');
+    }
+    // 登录成功提示
+    const signInText = t('message.signInText');
+    ElMessage.success(`${currentTimeInfo}，${signInText}`);
+    // 添加 loading，防止第一次进入界面时出现短暂空白
+    NextLoading.start();
+  }
+  state.loading.signIn = false;
 };
 </script>
 
 <style scoped lang="scss">
 .login-content-form {
-	margin-top: 20px;
-	@for $i from 1 through 4 {
-		.login-animation#{$i} {
-			opacity: 0;
-			animation-name: error-num;
-			animation-duration: 0.5s;
-			animation-fill-mode: forwards;
-			animation-delay: calc($i/10) + s;
-		}
-	}
-	.login-content-password {
-		display: inline-block;
-		width: 20px;
-		cursor: pointer;
-		&:hover {
-			color: #909399;
-		}
-	}
-	.login-content-code {
-		width: 100%;
-		padding: 0;
-		font-weight: bold;
-		letter-spacing: 5px;
-	}
-	.login-content-submit {
-		width: 100%;
-		letter-spacing: 2px;
-		font-weight: 300;
-		margin-top: 15px;
-	}
+  margin-top: 20px;
+  @for $i from 1 through 4 {
+    .login-animation#{$i} {
+      opacity: 0;
+      animation-name: error-num;
+      animation-duration: 0.5s;
+      animation-fill-mode: forwards;
+      animation-delay: calc($i/10) + s;
+    }
+  }
+
+  .login-content-password {
+    display: inline-block;
+    width: 20px;
+    cursor: pointer;
+
+    &:hover {
+      color: #909399;
+    }
+  }
+
+  .login-content-code {
+    width: 100%;
+    padding: 0;
+    font-weight: bold;
+    letter-spacing: 5px;
+  }
+
+  .login-content-submit {
+    width: 100%;
+    letter-spacing: 2px;
+    font-weight: 300;
+    margin-top: 15px;
+  }
 }
 </style>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index aa53bc49ff4c7c1e3df733a90d799eb419c9452e..ff33a69a5dc5783c36920dd5452d69cbf4a1af84 100644
--- 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="logoMini" />
+				<img :src="logo" />
 				<div class="login-left-logo-text">
 					<span>{{ getThemeConfig.globalViceTitle }}</span>
 					<span class="login-left-logo-text-msg">{{ getThemeConfig.globalViceTitleMsg }}</span>
@@ -25,16 +25,16 @@
 								<el-tab-pane :label="$t('message.label.one1')" name="account">
 									<Account />
 								</el-tab-pane>
-								<el-tab-pane :label="$t('message.label.two2')" name="mobile">
-									<Mobile />
-								</el-tab-pane>
+<!--								<el-tab-pane :label="$t('message.label.two2')" name="mobile">-->
+<!--									<Mobile />-->
+<!--								</el-tab-pane>-->
 							</el-tabs>
 						</div>
-						<Scan v-if="state.isScan" />
-						<div class="login-content-main-sacn" @click="state.isScan = !state.isScan">
-							<i class="iconfont" :class="state.isScan ? 'icon-diannao1' : 'icon-barcode-qr'"></i>
-							<div class="login-content-main-sacn-delta"></div>
-						</div>
+<!--						<Scan v-if="state.isScan" />-->
+<!--						<div class="login-content-main-sacn" @click="state.isScan = !state.isScan">-->
+<!--							<i class="iconfont" :class="state.isScan ? 'icon-diannao1' : 'icon-barcode-qr'"></i>-->
+<!--							<div class="login-content-main-sacn-delta"></div>-->
+<!--						</div>-->
 					</div>
 				</div>
 			</div>
@@ -50,6 +50,7 @@ import { NextLoading } from '/@/utils/loading';
 import logoMini from '/@/assets/logo-mini.svg';
 import loginMain from '/@/assets/login-main.svg';
 import loginBg from '/@/assets/login-bg.svg';
+import logo from '/@/assets/logo.png';
 
 // 引入组件
 const Account = defineAsyncComponent(() => import('/@/views/login/component/account.vue'));
@@ -101,11 +102,11 @@ onMounted(() => {
 				span {
 					margin-left: 10px;
 					font-size: 28px;
-					color: #26a59a;
+					color: #254aa7;
 				}
 				.login-left-logo-text-msg {
 					font-size: 12px;
-					color: #32a99e;
+					color: #254aa7;
 				}
 			}
 		}
diff --git a/src/views/system/BOEUser/dialog.vue b/src/views/system/BOEUser/dialog.vue
new file mode 100644
index 0000000000000000000000000000000000000000..9e1029133e20546f7dabdb430fa61e78c2fff463
--- /dev/null
+++ b/src/views/system/BOEUser/dialog.vue
@@ -0,0 +1,234 @@
+<template>
+	<div class="system-managerUser-dialog-container">
+		<el-dialog :title="state.dialog.title" v-model="state.dialog.isShowDialog" width="769px">
+			<el-form ref="managerUserDialogFormRef" :model="state.ruleForm" size="default" label-width="90px" :rules="rules">
+				<el-row :gutter="35">
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="账号" prop="username">
+							<el-input v-model="state.ruleForm.username" placeholder="请输入账号" clearable :disabled="state.ruleForm.isDelete==1"></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="姓名" prop="nickName">
+							<el-input v-model="state.ruleForm.nickName" placeholder="请输入用户姓名" clearable :disabled="state.ruleForm.isDelete==1"></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="电话号码" prop="userMobile">
+              <el-input v-model="state.ruleForm.userMobile" placeholder="请输入用户电话" clearable :disabled="state.ruleForm.isDelete==1"></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="性别" prop="gender">
+              <el-select v-model="state.ruleForm.gender" placeholder="请选择" clearable class="w100">
+                <el-option label="男"  :value="0"></el-option>
+                <el-option label="女"  :value="1"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="state.dialog.type=='add'">
+						<el-form-item label="关联角色" prop="userType">
+							<el-select v-model="state.ruleForm.userType" placeholder="请选择" clearable class="w100"  >
+								<el-option label="教育局领导" :value="8"></el-option>
+								<el-option label="部门负责人" :value="9"></el-option>
+                <el-option label="部门工作人员" :value="10"></el-option>
+                <el-option label="校长" :value="11"></el-option>
+                <el-option label="办公室主任" :value="12"></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="state.dialog.type=='add'">
+            <el-form-item label="科室" prop="orgId" >
+              <el-tree-select
+                  v-model="state.ruleForm.orgId"
+                  :data="state.sysOrgData"
+                  :render-after-expand="false"
+                  style="width: 500px"
+                  filterable
+                  show-all-levels
+                  :disabled="state.ruleForm.isDelete==1"
+              />
+            </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.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-form-item label="用户状态">
+              <el-select v-model="state.ruleForm.isDelete" placeholder="请选择"  class="w100" :disabled="state.ruleForm.isDelete==0">
+                <el-option label="正常"  :value="0"></el-option>
+                <el-option label="禁用"  :value="1"></el-option>
+              </el-select>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<template #footer>
+				<span class="dialog-footer">
+					<el-button @click="onCancel" size="default">取 消</el-button>
+					<el-button type="primary" @click="onSubmit(managerUserDialogFormRef)" size="default">{{ state.dialog.submitTxt }}</el-button>
+				</span>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script setup lang="ts" name="systemUserDialog">
+import { reactive, ref} from 'vue';
+import {systemApi} from "/@/api/system";
+import {userApi} from "/@/api/user";
+import {ElMessage, FormInstance, FormRules} from 'element-plus'
+const {orgBOETree} = systemApi();
+const {saveOrUpdateBOEUser} = userApi();
+// 定义子组件向父组件传值/事件
+const emit = defineEmits(['refresh']);
+const validatePhone = (rule: any, value: string, callback: any) => {
+  const phoneRegex = /^1[3-9]\d{9}$/;
+  if (!value) {
+    callback(new Error('请输入电话号码'));
+  } else if (!phoneRegex.test(value)) {
+    callback(new Error('手机号格式不正确'));
+  } else {
+    callback();
+  }
+};
+const rules = reactive<FormRules<RowManagerUserType>>({
+  username: [
+    { required: true, validator: validatePhone, trigger: 'blur' },
+    //{ min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
+  ],
+  userMobile: [
+    { required: true, validator: validatePhone, trigger: 'blur' },
+    //{ min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
+  ],
+  nickName: [
+    {
+      required: true,
+      message: '请输入姓名',
+      trigger: 'blur',
+    },
+  ],
+  userType: [
+    {
+      required: true,
+      message: '请选择角色',
+      trigger: 'change',
+    },
+  ],
+
+  orgId: [
+    {
+      required: true,
+      message: '请选择机构',
+      trigger: 'change',
+    },
+  ],
+
+
+})
+
+// 定义变量内容
+const managerUserDialogFormRef = ref();
+const state = reactive({
+	ruleForm: {
+    id: '',
+    username: '',
+    orgId: '',
+    orgName: '',
+    nickName: '',
+    userMobile:'',
+    userRole:'',
+    userRoles: [],
+    gmtCreate: '',
+    gender: 0,
+    userType:8,
+    isDelete: 0,
+    gmtModified: '',
+	},
+  sysOrgData: [] as OrgTreeType[], // 部门数据
+	dialog: {
+		isShowDialog: false,
+		type: '',
+		title: '',
+		submitTxt: '',
+	},
+});
+
+// 打开弹窗
+const openDialog = (type: string, row: RowManagerUserType) => {
+  clearForm();
+	if (type === 'edit') {
+		state.ruleForm = JSON.parse(JSON.stringify(row));
+		state.dialog.title = '修改教育局用户信息';
+		state.dialog.submitTxt = '修 改';
+	} else {
+		state.dialog.title = '新增教育局用户';
+		state.dialog.submitTxt = '新 增';
+	}
+  state.dialog.type = type;
+	state.dialog.isShowDialog = true;
+	getMenuData();
+};
+// 关闭弹窗
+const closeDialog = () => {
+	state.dialog.isShowDialog = false;
+};
+// 取消
+const onCancel = () => {
+	closeDialog();
+};
+// 提交
+// const onSubmit = () => {
+// 	closeDialog();
+// 	emit('refresh');
+// 	// if (state.dialog.type === 'add') { }
+// };
+const onSubmit = async (formEl: FormInstance | undefined) => {
+  if (!formEl) return
+  await formEl.validate(async (valid) => {
+    if (valid) {
+      const res = await saveOrUpdateBOEUser(state.ruleForm)
+      if (res.status === 200) {
+        ElMessage.success('更改成功');
+        emit('refresh');
+      }else{
+        ElMessage.error('更改失败');
+      }
+      closeDialog();
+
+    }
+  })
+}
+
+// 初始化机构数据
+const getMenuData = async () => {
+  const res = await orgBOETree()
+  if (res.status === 200) {
+    state.sysOrgData = res.data;
+  }
+};
+
+const clearForm = () => {
+  state.ruleForm = {
+    id: '',
+    username: '',
+    orgId: '',
+    orgName: '',
+    nickName: '',
+    userMobile:'',
+    userRole:'',
+    gender: 0,
+    userType:8,
+    userRoles: [],
+    gmtCreate: '',
+    isDelete: 0,
+    gmtModified: '',
+  }
+}
+// 暴露变量
+defineExpose({
+	openDialog,
+});
+</script>
diff --git a/src/views/system/BOEUser/index.vue b/src/views/system/BOEUser/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..eb639086b7e84243cb8ab8efcaef9508e546e76e
--- /dev/null
+++ b/src/views/system/BOEUser/index.vue
@@ -0,0 +1,191 @@
+<template>
+	<div class="system-managerUser-container layout-padding">
+		<el-card shadow="hover" class="layout-padding-auto">
+			<div class="system-managerUser-search mb15">
+        <el-button size="default" type="primary" class="ml10" @click="getTableData()">
+          <el-icon>
+            <ele-Search />
+          </el-icon>
+          刷新
+        </el-button>
+				<el-button size="default" type="success" class="ml10" @click="onOpenAddManagerUser('add')">
+					<el-icon>
+						<ele-FolderAdd />
+					</el-icon>
+					添加教育局用户
+				</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="账号" width="150" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="nickName" label="姓名" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="userMobile" label="电话号码" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="gender" label="性别" width="100" show-overflow-tooltip>
+          <template #default="scope">
+            <el-tag effect="dark" v-if="scope.row.gender==0">男</el-tag>
+            <el-tag effect="dark" type="danger" v-else-if="scope.row.gender==1">女</el-tag>
+            <el-tag effect="dark" type="warning" v-else>未知</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="orgName" label="所在机构" width="200" show-overflow-tooltip></el-table-column>
+<!--        <el-table-column prop="userRole" label="角色" width="300" show-overflow-tooltip></el-table-column>-->
+        <el-table-column prop="userRoleCodes" label="角色" width="300" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="isDelete" label="状态" width="100" show-overflow-tooltip>
+					<template #default="scope">
+						<el-tag type="success" v-if="scope.row.isDelete==0">正常</el-tag>
+						<el-tag type="info" v-else>禁用</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="gmtModified" label="修改时间" show-overflow-tooltip></el-table-column>
+				<el-table-column label="操作" width="200">
+					<template #default="scope">
+              <el-button  size="small" text type="primary" @click="onOpenAuthorizeDialog(scope.row.id)" >授权管理</el-button>
+              <el-button  size="small" text type="primary" @click="onOpenEditAddManagerUser('edit', scope.row)" >修改信息</el-button>
+              <el-button :disabled="scope.row.isDelete === 1" size="small" text type="primary" @click="onRowDel(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, 50]"
+				v-model:current-page="state.tableData.param.current"
+				background
+				v-model:page-size="state.tableData.param.pageSize"
+				layout="total, sizes, prev, pager, next, jumper"
+				:total="state.tableData.total"
+			>
+			</el-pagination>
+		</el-card>
+    <Dialog ref="BOEDialogRef" @refresh="getTableData()" />
+    <authorizeDialog ref="authorizeDialogRef" @refresh="getTableData()" />
+	</div>
+</template>
+
+<script setup lang="ts" name="systemManagerUser">
+import {reactive, onMounted, defineAsyncComponent, ref} from 'vue';
+import { ElMessageBox, ElMessage } from 'element-plus';
+import {userApi} from "/@/api/user";
+
+const {BOEUserListByPage,BOERemoveById} = userApi();
+const Dialog = defineAsyncComponent(() => import('/src/views/system/BOEUser/dialog.vue'));
+const BOEDialogRef = ref();
+const authorizeDialog = defineAsyncComponent(() => import('/src/views/system/noRole/authorizeDialog.vue'));
+const authorizeDialogRef = ref();
+
+const state = reactive<ManagerSysUserState>({
+	tableData: {
+		data: [],
+		total: 0,
+		loading: false,
+		param: {
+			current: 1,
+			pageSize: 10,
+		},
+	},
+});
+const userTypeMap: { [key: string]: string } = {
+  OPERATION_MANAGER: '运营管理人员',
+  STUDENT: '学生',
+  TEACHER: '普通教师',
+  TEACHER_MANAGER: '教师管理员',
+  STAFF: '工作人员',
+  PARENT: '家长',
+  LEADER: '教育局管理员',
+  SCHOOL_MANAGER: '学校管理员',
+  DEVELOPER: '开发或运维人员',
+  BOE_LEADER: '教育局领导',
+  BOE_DEPARTMENT_HEAD: '部门负责人',
+  BOE_DEPARTMENT_STAFF: '部门工作人员',
+  BOE_SCHOOL_HEAD: '校长',
+  BOE_SCHOOL_DIRECTOR: '办公室主任'
+};
+const onOpenAddManagerUser = (type: string) => {
+  BOEDialogRef.value.openDialog(type);
+};
+
+const onOpenEditAddManagerUser = (type: string, row: RowManagerUserType) => {
+  BOEDialogRef.value.openDialog(type,row);
+};
+
+const onOpenAuthorizeDialog = (userId: string) => {
+  authorizeDialogRef.value.openDialog(userId);
+};
+
+// 转换 userRole 为码值
+const convertUserRolesToCodes = (data: RowManagerUserType[]) => {
+  return data.map(user => {
+    const userRoles = user.userRoles // 假设 userRole 是以逗号分隔的字符串
+    const roleCodes = userRoles.map(role => userTypeMap[role] || role); // 转换为码值，如果找不到则保持原值
+    return {
+      ...user,
+      userRoleCodes: roleCodes.join(', '), // 将码值数组转换为字符串
+    };
+  });
+};
+// 初始化表格数据
+const getTableData = async () => {
+  state.tableData.loading = true;
+  const res = await BOEUserListByPage(state.tableData.param)
+  if (res.status === 200) {
+    state.tableData.data = convertUserRolesToCodes(res.data.records);
+    state.tableData.total = res.data.total;
+    state.tableData.loading = false;
+  }
+
+
+};
+
+
+// 删除用户
+const onRowDel = (row: RowManagerUserType) => {
+	ElMessageBox.confirm(`此操作将删除用户的教育局身份，账号名称：“${row.nickName}”，是否继续?`, '提示', {
+		confirmButtonText: '确认',
+		cancelButtonText: '取消',
+		type: 'warning',
+	})
+		.then(async () => {
+      const res = await BOERemoveById({id: row.id})
+      if (res.status === 200) {
+        await getTableData();
+        ElMessage.success('删除成功');
+      } else {
+        ElMessage.error('删除失败');
+      }
+    })
+		.catch(() => {});
+};
+
+
+// 分页改变
+const onHandleSizeChange = (val: number) => {
+	state.tableData.param.pageSize = val;
+	getTableData();
+};
+// 分页改变
+const onHandleCurrentChange = (val: number) => {
+	state.tableData.param.pageNum = val;
+	getTableData();
+};
+// 页面加载时
+onMounted(() => {
+	getTableData();
+});
+</script>
+
+<style scoped lang="scss">
+.system-managerUser-container {
+	:deep(.el-card__body) {
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+		overflow: auto;
+		.el-table {
+			flex: 1;
+		}
+	}
+}
+</style>
diff --git a/src/views/system/dept/dialog.vue b/src/views/system/dept/dialog.vue
deleted file mode 100644
index b7255930c7d5a09b80124d9add66ac5846272b98..0000000000000000000000000000000000000000
--- a/src/views/system/dept/dialog.vue
+++ /dev/null
@@ -1,167 +0,0 @@
-<template>
-	<div class="system-dept-dialog-container">
-		<el-dialog :title="state.dialog.title" v-model="state.dialog.isShowDialog" width="769px">
-			<el-form ref="deptDialogFormRef" :model="state.ruleForm" size="default" label-width="90px">
-				<el-row :gutter="35">
-					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
-						<el-form-item label="上级部门">
-							<el-cascader
-								:options="state.deptData"
-								:props="{ checkStrictly: true, value: 'deptName', label: 'deptName' }"
-								placeholder="请选择部门"
-								clearable
-								class="w100"
-								v-model="state.ruleForm.deptLevel"
-							>
-								<template #default="{ node, data }">
-									<span>{{ data.deptName }}</span>
-									<span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
-								</template>
-							</el-cascader>
-						</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.deptName" 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.person" 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.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>
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="排序">
-							<el-input-number v-model="state.ruleForm.sort" :min="0" :max="999" controls-position="right" placeholder="请输入排序" class="w100" />
-						</el-form-item>
-					</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>
-					</el-col>
-					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
-						<el-form-item label="部门描述">
-							<el-input v-model="state.ruleForm.describe" type="textarea" placeholder="请输入部门描述" maxlength="150"></el-input>
-						</el-form-item>
-					</el-col>
-				</el-row>
-			</el-form>
-			<template #footer>
-				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="default">{{ state.dialog.submitTxt }}</el-button>
-				</span>
-			</template>
-		</el-dialog>
-	</div>
-</template>
-
-<script setup lang="ts" name="systemDeptDialog">
-import { reactive, ref } from 'vue';
-
-// 定义子组件向父组件传值/事件
-const emit = defineEmits(['refresh']);
-
-// 定义变量内容
-const deptDialogFormRef = ref();
-const state = reactive({
-	ruleForm: {
-		deptLevel: [] as string[], // 上级部门
-		deptName: '', // 部门名称
-		person: '', // 负责人
-		phone: '', // 手机号
-		email: '', // 邮箱
-		sort: 0, // 排序
-		status: true, // 部门状态
-		describe: '', // 部门描述
-	},
-	deptData: [] as DeptTreeType[], // 部门数据
-	dialog: {
-		isShowDialog: false,
-		type: '',
-		title: '',
-		submitTxt: '',
-	},
-});
-
-// 打开弹窗
-const openDialog = (type: string, row: RowDeptType) => {
-	if (type === 'edit') {
-		row.deptLevel = ['vueNextAdmin'];
-		row.person = 'lyt';
-		row.phone = '12345678910';
-		row.email = 'vueNextAdmin@123.com';
-		state.ruleForm = row;
-		state.dialog.title = '修改部门';
-		state.dialog.submitTxt = '修 改';
-	} else {
-		state.dialog.title = '新增部门';
-		state.dialog.submitTxt = '新 增';
-		// 清空表单，此项需加表单验证才能使用
-		// nextTick(() => {
-		// 	deptDialogFormRef.value.resetFields();
-		// });
-	}
-	state.dialog.isShowDialog = true;
-	getMenuData();
-};
-// 关闭弹窗
-const closeDialog = () => {
-	state.dialog.isShowDialog = false;
-};
-// 取消
-const onCancel = () => {
-	closeDialog();
-};
-// 提交
-const onSubmit = () => {
-	closeDialog();
-	emit('refresh');
-	// if (state.dialog.type === 'add') { }
-};
-// 初始化部门数据
-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,
-});
-</script>
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
deleted file mode 100644
index 3d6f4e6bd5e38155856ee70f7663d1047a03e6b5..0000000000000000000000000000000000000000
--- a/src/views/system/dept/index.vue
+++ /dev/null
@@ -1,135 +0,0 @@
-<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="请输入部门名称" style="max-width: 180px"> </el-input>
-				<el-button size="default" type="primary" class="ml10">
-					<el-icon>
-						<ele-Search />
-					</el-icon>
-					查询
-				</el-button>
-				<el-button size="default" type="success" class="ml10" @click="onOpenAddDept('add')">
-					<el-icon>
-						<ele-FolderAdd />
-					</el-icon>
-					新增部门
-				</el-button>
-			</div>
-			<el-table
-				:data="state.tableData.data"
-				v-loading="state.tableData.loading"
-				style="width: 100%"
-				row-key="id"
-				default-expand-all
-				:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-			>
-				<el-table-column prop="deptName" label="部门名称" show-overflow-tooltip> </el-table-column>
-				<el-table-column label="排序" show-overflow-tooltip width="80">
-					<template #default="scope">
-						{{ scope.$index }}
-					</template>
-				</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 label="操作" show-overflow-tooltip width="140">
-					<template #default="scope">
-						<el-button size="small" text type="primary" @click="onOpenAddDept('add')">新增</el-button>
-						<el-button size="small" text type="primary" @click="onOpenEditDept('edit', scope.row)">修改</el-button>
-						<el-button size="small" text type="primary" @click="onTabelRowDel(scope.row)">删除</el-button>
-					</template>
-				</el-table-column>
-			</el-table>
-		</el-card>
-		<DeptDialog ref="deptDialogRef" @refresh="getTableData()" />
-	</div>
-</template>
-
-<script setup lang="ts" name="systemDept">
-import { defineAsyncComponent, ref, reactive, onMounted } from 'vue';
-import { ElMessageBox, ElMessage } from 'element-plus';
-
-// 引入组件
-const DeptDialog = defineAsyncComponent(() => import('/@/views/system/dept/dialog.vue'));
-
-// 定义变量内容
-const deptDialogRef = ref();
-const state = reactive<SysDeptState>({
-	tableData: {
-		data: [],
-		total: 0,
-		loading: false,
-		param: {
-			pageNum: 1,
-			pageSize: 10,
-		},
-	},
-});
-
-// 初始化表格数据
-const getTableData = () => {
-	state.tableData.loading = true;
-	state.tableData.data = [];
-	state.tableData.data.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(),
-			},
-		],
-	});
-	state.tableData.total = state.tableData.data.length;
-	setTimeout(() => {
-		state.tableData.loading = false;
-	}, 500);
-};
-// 打开新增菜单弹窗
-const onOpenAddDept = (type: string) => {
-	deptDialogRef.value.openDialog(type);
-};
-// 打开编辑菜单弹窗
-const onOpenEditDept = (type: string, row: DeptTreeType) => {
-	deptDialogRef.value.openDialog(type, row);
-};
-// 删除当前行
-const onTabelRowDel = (row: DeptTreeType) => {
-	ElMessageBox.confirm(`此操作将永久删除部门：${row.deptName}, 是否继续?`, '提示', {
-		confirmButtonText: '删除',
-		cancelButtonText: '取消',
-		type: 'warning',
-	})
-		.then(() => {
-			getTableData();
-			ElMessage.success('删除成功');
-		})
-		.catch(() => {});
-};
-// 页面加载时
-onMounted(() => {
-	getTableData();
-});
-</script>
diff --git a/src/views/system/managerUser/dialogManager.vue b/src/views/system/managerUser/dialogManager.vue
new file mode 100644
index 0000000000000000000000000000000000000000..f96e37c96d31bfc36f13aca58b49afea7a67e626
--- /dev/null
+++ b/src/views/system/managerUser/dialogManager.vue
@@ -0,0 +1,192 @@
+<template>
+	<div class="system-managerUser-dialog-container">
+		<el-dialog :title="state.dialog.title" v-model="state.dialog.isShowDialog" width="769px">
+			<el-form ref="managerUserDialogFormRef" :model="state.ruleForm" size="default" label-width="90px" :rules="rules">
+				<el-row :gutter="35">
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="账号" prop="username">
+							<el-input v-model="state.ruleForm.username" placeholder="请输入账号" clearable :disabled="state.ruleForm.isDelete==1"></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="姓名" prop="nickName">
+							<el-input v-model="state.ruleForm.nickName" placeholder="请输入用户姓名" clearable :disabled="state.ruleForm.isDelete==1"></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="电话号码" prop="userMobile">
+              <el-input v-model="state.ruleForm.userMobile" placeholder="请输入用户电话" clearable :disabled="state.ruleForm.isDelete==1"></el-input>
+            </el-form-item>
+          </el-col>
+
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="state.dialog.type=='add'">
+						<el-form-item label="关联角色" prop="userType">
+							<el-select v-model="state.ruleForm.userType" placeholder="请选择" clearable class="w100"  :disabled="state.ruleForm.isDelete==1">
+								<el-option label="运营管理人员" :value="0"></el-option>
+<!--                <el-option label="工作人员" :value="4"></el-option>-->
+<!--                <el-option label="开发或运维人员" :value="100"></el-option>-->
+							</el-select>
+						</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.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-form-item label="用户状态">
+              <el-select v-model="state.ruleForm.isDelete" placeholder="请选择"  class="w100" :disabled="state.ruleForm.isDelete==0">
+                <el-option label="正常"  :value="0"></el-option>
+                <el-option label="禁用"  :value="1"></el-option>
+              </el-select>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<template #footer>
+				<span class="dialog-footer">
+					<el-button @click="onCancel" size="default">取 消</el-button>
+					<el-button type="primary" @click="onSubmit(managerUserDialogFormRef)" size="default">{{ state.dialog.submitTxt }}</el-button>
+				</span>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script setup lang="ts" name="systemUserDialog">
+import { reactive, ref} from 'vue';
+import {userApi} from "/@/api/user";
+import {ElMessage, FormInstance, FormRules} from 'element-plus'
+
+const {saveOrUpdateManager} = userApi();
+// 定义子组件向父组件传值/事件
+const emit = defineEmits(['refresh']);
+
+const rules = reactive<FormRules<RowManagerUserType>>({
+  username: [
+    { required: true, message: '请输入学号', trigger: 'blur' },
+    //{ min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
+  ],
+  nickName: [
+    {
+      required: true,
+      message: '请输入姓名',
+      trigger: 'blur',
+    },
+  ],
+  userType: [
+    {
+      required: true,
+      message: '请选择角色',
+      trigger: 'change',
+    },
+  ],
+
+  orgId: [
+    {
+      required: true,
+      message: '请选择科室',
+      trigger: 'change',
+    },
+  ],
+
+
+})
+
+// 定义变量内容
+const managerUserDialogFormRef = ref();
+const state = reactive({
+	ruleForm: {
+    id: '',
+    username: '',
+    orgId: '1',
+    orgName: '',
+    nickName: '',
+    userMobile:'',
+    userRole:'',
+    userType:0,
+    gmtCreate: '',
+    isDelete: 0,
+    gmtModified: '',
+	},
+  sysOrgData: [] as OrgTreeType[], // 部门数据
+	dialog: {
+		isShowDialog: false,
+		type: '',
+		title: '',
+		submitTxt: '',
+	},
+});
+
+// 打开弹窗
+const openDialog = (type: string, row: RowManagerUserType) => {
+  clearForm();
+	if (type === 'edit') {
+		state.ruleForm = JSON.parse(JSON.stringify(row));
+		state.dialog.title = '修改管理员信息';
+		state.dialog.submitTxt = '修 改';
+	} else {
+		state.dialog.title = '新增管理员';
+		state.dialog.submitTxt = '新 增';
+	}
+	state.dialog.isShowDialog = true;
+  state.dialog.type = type;
+	getMenuData();
+};
+// 关闭弹窗
+const closeDialog = () => {
+	state.dialog.isShowDialog = false;
+};
+// 取消
+const onCancel = () => {
+	closeDialog();
+};
+// 提交
+// const onSubmit = () => {
+// 	closeDialog();
+// 	emit('refresh');
+// 	// if (state.dialog.type === 'add') { }
+// };
+const onSubmit = async (formEl: FormInstance | undefined) => {
+  if (!formEl) return
+  await formEl.validate(async (valid) => {
+    if (valid) {
+      const res = await saveOrUpdateManager(state.ruleForm)
+      if (res.status === 200) {
+        ElMessage.success('更改成功');
+        emit('refresh');
+      }else{
+        ElMessage.error('更改失败');
+      }
+      closeDialog();
+
+    }
+  })
+}
+
+// 初始化机构数据
+const getMenuData = async () => {
+
+};
+
+const clearForm = () => {
+  state.ruleForm = {
+    id: '',
+    username: '',
+    orgId: '1',
+    orgName: '',
+    nickName: '',
+    userMobile:'',
+    userRole:'',
+    userType:0,
+    gmtCreate: '',
+    isDelete: 0,
+    gmtModified: '',
+  }
+}
+// 暴露变量
+defineExpose({
+	openDialog,
+});
+</script>
diff --git a/src/views/system/managerUser/dialogSchoolManager.vue b/src/views/system/managerUser/dialogSchoolManager.vue
new file mode 100644
index 0000000000000000000000000000000000000000..ee8cbaef15ee2a4208c47995c01f11fcc0d82d22
--- /dev/null
+++ b/src/views/system/managerUser/dialogSchoolManager.vue
@@ -0,0 +1,215 @@
+<template>
+	<div class="system-schoolManager-dialog-container">
+		<el-dialog :title="state.dialog.title" v-model="state.dialog.isShowDialog" width="769px">
+			<el-form ref="schoolManagerDialogFormRef" :model="state.ruleForm" size="default" label-width="90px" :rules="rules">
+				<el-row :gutter="35">
+					<el-col class="mb20">
+						<el-form-item label="老师手机号" prop="username" label-width="auto">
+							<el-select
+								v-model="state.ruleForm.id"
+								filterable
+								remote
+								reserve-keyword
+								placeholder="请输入老师手机号进行搜索"
+								remote-show-suffix
+								:remote-method="remoteMethod"
+								:loading="state.loading"
+								style="width: 500px"
+								@change="onChange"
+								:disabled="state.dialog.type === 'edit'"
+							>
+								<el-option v-for="item in state.options" :key="item.id" :label="item.nickName" :value="item.id">
+									<span style="float: left">{{ item.username }}</span>
+									<span style="float: right; color: var(--el-text-color-secondary); font-size: 13px">{{ item.nickName }}</span>
+								</el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col>
+						<el-form-item label="权限选择" prop="userRoles" label-width="auto">
+							<el-checkbox-group v-model="state.ruleForm.userRoles">
+								<el-checkbox label="普通教师" value="TEACHER" disabled />
+								<el-checkbox label="家长" value="PARENT" disabled />
+								<el-checkbox label="学校管理员" value="SCHOOL_MANAGER" />
+								<el-checkbox label="教师管理员" value="TEACHER_MANAGER" />
+							</el-checkbox-group>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<template #footer>
+				<span class="dialog-footer">
+					<el-button @click="onCancel" size="default">取 消</el-button>
+					<el-button type="primary" @click="onSubmit(schoolManagerDialogFormRef)" size="default">{{ state.dialog.submitTxt }}</el-button>
+				</span>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script setup lang="ts" name="schoolManagerDialog">
+import { reactive, ref} from 'vue';
+import {userApi} from "/@/api/user";
+import {ElMessage, FormInstance, FormRules} from 'element-plus'
+const {savePermission,teacherListByPage} = userApi();
+// 定义子组件向父组件传值/事件
+const emit = defineEmits(['refresh']);
+
+const rules = reactive<FormRules<RowManagerUserType>>({
+  username: [
+    { required: true, message: '请输入学号', trigger: 'blur' },
+    //{ min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
+  ],
+  nickName: [
+    {
+      required: true,
+      message: '请输入姓名',
+      trigger: 'blur',
+    },
+  ],
+
+
+})
+
+// 定义变量内容
+const schoolManagerDialogFormRef = ref();
+const state = reactive({
+	ruleForm: {
+    id: '',
+    username: '',
+    orgId: '',
+    orgName: '',
+    nickName: '',
+    userType: 1,
+    gender: 0,
+    userMobile: '',
+    idType: '',
+    userIdCardNumber: '',
+    userRole: '',
+    userRoles: [''],
+    nth: '',
+    gmtCreate: '',
+    isDelete: 0,
+    gmtModified: '',
+	},
+	dialog: {
+		isShowDialog: false,
+		type: '',
+		title: '',
+		submitTxt: '',
+	},
+  loading:false,
+  options: [
+    {
+      id:'',
+      nickName:'',
+      username:'',
+      userRoles: [''],
+    }
+  ],
+});
+
+// 打开弹窗
+const openDialog = (type: string, row: RowManagerUserType) => {
+  state.dialog.type = type;
+	if (type === 'edit') {
+		state.ruleForm = row;
+    state.options=[
+      {
+        id:row.id,
+        nickName:row.nickName,
+        username:row.username,
+        userRoles: row.userRoles,
+      }
+    ]
+		state.dialog.title = '修改老师权限';
+		state.dialog.submitTxt = '修 改';
+	} else {
+		state.dialog.title = '教师赋权';
+		state.dialog.submitTxt = '确 定';
+    clearForm();
+	}
+	state.dialog.isShowDialog = true;
+};
+// 关闭弹窗
+const closeDialog = () => {
+	state.dialog.isShowDialog = false;
+};
+// 取消
+const onCancel = () => {
+	closeDialog();
+};
+// 提交
+// const onSubmit = () => {
+// 	closeDialog();
+// 	emit('refresh');
+// 	// if (state.dialog.type === 'add') { }
+// };
+const onSubmit = async (formEl: FormInstance | undefined) => {
+  if (!formEl) return
+  await formEl.validate(async (valid) => {
+    if (valid) {
+      state.ruleForm.userType = 1;
+      const res = await savePermission({
+        id: state.ruleForm.id,
+        userRoles: state.ruleForm.userRoles,
+      })
+      if (res.status === 200) {
+        ElMessage.success('更改成功');
+        emit('refresh');
+      }else{
+        ElMessage.error('更改失败');
+      }
+      closeDialog();
+
+    }
+  })
+}
+
+const remoteMethod = async (query: string) => {
+  if (query !== '') {
+    state.loading = true;
+    const res = await teacherListByPage({
+      userName: query,
+    })
+    if (res.status === 200) {
+      //console.log(res);
+      state.options = res.data.records;
+      state.loading = false;
+    }
+  }
+}
+const onChange = () => {
+  const selectedOption = state.options.find(option => option.id === state.ruleForm.id);
+  if (selectedOption) {
+    state.ruleForm.username = selectedOption.username;
+    state.ruleForm.nickName = selectedOption.nickName;
+    state.ruleForm.userRoles = selectedOption.userRoles;
+    // 可以根据需要更新其他字段
+  }
+}
+const clearForm = () => {
+  state.ruleForm = {
+    id: '',
+    username: '',
+    orgId: '',
+    orgName: '',
+    nickName: '',
+    userType: 1,
+    gender: 0,
+    userMobile: '',
+    idType: '',
+    userIdCardNumber: '',
+    userRole: '',
+    userRoles: [''],
+    nth: '',
+    gmtCreate: '',
+    isDelete: 0,
+    gmtModified: '',
+  }
+}
+// 暴露变量
+defineExpose({
+	openDialog,
+});
+</script>
diff --git a/src/views/system/managerUser/index.vue b/src/views/system/managerUser/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..71fefa72e7b36e75e8d5c8cf24388b1ae4a52150
--- /dev/null
+++ b/src/views/system/managerUser/index.vue
@@ -0,0 +1,186 @@
+<template>
+	<div class="system-managerUser-container layout-padding">
+		<el-card shadow="hover" class="layout-padding-auto">
+			<div class="system-managerUser-search mb15">
+        <el-button size="default" type="primary" class="ml10" @click="getTableData()">
+          <el-icon>
+            <ele-Search />
+          </el-icon>
+          刷新
+        </el-button>
+				<el-button size="default" type="success" class="ml10" @click="onOpenAddManagerUser('add')">
+					<el-icon>
+						<ele-FolderAdd />
+					</el-icon>
+					添加管理员用户
+				</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="账号" width="150" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="nickName" label="姓名" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="userMobile" label="电话号码" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="orgName" label="所在机构" width="200" show-overflow-tooltip></el-table-column>
+<!--        <el-table-column prop="userRole" label="角色" width="300" show-overflow-tooltip></el-table-column>-->
+        <el-table-column prop="userRoleCodes" label="角色" width="300" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="isDelete" label="状态" width="100" show-overflow-tooltip>
+					<template #default="scope">
+						<el-tag type="success" v-if="scope.row.isDelete==0">正常</el-tag>
+						<el-tag type="info" v-else>禁用</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="gmtModified" label="修改时间" show-overflow-tooltip></el-table-column>
+				<el-table-column label="操作" width="200">
+					<template #default="scope">
+              <el-button  size="small" text type="primary" @click="onOpenAuthorizeDialog(scope.row.id)" >授权管理</el-button>
+              <el-button  size="small" text type="primary" @click="onOpenEditAddManagerUser('edit', scope.row)" >修改信息</el-button>
+              <el-button :disabled="scope.row.isDelete === 1" size="small" text type="primary" @click="onRowDel(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, 50]"
+				v-model:current-page="state.tableData.param.current"
+				background
+				v-model:page-size="state.tableData.param.pageSize"
+				layout="total, sizes, prev, pager, next, jumper"
+				:total="state.tableData.total"
+			>
+			</el-pagination>
+		</el-card>
+    <ManagerDialog ref="ManagerDialogRef" @refresh="getTableData()" />
+    <authorizeDialog ref="authorizeDialogRef" @refresh="getTableData()" />
+	</div>
+</template>
+
+<script setup lang="ts" name="systemManagerUser">
+import {reactive, onMounted, defineAsyncComponent, ref} from 'vue';
+import { ElMessageBox, ElMessage } from 'element-plus';
+import {userApi} from "/@/api/user";
+
+const {managerListByPage,managerRemoveById} = userApi();
+const ManagerDialog = defineAsyncComponent(() => import('/src/views/system/managerUser/dialogManager.vue'));
+const ManagerDialogRef = ref();
+const authorizeDialog = defineAsyncComponent(() => import('/src/views/system/noRole/authorizeDialog.vue'));
+const authorizeDialogRef = ref();
+
+const state = reactive<ManagerSysUserState>({
+	tableData: {
+		data: [],
+		total: 0,
+		loading: false,
+		param: {
+			current: 1,
+			pageSize: 10,
+		},
+	},
+});
+const userTypeMap: { [key: string]: string } = {
+  OPERATION_MANAGER: '运营管理人员',
+  STUDENT: '学生',
+  TEACHER: '普通教师',
+  TEACHER_MANAGER: '教师管理员',
+  STAFF: '工作人员',
+  PARENT: '家长',
+  LEADER: '教育局管理员',
+  SCHOOL_MANAGER: '学校管理员',
+  DEVELOPER: '开发或运维人员',
+  BOE_LEADER: '教育局领导',
+  BOE_DEPARTMENT_HEAD: '部门负责人',
+  BOE_DEPARTMENT_STAFF: '部门工作人员',
+  BOE_SCHOOL_HEAD: '校长',
+  BOE_SCHOOL_DIRECTOR: '办公室主任'
+};
+const onOpenAddManagerUser = (type: string) => {
+  ManagerDialogRef.value.openDialog(type);
+};
+
+
+const onOpenEditAddManagerUser = (type: string, row: RowManagerUserType) => {
+  ManagerDialogRef.value.openDialog(type,row);
+};
+
+const onOpenAuthorizeDialog = (userId: string) => {
+  authorizeDialogRef.value.openDialog(userId);
+};
+
+// 转换 userRole 为码值
+const convertUserRolesToCodes = (data: RowManagerUserType[]) => {
+  return data.map(user => {
+    const userRoles = user.userRoles // 假设 userRole 是以逗号分隔的字符串
+    const roleCodes = userRoles.map(role => userTypeMap[role] || role); // 转换为码值，如果找不到则保持原值
+    return {
+      ...user,
+      userRoleCodes: roleCodes.join(', '), // 将码值数组转换为字符串
+    };
+  });
+};
+// 初始化表格数据
+const getTableData = async () => {
+  state.tableData.loading = true;
+  const res = await managerListByPage(state.tableData.param)
+  if (res.status === 200) {
+    console.log(res.data)
+    state.tableData.data = convertUserRolesToCodes(res.data.records);
+    state.tableData.total = res.data.total;
+    state.tableData.loading = false;
+  }
+
+
+};
+
+
+// 删除用户
+const onRowDel = (row: RowManagerUserType) => {
+	ElMessageBox.confirm(`此操作将永久删除账户名称：“${row.nickName}”，是否继续?`, '提示', {
+		confirmButtonText: '确认',
+		cancelButtonText: '取消',
+		type: 'warning',
+	})
+		.then(async () => {
+      const res = await managerRemoveById({id: row.id})
+      if (res.status === 200) {
+        await getTableData();
+        ElMessage.success('删除成功');
+      } else {
+        ElMessage.error('删除失败');
+      }
+    })
+		.catch(() => {});
+};
+
+
+// 分页改变
+const onHandleSizeChange = (val: number) => {
+	state.tableData.param.pageSize = val;
+	getTableData();
+};
+// 分页改变
+const onHandleCurrentChange = (val: number) => {
+	state.tableData.param.pageNum = val;
+	getTableData();
+};
+// 页面加载时
+onMounted(() => {
+	getTableData();
+});
+</script>
+
+<style scoped lang="scss">
+.system-managerUser-container {
+	:deep(.el-card__body) {
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+		overflow: auto;
+		.el-table {
+			flex: 1;
+		}
+	}
+}
+</style>
diff --git a/src/views/system/noRole/authorizeAddDialog.vue b/src/views/system/noRole/authorizeAddDialog.vue
new file mode 100644
index 0000000000000000000000000000000000000000..742bc6ea1101ad620ae7b4bb0967bd055bdee7a3
--- /dev/null
+++ b/src/views/system/noRole/authorizeAddDialog.vue
@@ -0,0 +1,240 @@
+<template>
+	<div class="system-authorizeAdd-dialog-container">
+		<el-dialog :title="state.dialog.title" v-model="state.dialog.isShowDialog" width="769px" draggable>
+			<el-form ref="authorizeAddDialogFormRef" :model="state.ruleForm" size="default" label-width="90px" :rules="rules">
+				<el-row :gutter="35">
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="角色" prop="roleId">
+							<el-select v-model="state.ruleForm.roleId" placeholder="请选择角色" clearable class="w100" @change="roleChange()">
+								<el-option label="运营管理人员" value="0"></el-option>
+                <el-option label="学生" value="1"></el-option>
+								<el-option label="普通教师" value="2"></el-option>
+								<el-option label="家长" value="5"></el-option>
+								<el-option label="教师管理员" value="3"></el-option>
+								<el-option label="学校管理员" value="7"></el-option>
+								<el-option label="教育局管理员" value="6"></el-option>
+								<el-option label="教育局领导" value="8"></el-option>
+								<el-option label="部门负责人" value="9"></el-option>
+								<el-option label="部门工作人员" value="10"></el-option>
+								<el-option label="校长" value="11"></el-option>
+								<el-option label="办公室主任" value="12"></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="state.ruleForm.roleId !='5'">
+						<el-form-item label="角色所属机构" prop="orgId" style="white-space: nowrap">
+							<el-tree-select
+								v-model="state.ruleForm.orgId"
+								:data="state.sysOrgData"
+								:render-after-expand="false"
+								style="width: 500px"
+								filterable
+								show-all-levels
+							/>
+						</el-form-item>
+					</el-col>
+					<el-col class="mb20" v-if="state.ruleForm.roleId == '5'">
+						<el-form-item label="学生" prop="studentId">
+							<el-select
+								v-model="state.ruleForm.studentId"
+								filterable
+								remote
+								reserve-keyword
+								placeholder="请输入学生学号进行搜索"
+								remote-show-suffix
+								:remote-method="remoteMethod"
+								:loading="state.loading"
+								style="width: 500px"
+							>
+								<el-option v-for="item in state.options" :key="item.id" :label="item.nickName" :value="item.id" :disabled="item.disabled">
+									<span style="float: left">{{ item.username }}</span>
+									<span style="float: right; color: var(--el-text-color-secondary); font-size: 13px">{{ item.nickName }}</span>
+								</el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<template #footer>
+				<span class="dialog-footer">
+					<el-button @click="onCancel" size="default">取 消</el-button>
+					<el-button type="primary" @click="onSubmit(authorizeAddDialogFormRef)" size="default">{{ state.dialog.submitTxt }}</el-button>
+				</span>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script setup lang="ts" name="authorizeAddDialog">
+import { reactive, ref } from 'vue';
+import { systemApi } from '/@/api/system';
+import { userApi } from '/@/api/user';
+import { ElMessage, FormInstance, FormRules } from 'element-plus';
+const { orgBOETree,orgSchoolOnlyTree,orgSchoolTree } = systemApi();
+const { studentListByPage,saveUserRoleRelationship} = userApi();
+// 定义子组件向父组件传值/事件
+const emit = defineEmits(['refresh']);
+
+const rules = reactive<FormRules<any>>({
+	roleId: [
+		{
+			required: true,
+			message: '请选择角色',
+			trigger: 'change',
+		},
+	],
+
+	orgId: [
+		{
+			required: true,
+			message: '请选择机构',
+			trigger: 'change',
+		},
+	],
+	studentId: [
+		{
+			required: true,
+			message: '请选择学生',
+			trigger: 'change',
+		},
+	],
+});
+
+// 定义变量内容
+const authorizeAddDialogFormRef = ref();
+const state = reactive({
+	ruleForm: {
+		userId: '',
+		roleId: '',
+		orgId: '',
+		studentId: '',
+	},
+	sysOrgData: [] as any[], // 部门数据
+	dialog: {
+		isShowDialog: false,
+		type: '',
+		title: '新增用户角色',
+		submitTxt: '新 增',
+	},
+	loading: false,
+	options: [
+		{
+			id: '1',
+			nickName: '',
+			username: '请输入学生学号进行搜索',
+			disabled: true,
+		},
+	],
+});
+
+// 打开弹窗
+const openDialog = (userId: string) => {
+	clearForm();
+	state.ruleForm.userId = userId;
+	state.dialog.isShowDialog = true;
+};
+// 关闭弹窗
+const closeDialog = () => {
+	state.dialog.isShowDialog = false;
+};
+// 取消
+const onCancel = () => {
+	closeDialog();
+};
+
+const roleChange = async () => {
+  state.ruleForm.orgId = '';
+  switch (state.ruleForm.roleId) {
+    case '0': {
+      let org = {
+        value: '1',
+        label: '教育云平台',
+      }
+      state.sysOrgData = [];
+      state.sysOrgData.push(org)
+      break;
+    }
+    case '1': {
+      state.sysOrgData = [];
+      const res = await orgSchoolTree()
+      if (res.status === 200) {
+        state.sysOrgData = res.data;
+      }
+      break;
+    }
+    case '2':
+    case '3':
+    case '7': {
+      state.sysOrgData = [];
+      const res = await orgSchoolOnlyTree()
+      if (res.status === 200) {
+        state.sysOrgData = res.data;
+      }
+      break;
+    }
+    case '6': {
+      let org = {
+        value: '3',
+        label: '昆区教育局',
+      }
+      state.sysOrgData = [];
+      state.sysOrgData.push(org)
+      break;
+    }
+    case '8':
+    case '9':
+    case '10':
+    case '11':
+    case '12': {
+      state.sysOrgData = [];
+      const res = await orgBOETree()
+      if (res.status === 200) {
+        state.sysOrgData = res.data;
+      }
+    }
+  }
+};
+
+const onSubmit = async (formEl: FormInstance | undefined) => {
+	if (!formEl) return;
+	await formEl.validate(async (valid) => {
+		if (valid) {
+      const res = await saveUserRoleRelationship(state.ruleForm)
+      if (res.status === 200) {
+        ElMessage.success('更改成功');
+        emit('refresh');
+      }else{
+        ElMessage.error('更改失败');
+      }
+			closeDialog();
+		}
+	});
+};
+
+const remoteMethod = async (query: string) => {
+	if (query !== '') {
+		state.loading = true;
+		const res = await studentListByPage({
+			userName: query,
+			nickName: '',
+		});
+		if (res.status === 200) {
+			state.options = res.data.records;
+			state.loading = false;
+		}
+	}
+};
+
+const clearForm = () => {
+	state.ruleForm = {
+		userId: '',
+		roleId: '',
+		orgId: '',
+		studentId: '',
+	};
+};
+// 暴露变量
+defineExpose({
+	openDialog,
+});
+</script>
diff --git a/src/views/system/noRole/authorizeDialog.vue b/src/views/system/noRole/authorizeDialog.vue
new file mode 100644
index 0000000000000000000000000000000000000000..8211fd8bc256af35d117e7a894323ece08c17760
--- /dev/null
+++ b/src/views/system/noRole/authorizeDialog.vue
@@ -0,0 +1,152 @@
+<template>
+	<div class="system-authorize-dialog-container">
+		<el-dialog :title="state.dialog.title" v-model="state.dialog.isShowDialog" width="90%" :close-on-click-modal="false" @close="close">
+      <el-card shadow="hover" class="layout-padding-auto" style="height: 70vh">
+        <div class="system-noRoleUser-search mb15">
+          <el-button size="default" type="success" class="ml10" @click="onOpenAuthorizeAddDialog(state.tableData.param.userId)">
+            <el-icon>
+              <ele-FolderAdd />
+            </el-icon>
+            添加角色
+          </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="roleName" label="角色名称" width="150" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="roleCode" label="角色代码" width="150" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="orgName" label="角色所属机构" width="250" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="childName" label="学生名称（家长身份）" width="200" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="topOrgName" label="学生所属学校（家长身份）" width="200" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="gmtModified" label="修改时间" show-overflow-tooltip></el-table-column>
+          <el-table-column label="操作" width="200">
+            <template #default="scope">
+              <el-button  size="small" text type="primary" @click="onRowDel(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, 50]"
+            v-model:current-page="state.tableData.param.current"
+            background
+            v-model:page-size="state.tableData.param.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="state.tableData.total"
+        >
+        </el-pagination>
+      </el-card>
+      <authorizeAddDialog ref="authorizeAddDialogRef" @refresh="refresh()" />
+		</el-dialog>
+	</div>
+</template>
+
+<script setup lang="ts" name="authorizeDialog">
+import {defineAsyncComponent, reactive, ref} from 'vue';
+import {userApi} from "/@/api/user";
+import {ElMessage, ElMessageBox} from "element-plus";
+
+// 定义子组件向父组件传值/事件
+const emit = defineEmits(['refresh']);
+const {findRoleListByUserId,UserRoleRelationshipRemoveById} = userApi();
+
+const authorizeAddDialog = defineAsyncComponent(() => import('/src/views/system/noRole/authorizeAddDialog.vue'));
+const authorizeAddDialogRef = ref();
+
+// 定义变量内容
+const state = reactive({
+  tableData: {
+    data: [],
+    total: 0,
+    loading: false,
+    param: {
+      current: 1,
+      pageSize: 10,
+      pageNum: 1,
+      userId:'',
+    },
+  },
+	dialog: {
+		isShowDialog: false,
+		title: '权限管理',
+	},
+});
+
+// 打开弹窗
+const openDialog = (userId: string) => {
+	state.dialog.isShowDialog = true;
+  state.tableData.param.userId=userId;
+  getTableData();
+};
+
+const onOpenAuthorizeAddDialog = (userId: string) => {
+  authorizeAddDialogRef.value.openDialog(userId);
+};
+
+// 打开弹窗
+const refresh = () => {
+  getTableData()
+};
+const close = () => {
+  emit('refresh');
+};
+
+// 初始化表格数据
+const getTableData = async () => {
+  state.tableData.loading = true;
+  const res = await findRoleListByUserId(state.tableData.param)
+  if (res.status === 200) {
+    state.tableData.data = res.data.records;
+    state.tableData.total = res.data.total;
+    state.tableData.loading = false;
+  }
+};
+
+// 删除用户
+const onRowDel = (row: any) => {
+  ElMessageBox.confirm(`此操作将永久删除角色名称：“${row.roleName}”，关联机构为：“${row.orgName}”，是否继续?`, '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  })
+      .then(async () => {
+        if(row.roleCode=='TEACHER') {
+          const hasSpecialRole = state.tableData.data.some((row1: any) => {
+            return row.orgName == row1.orgName && (row1.roleCode === 'TEACHER_MANAGER' || row1.roleCode === 'SCHOOL_MANAGER');
+          });
+
+          if (hasSpecialRole) {
+            ElMessage.error(`该用户在删除的机构“${row.orgName}”下还有管理员角色，请先删除`);
+            return;
+          }
+        }
+        const res = await UserRoleRelationshipRemoveById({id: row.id})
+        if (res.status === 200) {
+          await getTableData();
+          ElMessage.success('删除成功');
+        } else {
+          ElMessage.error('删除失败');
+        }
+      })
+};
+
+
+const onHandleSizeChange = (val: number) => {
+  state.tableData.param.pageSize = val;
+  getTableData();
+};
+// 分页改变
+const onHandleCurrentChange = (val: number) => {
+  state.tableData.param.pageNum = val;
+  getTableData();
+};
+
+
+// 暴露变量
+defineExpose({
+	openDialog,
+});
+</script>
diff --git a/src/views/system/noRole/index.vue b/src/views/system/noRole/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..87b2b4e66091fe4b524a86ba480a916260e26ad9
--- /dev/null
+++ b/src/views/system/noRole/index.vue
@@ -0,0 +1,145 @@
+<template>
+	<div class="system-noRoleUser-container layout-padding">
+		<el-card shadow="hover" class="layout-padding-auto">
+			<div class="system-noRoleUser-search mb15">
+        <el-button size="default" type="primary" class="ml10" @click="getTableData()">
+          <el-icon>
+            <ele-Search />
+          </el-icon>
+          刷新
+        </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="账号" width="150" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="nickName" label="姓名" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="userMobile" label="电话号码" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="gender" label="性别" width="100" show-overflow-tooltip>
+          <template #default="scope">
+            <el-tag effect="dark" v-if="scope.row.gender==0">男</el-tag>
+            <el-tag effect="dark" type="danger" v-else-if="scope.row.gender==1">女</el-tag>
+            <el-tag effect="dark" type="warning" v-else>未知</el-tag>
+          </template>
+        </el-table-column>
+				<el-table-column prop="isDelete" label="状态" width="100" show-overflow-tooltip>
+					<template #default="scope">
+						<el-tag type="success" v-if="scope.row.isDelete==0">正常</el-tag>
+						<el-tag type="info" v-else>禁用</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="gmtModified" label="修改时间" show-overflow-tooltip></el-table-column>
+				<el-table-column label="操作" width="200">
+					<template #default="scope">
+              <el-button  size="small" text type="primary" @click="onOpenAuthorizeDialog(scope.row.id)" >授权管理</el-button>
+<!--              <el-button :disabled="scope.row.isDelete === 1" size="small" text type="primary" @click="onRowDel(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, 50]"
+				v-model:current-page="state.tableData.param.current"
+				background
+				v-model:page-size="state.tableData.param.pageSize"
+				layout="total, sizes, prev, pager, next, jumper"
+				:total="state.tableData.total"
+			>
+			</el-pagination>
+		</el-card>
+    <authorizeDialog ref="authorizeDialogRef" @refresh="getTableData()" />
+	</div>
+</template>
+
+<script setup lang="ts" name="noRoleUser">
+import {reactive, onMounted, defineAsyncComponent, ref} from 'vue';
+import { ElMessageBox, ElMessage } from 'element-plus';
+import {userApi} from "/@/api/user";
+
+const {noRoleUserListByPage,UserRoleRelationshipRemoveById} = userApi();
+const authorizeDialog = defineAsyncComponent(() => import('/src/views/system/noRole/authorizeDialog.vue'));
+const authorizeDialogRef = ref();
+
+const state = reactive<ManagerSysUserState>({
+	tableData: {
+		data: [],
+		total: 0,
+		loading: false,
+		param: {
+			current: 1,
+			pageSize: 10,
+		},
+	},
+});
+
+const onOpenAuthorizeDialog = (userId: string) => {
+  authorizeDialogRef.value.openDialog(userId);
+};
+
+
+// 初始化表格数据
+const getTableData = async () => {
+  state.tableData.loading = true;
+  const res = await noRoleUserListByPage(state.tableData.param)
+  if (res.status === 200) {
+    state.tableData.data = res.data.records;
+    state.tableData.total = res.data.total;
+    state.tableData.loading = false;
+  }
+
+
+};
+
+
+// 删除用户
+// const onRowDel = (row: RowManagerUserType) => {
+// 	ElMessageBox.confirm(`此操作将删除用户，账号名称：“${row.nickName}”，是否继续?`, '提示', {
+// 		confirmButtonText: '确认',
+// 		cancelButtonText: '取消',
+// 		type: 'warning',
+// 	})
+// 		.then(async () => {
+//       const res = await UserRoleRelationshipRemoveById({id: row.id})
+//       if (res.status === 200) {
+//         await getTableData();
+//         ElMessage.success('删除成功');
+//       } else {
+//         ElMessage.error('删除失败');
+//       }
+//     })
+// 		.catch(() => {});
+// };
+
+
+// 分页改变
+const onHandleSizeChange = (val: number) => {
+	state.tableData.param.pageSize = val;
+	getTableData();
+};
+// 分页改变
+const onHandleCurrentChange = (val: number) => {
+	state.tableData.param.pageNum = val;
+	getTableData();
+};
+// 页面加载时
+onMounted(() => {
+	getTableData();
+});
+</script>
+
+<style scoped lang="scss">
+.system-managerUser-container {
+	:deep(.el-card__body) {
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+		overflow: auto;
+		.el-table {
+			flex: 1;
+		}
+	}
+}
+</style>
diff --git a/src/views/system/org/dialog.vue b/src/views/system/org/dialog.vue
new file mode 100644
index 0000000000000000000000000000000000000000..f7e72cb9697473d385f2c2c291c1c5ae166bfd19
--- /dev/null
+++ b/src/views/system/org/dialog.vue
@@ -0,0 +1,188 @@
+<template>
+	<div class="system-sysOrg-dialog-container">
+		<el-dialog :title="state.dialog.title" v-model="state.dialog.isShowDialog" width="769px">
+			<el-form ref="sysOrgDialogFormRef" :model="state.ruleForm" size="default" label-width="90px">
+				<el-row :gutter="35">
+					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
+						<el-form-item label="上级机构">
+<!--							<el-cascader-->
+<!--								:options="state.sysOrgData"-->
+<!--								:props="{ checkStrictly: true, value: 'id', label: 'title' }"-->
+<!--								placeholder="请选择机构"-->
+<!--								clearable-->
+<!--								class="w100"-->
+<!--								v-model="state.ruleForm.parentId"-->
+<!--							>-->
+<!--								<template #default="{ node, data }">-->
+<!--									<span>{{ data.title }}</span>-->
+<!--									<span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>-->
+<!--								</template>-->
+<!--							</el-cascader>-->
+              <el-tree-select
+                  v-model="state.ruleForm.parentId"
+                  :data="state.sysOrgData"
+                  :render-after-expand="true"
+                  style="width: 500px"
+                  check-strictly
+                  filterable
+              />
+						</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.orgName" 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.aliasClassName" 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-number v-model="state.ruleForm.orderNo" :min="0" :max="999" controls-position="right" placeholder="请输入排序" class="w100" />
+						</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.orgType" placeholder="请选择" clearable class="w100" >
+                <el-option label="分类节点"  :value="1"></el-option>
+                <el-option label="省、自治区、直辖市"  :value="2"></el-option>
+                <el-option label="地级市"  :value="3"></el-option>
+                <el-option label="旗县区"  :value="4"></el-option>
+                <el-option label="教育局"  :value="5"></el-option>
+                <el-option label="教育局科室"  :value="6"></el-option>
+                <el-option label="学校"  :value="7"></el-option>
+                <el-option label="学校科室"  :value="8"></el-option>
+                <el-option label="教育阶段"  :value="9"></el-option>
+                <el-option label="年级"  :value="10"></el-option>
+                <el-option label="班级"  :value="11"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="state.ruleForm.orgType==7">
+            <el-form-item label="学校类型">
+              <el-select v-model="state.ruleForm.schoolType" placeholder="请选择" clearable class="w100" >
+                <el-option label="九年一贯制（小学+初中）"  :value="1"></el-option>
+                <el-option label="完全中学"  :value="2"></el-option>
+                <el-option label="六年制（小学）"  :value="3"></el-option>
+                <el-option label="三年制（初中）"  :value="4"></el-option>
+                <el-option label="三年制（高中）"  :value="5"></el-option>
+              </el-select>
+            </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.isDelete" placeholder="请选择"  class="w100" :disabled="state.ruleForm.isDelete==0">
+                <el-option label="启用"  :value="0"></el-option>
+                <el-option label="禁用"  :value="1"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+				</el-row>
+			</el-form>
+			<template #footer>
+				<span class="dialog-footer">
+					<el-button @click="onCancel" size="default" >取 消</el-button>
+					<el-button type="primary" @click="onSubmit" size="default">{{ state.dialog.submitTxt }}</el-button>
+				</span>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script setup lang="ts" name="sysOrgDialog">
+import { reactive, ref } from 'vue';
+import { systemApi } from "/@/api/system";
+import {ElMessage} from "element-plus";
+// 定义子组件向父组件传值/事件
+const emit = defineEmits(['refresh']);
+const {saveOrUpdate} = systemApi();
+// 定义变量内容
+const sysOrgDialogFormRef = ref();
+const state = reactive({
+	ruleForm: {
+    id: '',
+    orgName: '',
+    aliasClassName: '',
+    orderNo: 1,
+    parentId: '',
+    orgType: 1,
+    schoolType: 1,
+    isDelete: 0,
+	},
+	sysOrgData: [] as OrgTreeType[], // 部门数据
+	dialog: {
+		isShowDialog: false,
+		type: '',
+		title: '',
+		submitTxt: '',
+	},
+});
+
+// 打开弹窗
+const openDialog = (type: string, row: OrgTreeType,tableData: OrgTreeType[]) => {
+	if (type === 'edit') {
+    state.ruleForm.id = row.id;
+		state.ruleForm.orgName = row.title;
+    state.ruleForm.aliasClassName = row.aliasClassName;
+    state.ruleForm.orderNo = row.orderNo;
+    state.ruleForm.parentId = row.parentId;
+    state.ruleForm.orgType = row.orgType;
+    state.ruleForm.schoolType = row.schoolType;
+    state.ruleForm.isDelete = row.isDelete;
+    state.sysOrgData = tableData;
+		state.dialog.title = '修改机构';
+		state.dialog.submitTxt = '修 改';
+	} else {
+    state.sysOrgData = tableData;
+		state.dialog.title = '新增机构';
+		state.dialog.submitTxt = '新 增';
+    clearForm();
+		// 清空表单，此项需加表单验证才能使用
+		// nextTick(() => {
+		// 	deptDialogFormRef.value.resetFields();
+		// });
+	}
+	state.dialog.isShowDialog = true;
+	getMenuData();
+};
+// 关闭弹窗
+const closeDialog = () => {
+	state.dialog.isShowDialog = false;
+};
+// 取消
+const onCancel = () => {
+	closeDialog();
+};
+// 提交
+const onSubmit = async () => {
+  const res = await saveOrUpdate(state.ruleForm);
+  if (res.status === 200) {
+    ElMessage.success('更改成功');
+  }
+  closeDialog();
+  emit('refresh');
+  // if (state.dialog.type === 'add') { }
+};
+// 初始化部门数据
+const getMenuData = () => {
+
+};
+const clearForm = () => {
+	state.ruleForm = {
+    id: '',
+    orgName: '',
+    aliasClassName: '',
+    orderNo: 1,
+    parentId: '',
+    orgType: 1,
+    schoolType: 1,
+    isDelete: 0,
+	};
+};
+// 暴露变量
+defineExpose({
+	openDialog,
+});
+</script>
diff --git a/src/views/system/org/index.vue b/src/views/system/org/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..407787c1731a9e1bf3a5163926f0d5f57f625f60
--- /dev/null
+++ b/src/views/system/org/index.vue
@@ -0,0 +1,179 @@
+<template>
+  <div class="system-sysOrg-container layout-padding">
+    <el-card shadow="hover" class="layout-padding-auto">
+      <div class="system-org-search mb15">
+        <!--				<el-input size="default" placeholder="请输入部门名称" style="max-width: 180px"> </el-input>-->
+        <!--				<el-button size="default" type="primary" class="ml10">-->
+        <!--					<el-icon>-->
+        <!--						<ele-Search />-->
+        <!--					</el-icon>-->
+        <!--					查询-->
+        <!--				</el-button>-->
+        <el-button size="default" type="success" class="ml10" @click="onOpenAddSysOrg('add',state.tableData.data)">
+          <el-icon>
+            <ele-FolderAdd/>
+          </el-icon>
+          新增组织机构
+        </el-button>
+      </div>
+      <el-table
+          :data="state.tableData.data"
+          v-loading="state.tableData.loading"
+          style="width: 100%"
+          row-key="id"
+          :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+          max-height="calc(100vh - 200px)"
+          stripe
+          :expand-row-keys="state.expandedRowKeys"
+          @expand-change="handleExpandChange"
+      >
+        <el-table-column prop="label" label="机构名称" show-overflow-tooltip width="480"></el-table-column>
+        <el-table-column prop="orgType" label="机构类型" show-overflow-tooltip width="200">
+          <template #default="scope">
+            <el-tag>
+              {{ orgTypeMap[scope.row.orgType].label }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="schoolType" label="学校类型" show-overflow-tooltip width="200">
+          <template #default="scope">
+            <el-tag v-if="scope.row.orgType==7&&scope.row.schoolType!=null">
+              {{ schoolTypeMap[scope.row.schoolType].label }}
+            </el-tag>
+            <el-tag v-else>
+              {{ schoolTypeMap[0].label }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="orderNo" label="排序" show-overflow-tooltip width="80">
+          <!--					<template #default="scope">-->
+          <!--						{{ scope.$index }}-->
+          <!--					</template>-->
+        </el-table-column>
+        <el-table-column prop="isDelete" label="状态" show-overflow-tooltip>
+          <template #default="scope">
+            <el-tag type="success" v-if="scope.row.isDelete==0">启用</el-tag>
+            <el-tag type="danger" v-else>禁用</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="aliasClassName" label="机构别名" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="gmtModified" label="修改时间" show-overflow-tooltip></el-table-column>
+				<el-table-column label="操作" show-overflow-tooltip width="140">
+					<template #default="scope">
+            <div v-if="scope.row.id!='1'">
+<!--              <el-button size="small" text type="primary" @click="onOpenAddSysOrg('add',state.tableData.data)" :disabled="scope.row.isDelete === 1">新增</el-button>-->
+              <el-button size="small" text type="primary" @click="onOpenEditSysOrg('edit', scope.row,state.tableData.data)" >修改</el-button>
+              <el-button size="small" text type="primary" @click="onTableRowDel(scope.row)" :disabled="scope.row.isDelete === 1">删除</el-button>
+            </div>
+					</template>
+				</el-table-column>
+			</el-table>
+		</el-card>
+		<sysOrgDialog ref="sysOrgDialogRef" @refresh="getTableData()" />
+	</div>
+</template>
+
+<script setup lang="ts" name="systemOrg">
+import {defineAsyncComponent, ref, reactive, onMounted} from 'vue';
+import {ElMessageBox, ElMessage} from 'element-plus';
+import {systemApi} from "/@/api/system";
+const {orgTree, removeById} = systemApi();
+// 引入组件
+const sysOrgDialog = defineAsyncComponent(() => import('/@/views/system/org/dialog.vue'));
+
+// 定义变量内容
+const sysOrgDialogRef = ref();
+const state = reactive<SysOrgState>({
+  tableData: {
+    data: [],
+    total: 0,
+    loading: false,
+    param: {
+      pageNum: 1,
+      pageSize: 2100,
+    },
+  },
+  expandedRowKeys: [], // 存储展开的行ID
+});
+// 定义机构类型映射对象
+const orgTypeMap:TypeMap = {
+  1: { label: '分类节点', description: 'NODES' },
+  2: { label: '省、自治区、直辖市', description: 'PROVINCE' },
+  3: { label: '地级市', description: 'CITY' },
+  4: { label: '旗县区', description: 'DISTRICT' },
+  5: { label: '教育局', description: 'BUREAU_EDUCATION' },
+  6: { label: '教育局科室', description: 'BUREAU_EDUCATION_DEPARTMENT' },
+  7: { label: '学校', description: 'SCHOOL' },
+  8: { label: '学校科室', description: 'SCHOOL_DEPARTMENT' },
+  9: { label: '教育阶段', description: 'EDUCATIONAL_STAGE' },
+  10: { label: '年级', description: 'GRADE' },
+  11: { label: '班级', description: 'CLASS' },
+};
+// 定义学校类型映射对象
+const schoolTypeMap:TypeMap = {
+  1: { label: '九年一贯制（小学+初中）', description: 'NINE_YEARS' },
+  2: { label: '完全中学', description: 'COMPLETE' },
+  3: { label: '六年制（小学）', description: 'SIZ_YEARS' },
+  4: { label: '三年制（初中）', description: 'THEE_YEARS_MIDDLE' },
+  5: { label: '三年制（高中）', description: 'THEE_YEARS_HIGH' },
+  0: { label: '未知', description: '' },
+};
+// 初始化表格数据
+const getTableData = async () => {
+  state.tableData.loading = true;
+  state.tableData.data = [];
+  const res = await orgTree()
+  if (res.status === 200) {
+    state.tableData.data = res.data;
+    state.tableData.loading = false;
+  }
+  state.tableData.total = state.tableData.data.length;
+  // 恢复展开状态
+  //state.expandedRowKeys = state.expandedRowKeys.filter(id => state.tableData.data.some(row => row.id === id));
+  console.log(state.expandedRowKeys);
+};
+// 打开新增菜单弹窗
+const onOpenAddSysOrg = (type: string, tableData: OrgTreeType[]) => {
+  sysOrgDialogRef.value.openDialog(type, null, tableData);
+};
+// 打开编辑菜单弹窗
+const onOpenEditSysOrg = (type: string, row: OrgTreeType, tableData: OrgTreeType[]) => {
+  sysOrgDialogRef.value.openDialog(type, row, tableData);
+};
+// 删除当前行
+
+
+
+const onTableRowDel = (row: OrgTreeType) => {
+	ElMessageBox.confirm(`此操作将删除该机构：${row.label}, 是否继续?`, '提示', {
+		confirmButtonText: '删除',
+		cancelButtonText: '取消',
+		type: 'warning',
+	})
+		.then( async () => {
+      const res = await removeById({id:row.id})
+      //console.log(res)
+      if (res.status === 200) {
+        ElMessage.success('删除成功');
+        await getTableData();
+      } else {
+        ElMessage.error('删除失败');
+      }
+
+    })
+		.catch(() => {});
+};
+// 处理展开和折叠行事件
+const handleExpandChange = (expandedRows: OrgTreeType, expanded:boolean ) => {
+  if (expanded) {
+    state.expandedRowKeys.push(expandedRows.id);
+  } else {
+    state.expandedRowKeys = state.expandedRowKeys.filter(id => id !== expandedRows.id);
+  }
+};
+// 页面加载时
+onMounted(() => {
+  getTableData();
+});
+</script>
diff --git a/src/views/system/orgTenant/dialog.vue b/src/views/system/orgTenant/dialog.vue
new file mode 100644
index 0000000000000000000000000000000000000000..a8dfd774feba45b9375250649eb1f5f252dd2992
--- /dev/null
+++ b/src/views/system/orgTenant/dialog.vue
@@ -0,0 +1,160 @@
+<template>
+  <div class="system-user-dialog-container">
+    <el-dialog :title="state.dialog.title" v-model="state.dialog.isShowDialog" width="1000px">
+      <el-form ref="orgTenantDialogFormRef" :model="state.ruleForm" :rules="rules" size="default" label-width="auto">
+        <el-row :gutter="35">
+          <el-col :span="24" class="mb20">
+            <el-form-item label="教育局" prop="orgId">
+              <el-tree-select
+                  v-model="state.ruleForm.orgId"
+                  :data="state.sysOrgData"
+                  :render-after-expand="true"
+                  style="width: 500px"
+                  check-strictly
+                  filterable
+                  show-all-levels
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="35">
+          <el-col :span="24" class="mb20">
+            <el-form-item label="租户id" prop="tenantId">
+              <el-input v-model="state.ruleForm.tenantId"
+                        placeholder="请输入租户id"
+                        clearable>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+      </el-form>
+      <template #footer>
+				<span class="dialog-footer">
+					<el-button @click="onCancel" size="default">取 消</el-button>
+					<el-button type="primary" @click="onSubmit(orgTenantDialogFormRef)" size="default">{{
+              state.dialog.submitTxt
+            }}</el-button>
+				</span>
+      </template>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script setup lang="ts" name="orgTenantDialog">
+import {nextTick, onMounted, reactive, ref} from 'vue';
+import type {FormRules, UploadProps, FormInstance} from 'element-plus'
+import {ElMessage, UploadUserFile} from "element-plus";
+
+import {useOrgTenantApi} from "/@/api/orgTenant";
+
+const {add, edit} = useOrgTenantApi();
+// 定义变量内容
+const orgTenantDialogFormRef = ref<FormInstance>();
+const state = reactive({
+  sysOrgData: [] as OrgTreeType[],
+  ruleForm: {
+    id: '',
+    orgId: '',
+    tenantId: '',
+  },
+  dialog: {
+    isShowDialog: false,
+    type: '',
+    title: '',
+    submitTxt: '',
+  },
+  sysOrgTreeData: {
+    data: [],
+    total: 0,
+    loading: false,
+    param: {
+      pageNum: 1,
+      pageSize: 2100,
+    },
+  },
+});
+const fileList = ref<UploadUserFile[]>([])
+
+// 定义子组件向父组件传值/事件
+const emit = defineEmits(['refresh']);
+const props = defineProps(['orgTree'])
+
+const rules = reactive<FormRules<RowOrgTenantType>>({
+  orgId: [
+    {required: true, message: '请选择一个教育局', trigger: 'blur'},
+  ],
+  tenantId: [
+    {required: true, message: '请填写应用主页', trigger: 'blur'},
+  ]
+})
+
+
+// 打开弹窗
+const openDialog = async (type: string, row: RowOrgTenantType) => {
+  state.sysOrgData = props.orgTree;
+  if (type === 'edit') {
+    state.dialog.title = '修改机构租户关系';
+    state.dialog.submitTxt = '修 改';
+    state.ruleForm = row;
+  } else {
+    state.dialog.title = '新增机构租户关系';
+    state.dialog.submitTxt = '新 增';
+
+    await nextTick(() => {
+      if (orgTenantDialogFormRef.value) {
+        orgTenantDialogFormRef.value.resetFields();
+      }
+    });
+  }
+  state.dialog.isShowDialog = true;
+};
+// 关闭弹窗
+const closeDialog = () => {
+  state.dialog.isShowDialog = false;
+};
+// 取消
+const onCancel = () => {
+  closeDialog();
+};
+// 提交
+const onSubmit = async (formEl: FormInstance | undefined) => {
+  if (!formEl) return
+  await formEl.validate(async (valid, fields) => {
+    if (!valid) {
+      console.log('error submit!!', fields);
+      ElMessage.error('数据校验失败!');
+      return false;
+    }
+    const res = state.ruleForm.id ? await edit(state.ruleForm) : await add(state.ruleForm)
+    if (res.status === 200) {
+      ElMessage.success(state.ruleForm.id ? '更改成功' : '新增成功');
+    }
+    closeDialog();
+    emit('refresh');
+  });
+
+  // if (state.dialog.type === 'add') { }
+};
+
+// 暴露变量
+defineExpose({
+  openDialog,
+});
+</script>
+<style scoped lang="scss">
+.croppers-container {
+  .cropper-img-warp {
+    text-align: center;
+
+    .cropper-img {
+      margin: auto;
+      width: 150px;
+      height: 150px;
+      border-radius: 100%;
+    }
+  }
+}
+</style>
diff --git a/src/views/system/orgTenant/index.vue b/src/views/system/orgTenant/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..5c65320ce0114044e51d88b4981a23f884bb1972
--- /dev/null
+++ b/src/views/system/orgTenant/index.vue
@@ -0,0 +1,199 @@
+<template>
+  <div class="system-user-container layout-padding">
+    <el-card shadow="hover" class="layout-padding-auto">
+      <div class="system-user-search mb15">
+        <el-row :gutter="20">
+          <!--          <el-col :span="4" class="mb15">-->
+          <!--            <el-input size="large" placeholder="请输入应用名称" v-model="appName" style="max-width: 240px"></el-input>-->
+          <!--          </el-col>-->
+          <!--          <el-col :span="8" class="mb15">-->
+          <!--            <el-tree-select-->
+          <!--                placeholder="请选择所属教育局"-->
+          <!--                v-model="searchState.orgId"-->
+          <!--                :data="searchState.sysOrgData"-->
+          <!--                :render-after-expand="true"-->
+          <!--                style="width: 400px"-->
+          <!--                check-strictly-->
+          <!--                filterable-->
+          <!--                show-all-levels-->
+          <!--                multiple-->
+          <!--            />-->
+          <!--          </el-col>-->
+          <!--          <el-col :span="6" class="mb15">-->
+          <!--            <el-select v-model="searchState.appSuitCrowds" placeholder="请选择应用适用人群"-->
+          <!--                       multiple clearable class="w100">-->
+          <!--              <el-option-->
+          <!--                  v-for="item in searchState.appSuitCrowdOptions"-->
+          <!--                  :key="item.key"-->
+          <!--                  :label="item.label"-->
+          <!--                  :value="item.value">-->
+          <!--              </el-option>-->
+          <!--            </el-select>-->
+          <!--          </el-col>-->
+          <el-col :span="6" class="mb15">
+            <!--            <el-button size="large" type="primary" class="ml10" @click="getTableData">-->
+            <!--              <el-icon>-->
+            <!--                <ele-Search/>-->
+            <!--              </el-icon>-->
+            <!--              查询-->
+            <!--            </el-button>-->
+            <el-button size="large" type="primary" class="ml10" @click="getTableData">
+              <el-icon>
+                <ele-Search/>
+              </el-icon>
+              查询
+            </el-button>
+
+            <el-button size="large" type="success" class="ml10" @click="onOpenAdd('add')">
+              <el-icon>
+                <ele-FolderAdd/>
+              </el-icon>
+              新增
+            </el-button>
+          </el-col>
+        </el-row>
+      </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="tenantId" label="租户id" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="orgName" label="教育局名称" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="gmtCreate" label="创建时间" 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="onOpenEdit('edit', scope.row)">修改
+            </el-button>
+            <el-button :disabled="scope.row.userName === 'admin'" size="small" text type="primary"
+                       @click="onRowDel(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.pageNum"
+          background
+          v-model:page-size="state.tableData.param.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="state.tableData.total"
+      >
+      </el-pagination>
+    </el-card>
+    <OrgTenantDialog ref="orgTenantDialogRef" @refresh="getTableData()" :orgTree="searchState.sysOrgData"/>
+  </div>
+</template>
+
+<script setup lang="ts" name="orgTenant">
+import {defineAsyncComponent, reactive, onMounted, ref} from 'vue';
+import {ElMessageBox, ElMessage} from 'element-plus';
+import {useOrgTenantApi} from '/@/api/orgTenant'
+import {systemApi} from "/@/api/system";
+
+const {listByPage, removeById} = useOrgTenantApi();
+const {orgTree} = systemApi();
+// 引入组件
+const OrgTenantDialog = defineAsyncComponent(() => import('/src/views/system/orgTenant/dialog.vue'));
+const appName = ref('');
+// 定义变量内容
+const orgTenantDialogRef = ref();
+const state = reactive<OrgTenantState>({
+  tableData: {
+    data: [],
+    total: 0,
+    loading: false,
+    param: {
+      pageNum: 1,
+      pageSize: 10,
+    },
+  },
+});
+
+const searchState = ref({})
+
+const loadOrgTreeData = async () => {
+  state.tableData.loading = true;
+  searchState.value.sysOrgData = [];
+  const res = await orgTree()
+  if (res.status === 200) {
+    searchState.value.sysOrgData = res.data;
+    state.tableData.loading = false;
+  }
+};
+// 初始化表格数据
+const getTableData = async () => {
+  state.tableData.loading = true;
+  const data = [];
+  const res = await listByPage({
+    current: state.tableData.param.pageNum,
+    pageSize: state.tableData.param.pageSize,
+  });
+  if (res.status === 200) {
+    // res.data.records.forEach((item: any) => {
+    //   if (item.orgId) {
+    //     item.orgId = item.orgId.split(',');
+    //   }
+    // })
+    data.push(...res.data.records);
+  }
+  state.tableData.data = data;
+  state.tableData.total = res.data.total;
+  state.tableData.loading = false;
+};
+// 打开新增弹窗
+const onOpenAdd = (type: string) => {
+  orgTenantDialogRef.value.openDialog(type);
+};
+// 打开修改弹窗
+const onOpenEdit = (type: string, row: RowOrgTenantType) => {
+  orgTenantDialogRef.value.openDialog(type, row);
+};
+// 删除
+const onRowDel = (row: RowOrgTenantType) => {
+  ElMessageBox.confirm(`确定要删除该租户关系吗？”，是否继续?`, '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    const res = await removeById({id: row.id})
+    if (res.status === 200) {
+      await getTableData();
+      ElMessage.success('删除成功');
+    }
+  }).catch(() => {
+  });
+};
+// 分页改变
+const onHandleSizeChange = (val: number) => {
+  state.tableData.param.pageSize = val;
+  getTableData();
+};
+// 分页改变
+const onHandleCurrentChange = (val: number) => {
+  state.tableData.param.pageNum = val;
+  getTableData();
+};
+// 页面加载时
+onMounted(() => {
+  loadOrgTreeData();
+  getTableData();
+});
+</script>
+
+<style scoped lang="scss">
+.system-user-container {
+  :deep(.el-card__body) {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    overflow: auto;
+
+    .el-table {
+      flex: 1;
+    }
+  }
+}
+</style>
diff --git a/src/views/system/parentUser/index.vue b/src/views/system/parentUser/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..be5bcaffac5de7e7ed80b9c62c29378312c21c6a
--- /dev/null
+++ b/src/views/system/parentUser/index.vue
@@ -0,0 +1,129 @@
+<template>
+	<div class="system-noRoleUser-container layout-padding">
+		<el-card shadow="hover" class="layout-padding-auto">
+			<div class="system-noRoleUser-search mb15">
+        <el-input v-model="state.tableData.param.nickName" size="default" placeholder="请输入姓名" :prefix-icon="Search" style="max-width: 180px"> </el-input>
+        <el-input v-model="state.tableData.param.userName" size="default" placeholder="请输入电话号码" :prefix-icon="Search" style="max-width: 180px;margin-left: 10px"> </el-input>
+        <el-button size="default" type="primary" class="ml10" @click="getTableData()">
+          <el-icon>
+            <ele-Search />
+          </el-icon>
+          查询
+        </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="账号" width="150" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="nickName" label="姓名" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="userMobile" label="电话号码" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="gender" label="性别" width="100" show-overflow-tooltip>
+          <template #default="scope">
+            <el-tag effect="dark" v-if="scope.row.gender==0">男</el-tag>
+            <el-tag effect="dark" type="danger" v-else-if="scope.row.gender==1">女</el-tag>
+            <el-tag effect="dark" type="warning" v-else>未知</el-tag>
+          </template>
+        </el-table-column>
+				<el-table-column prop="isDelete" label="状态" width="100" show-overflow-tooltip>
+					<template #default="scope">
+						<el-tag type="success" v-if="scope.row.isDelete==0">正常</el-tag>
+						<el-tag type="info" v-else>禁用</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="gmtModified" label="修改时间" show-overflow-tooltip></el-table-column>
+				<el-table-column label="操作" width="200">
+					<template #default="scope">
+              <el-button  size="small" text type="primary" @click="onOpenAuthorizeDialog(scope.row.id)" >授权管理</el-button>
+<!--              <el-button :disabled="scope.row.isDelete === 1" size="small" text type="primary" @click="onRowDel(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, 50]"
+				v-model:current-page="state.tableData.param.current"
+				background
+				v-model:page-size="state.tableData.param.pageSize"
+				layout="total, sizes, prev, pager, next, jumper"
+				:total="state.tableData.total"
+			>
+			</el-pagination>
+		</el-card>
+    <authorizeDialog ref="authorizeDialogRef" @refresh="getTableData()" />
+	</div>
+</template>
+
+<script setup lang="ts" name="noRoleUser">
+import {reactive, onMounted, defineAsyncComponent, ref} from 'vue';
+import {userApi} from "/@/api/user";
+import {Search} from "@element-plus/icons-vue";
+
+const {parentUserListByPage} = userApi();
+const authorizeDialog = defineAsyncComponent(() => import('/src/views/system/noRole/authorizeDialog.vue'));
+const authorizeDialogRef = ref();
+
+const state = reactive<ManagerSysUserState>({
+	tableData: {
+		data: [],
+		total: 0,
+		loading: false,
+		param: {
+			current: 1,
+			pageSize: 10,
+      nickName: '',
+      userName: '',
+		},
+	},
+});
+
+const onOpenAuthorizeDialog = (userId: string) => {
+  authorizeDialogRef.value.openDialog(userId);
+};
+
+
+// 初始化表格数据
+const getTableData = async () => {
+  state.tableData.loading = true;
+  const res = await parentUserListByPage(state.tableData.param)
+  if (res.status === 200) {
+    state.tableData.data = res.data.records;
+    state.tableData.total = res.data.total;
+    state.tableData.loading = false;
+  }
+
+
+};
+
+
+// 分页改变
+const onHandleSizeChange = (val: number) => {
+	state.tableData.param.pageSize = val;
+	getTableData();
+};
+// 分页改变
+const onHandleCurrentChange = (val: number) => {
+	state.tableData.param.pageNum = val;
+	getTableData();
+};
+// 页面加载时
+onMounted(() => {
+	getTableData();
+});
+</script>
+
+<style scoped lang="scss">
+.system-managerUser-container {
+	:deep(.el-card__body) {
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+		overflow: auto;
+		.el-table {
+			flex: 1;
+		}
+	}
+}
+</style>
diff --git a/src/views/system/studentUser/dialog.vue b/src/views/system/studentUser/dialog.vue
new file mode 100644
index 0000000000000000000000000000000000000000..1c655f107f91d7f3e8c7d9c1c423adf254b53373
--- /dev/null
+++ b/src/views/system/studentUser/dialog.vue
@@ -0,0 +1,255 @@
+<template>
+	<div class="system-user-dialog-container">
+		<el-dialog :title="state.dialog.title" v-model="state.dialog.isShowDialog" width="769px">
+			<el-form ref="studentUserDialogFormRef" :model="state.ruleForm" size="default" label-width="90px" :rules="rules">
+				<el-row :gutter="35">
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<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-form-item label="姓名" prop="nickName">
+							<el-input v-model="state.ruleForm.nickName" 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="入学年级" prop="nth">
+              <el-input v-model="state.ruleForm.nth" 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="证件类型" prop="idType">
+              <el-select v-model="state.ruleForm.idType" placeholder="请选择" clearable class="w100">
+                <el-option label="身份证" value="身份证"></el-option>
+                <el-option label="护照" value="护照"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+            <el-form-item label="身份证号" prop="userIdCardNumber">
+              <el-input v-model="state.ruleForm.userIdCardNumber" 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.roleSign" placeholder="请选择" clearable class="w100">-->
+<!--								<el-option label="超级管理员" value="admin"></el-option>-->
+<!--								<el-option label="普通用户" value="common"></el-option>-->
+<!--							</el-select>-->
+<!--						</el-form-item>-->
+<!--					</el-col>-->
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="state.dialog.type=='add'">
+						<el-form-item label="班级" prop="orgId">
+              <el-tree-select
+                  v-model="state.ruleForm.orgId"
+                  :data="state.sysOrgData"
+                  :render-after-expand="false"
+                  style="width: 500px"
+                  filterable
+                  show-all-levels
+              />
+						</el-form-item>
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="性别" prop="gender">
+							<el-select v-model="state.ruleForm.gender" placeholder="请选择" clearable class="w100">
+								<el-option label="男"  :value="0"></el-option>
+								<el-option label="女"  :value="1"></el-option>
+							</el-select>
+						</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.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-form-item label="用户状态">
+              <el-select v-model="state.ruleForm.isDelete" placeholder="请选择"  class="w100" :disabled="state.ruleForm.isDelete==0">
+                <el-option label="正常"  :value="0"></el-option>
+                <el-option label="禁用"  :value="1"></el-option>
+              </el-select>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<template #footer>
+				<span class="dialog-footer">
+					<el-button @click="onCancel" size="default">取 消</el-button>
+					<el-button type="primary" @click="onSubmit(studentUserDialogFormRef)" size="default">{{ state.dialog.submitTxt }}</el-button>
+				</span>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script setup lang="ts" name="systemUserDialog">
+import { reactive, ref} from 'vue';
+import {systemApi} from "/@/api/system";
+import {userApi} from "/@/api/user";
+import {ElMessage, FormInstance, FormRules} from 'element-plus'
+const {orgSchoolTree} = systemApi();
+const {saveOrUpdateStudent} = userApi();
+// 定义子组件向父组件传值/事件
+const emit = defineEmits(['refresh']);
+const validateIdCard = (rule: any, value: string, callback: any) => {
+  const idCardRegex = /(^\d{15}$)|(^\d{18}$)|(^\d{17}[\dXx]$)/;
+  if (!value) {
+    callback(new Error('请输入身份证号码'));
+  } else if(!state.ruleForm.idType){
+    callback(new Error('请先选择证件类型'));
+  } else if(state.ruleForm.idType=="护照"){
+    callback();
+  } else if (!idCardRegex.test(value)) {
+    callback(new Error('身份证号码格式不正确'));
+  } else {
+    callback();
+  }
+};
+const rules = reactive<FormRules<RowStudentUserType>>({
+  username: [
+    { required: true, message: '请输入学号', trigger: 'blur' },
+    //{ min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
+  ],
+  nickName: [
+    {
+      required: true,
+      message: '请输入姓名',
+      trigger: 'blur',
+    },
+  ],
+  idType: [
+    {
+      required: true,
+      message: '请选择证件类型',
+      trigger: 'change',
+    },
+  ],
+  userIdCardNumber: [
+    { required: true,validator: validateIdCard, trigger: 'blur' }, // 添加自定义校验规则
+    //{ min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
+  ],
+  orgId: [
+    {
+      required: true,
+      message: '请选择班级',
+      trigger: 'change',
+    },
+  ],
+  gender: [
+    {
+      required: true,
+      message: '请选择性别',
+      trigger: 'change',
+    },
+  ],
+
+})
+
+// 定义变量内容
+const studentUserDialogFormRef = ref();
+const state = reactive({
+	ruleForm: {
+    id: '',
+    username: '',
+    orgId: '',
+    orgName: '',
+    nickName: '',
+    userType: 1,
+    gender: 0,
+    userMobile: '',
+    idType: '',
+    userIdCardNumber: '',
+    nth: '',
+    gmtCreate: '',
+    isDelete: 0,
+    gmtModified: '',
+	},
+  sysOrgData: [] as OrgTreeType[], // 部门数据
+	dialog: {
+		isShowDialog: false,
+		type: '',
+		title: '',
+		submitTxt: '',
+	},
+});
+
+// 打开弹窗
+const openDialog = (type: string, row: RowStudentUserType) => {
+	if (type === 'edit') {
+		state.ruleForm = JSON.parse(JSON.stringify(row));
+		state.dialog.title = '修改学生';
+		state.dialog.submitTxt = '修 改';
+	} else {
+		state.dialog.title = '新增学生';
+		state.dialog.submitTxt = '新 增';
+    clearForm();
+	}
+  state.dialog.type = type;
+	state.dialog.isShowDialog = true;
+	getMenuData();
+};
+// 关闭弹窗
+const closeDialog = () => {
+	state.dialog.isShowDialog = false;
+};
+// 取消
+const onCancel = () => {
+	closeDialog();
+};
+// 提交
+// const onSubmit = () => {
+// 	closeDialog();
+// 	emit('refresh');
+// 	// if (state.dialog.type === 'add') { }
+// };
+const onSubmit = async (formEl: FormInstance | undefined) => {
+  if (!formEl) return
+  await formEl.validate(async (valid) => {
+    if (valid) {
+      state.ruleForm.userType = 1;
+      const res = await saveOrUpdateStudent(state.ruleForm)
+      if (res.status === 200) {
+        ElMessage.success('更改成功');
+        emit('refresh');
+      }else{
+        ElMessage.error('更改失败');
+      }
+      closeDialog();
+
+    }
+  })
+}
+
+// 初始化机构数据
+const getMenuData = async () => {
+  const res = await orgSchoolTree()
+  if (res.status === 200) {
+    state.sysOrgData = res.data;
+  }
+};
+
+const clearForm = () => {
+  state.ruleForm = {
+    id: '',
+    username: '',
+    orgId: '',
+    orgName: '',
+    nickName: '',
+    userType: 1,
+    gender: 0,
+    userMobile: '',
+    idType: '',
+    userIdCardNumber: '',
+    nth: '',
+    gmtCreate: '',
+    isDelete: 0,
+    gmtModified: '',
+  }
+}
+// 暴露变量
+defineExpose({
+	openDialog,
+});
+</script>
diff --git a/src/views/system/studentUser/dialogImport.vue b/src/views/system/studentUser/dialogImport.vue
new file mode 100644
index 0000000000000000000000000000000000000000..88bb411b8255b1e29e24e6b9d8d8add6e5560814
--- /dev/null
+++ b/src/views/system/studentUser/dialogImport.vue
@@ -0,0 +1,303 @@
+<template>
+	<div class="system-user-dialog-container">
+		<el-dialog :title="state.dialog.title" v-model="state.dialog.isShowDialog" width="769px">
+      <el-button size="default" type="primary"  @click="onDownloadImport()">
+        <el-icon>
+          <Download />
+        </el-icon>
+        模板下载
+      </el-button>
+			<template #footer>
+				<el-upload
+					ref="upload"
+					class="upload-demo"
+					drag
+					action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
+					:limit="1"
+					:on-exceed="handleExceed"
+					:on-change="handleChange"
+					:auto-upload="false"
+          :disabled="state.disabled"
+				>
+					<el-icon class="el-icon--upload"><upload-filled /></el-icon>
+					<div class="el-upload__text">拖拽文件到这里或者<em>点击上传</em></div>
+					<template #tip>
+						<div class="el-upload__tip">
+							<el-row justify="end" align="middle">
+								<el-col :span="10" :pull="8" >
+									<el-text class="mx-1" type="danger">只允许上传模板文件，仅支持xls、xlsx！</el-text>
+								</el-col>
+								<el-col :span="6">
+									<el-button @click="submitUpload" size="default" type="success" style="text-align: right" :disabled="state.disabled">执行导入</el-button>
+								</el-col>
+							</el-row>
+						</div>
+					</template>
+				</el-upload>
+				<div class="dynamic-log-container" style="margin-top: 20px; margin-bottom: 20px">
+          <el-row align="middle" :gutter="15" style="margin-bottom: 20px" v-if="state.progressVisable">
+            <el-col :span="4">
+              <el-text class="mx-1" type="primary" size="large">导入进度</el-text>
+            </el-col>
+            <el-col :span="20">
+              <el-progress
+                  :percentage="state.percentage"
+                  :stroke-width="15"
+                  :status="state.progressStatus"
+                  striped
+                  striped-flow
+                  :duration="10"
+              />
+            </el-col>
+          </el-row>
+					<el-card shadow="always" style="text-align: left; height: 380px">
+						<template #header>
+							<span>动态日志</span>
+						</template>
+						<el-scrollbar max-height="300px" ref="scrollbarRef">
+							<div class="log-content" ref="logContent">
+								<div v-for="(log, index) in logs" :key="index" class="log-item">
+									{{ log }}
+								</div>
+							</div>
+						</el-scrollbar>
+					</el-card>
+				</div>
+				<span class="dialog-footer">
+					<el-button @click="onCancel" size="default" :disabled="state.disabled">清除记录</el-button>
+				</span>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script setup lang="ts" name="systemUserDialog">
+import { nextTick, reactive, ref } from 'vue';
+import {Download, UploadFilled} from '@element-plus/icons-vue';
+import { ElMessage, ElScrollbar, genFileId, UploadInstance, UploadProps, UploadRawFile } from 'element-plus';
+import * as XLSX from 'xlsx';
+import { userApi } from '/@/api/user';
+
+const { studentImport,studentImportMQMessage } = userApi();
+
+const upload = ref<UploadInstance>();
+// 获取 log-content 元素
+const scrollbarRef = ref<InstanceType<typeof ElScrollbar>>();
+const logContent = ref<HTMLElement | null>(null);
+// 日志列表
+const logs = ref<string[]>([]);
+// 定义子组件向父组件传值/事件
+// eslint-disable-next-line @typescript-eslint/no-unused-vars,no-unused-vars
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const state = reactive({
+	file: null,
+	json: [],
+  disabled: false,
+  progressVisable:false,
+  progressStatus:'',
+  percentage:0,
+  percentLength:0,
+	dialog: {
+		isShowDialog: false,
+		type: '',
+		title: '批量导入学生',
+	},
+});
+
+const handleExceed: UploadProps['onExceed'] = (files) => {
+	upload.value!.clearFiles();
+	const file = files[0] as UploadRawFile;
+	file.uid = genFileId();
+	upload.value!.handleStart(file);
+};
+const handleChange: UploadProps['onChange'] = (uploadFile) => {
+	const file = uploadFile;
+	state.file = file.raw;
+	if (state.file.type == 'application/vnd.ms-excel' || state.file.type == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet') {
+		return true;
+	} else {
+		ElMessage.error('仅支持xls、xlsx！');
+		upload.value!.clearFiles();
+		return false;
+	}
+};
+//处理excel导入
+const submitUpload = () => {
+	//处理excel文件
+	// 判断文件是否存在
+	if (!state.file) {
+		ElMessage.error('请选择一个文件进行上传！');
+		return;
+	}
+	const reader = new FileReader();
+	reader.onload = (e) => {
+		const data = new Uint8Array(e.target?.result as ArrayBuffer);
+		const workbook = XLSX.read(data, { type: 'array' });
+		const firstSheetName = workbook.SheetNames[0];
+		const worksheet = workbook.Sheets[firstSheetName];
+    state.json = XLSX.utils.sheet_to_json(worksheet, { header: 1 });
+
+    // 过滤掉空行
+    state.json = state.json.filter(row => row.some(cell => cell !== ''));
+    state.percentLength = state.json.length;
+    importFile();
+	};
+	reader.readAsArrayBuffer(state.file);
+
+};
+
+const importFile = async () => {
+  state.disabled = true;
+  state.progressVisable = true;
+  state.percentage= 0;
+  state.progressStatus = '';
+  const ids: string[] = [];
+  addLog(`处理文件开始`);
+  let errorStatus= '';
+  if(state.percentLength<2){
+    errorStatus = 'exception';
+    addLog(`文件没检查到数据！请检查文件是否正确！`)
+  }
+  for (const [index, row] of state.json.entries()) {
+    // 处理每一行数据
+    // 判断第一行是否正确
+    if (index == 0) {
+      addLog(`文件格式检查开始`);
+      if (
+          row[0] == '学校' &&
+          row[1] == '学习阶段' &&
+          row[2] == '年级' &&
+          row[3] == '班级' &&
+          row[4] == '姓名' &&
+          row[5] == '学号' &&
+          row[6] == '证件类型' &&
+          row[7] == '证件号码' &&
+          row[8] == '入学年级' &&
+          row[9] == '性别' &&
+          row[10] == '父亲电话' &&
+          row[11] == '母亲电话'
+      ) {
+        addLog(`文件格式检查通过！`);
+        continue;
+      } else {
+        ElMessage.error('请检查文件格式是否正确！');
+        addLog('文件格式检查不通过！请检查文件格式是否正确！');
+        errorStatus = 'exception';
+        break;
+      }
+    }
+    let uploadRequest = {
+      school: row[0],
+      stage: row[1],
+      grade: row[2],
+      className: row[3],
+      nickName: row[4],
+      username: row[5],
+      idType: row[6],
+      userIdCardNumber: row[7],
+      nth: row[8],
+      gender: row[9],
+      fatherMobile: row[10],
+      motherMobile: row[11],
+    };
+    try {
+      const res = await studentImport(uploadRequest);
+      if (res.status === 200) {
+        addLog(`处理数据: ${JSON.stringify(row)}`);
+        addLog(`处理完成,` + res.data.msg);
+        ids.push(res.data.id);
+        onProgress();
+      }
+    } catch (error:any) {
+      addLog(`处理数据: ${JSON.stringify(row)}`);
+      if(typeof error.data=='string')
+        addLog("处理报错，异常为：" + error.data);
+      else
+        addLog("处理报错，异常为：" + error.data.errMsg);
+    }
+  }
+  addLog(`处理文件结束`);
+  try {
+    const res = await studentImportMQMessage(
+        {
+          id: ids.join(",")
+        })
+    if (res.status === 200) {
+      addLog(`处理消息队列成功`);
+    } else
+      addLog(`处理消息队列失败`);
+  }  catch (error:any) {
+    addLog(`处理消息队列失败`);
+  }
+  state.percentage = 100;
+  state.disabled = false;
+  if(errorStatus=='')
+    state.progressStatus = 'success';
+  else
+    state.progressStatus = 'exception';
+};
+
+// 添加日志的方法
+const addLog = (newLog: string) => {
+	logs.value.push(newLog + ` - ${new Date().toLocaleTimeString()}`);
+	// 滚动到底部
+	nextTick(() => {
+		if (logContent.value) {
+			scrollbarRef.value!.setScrollTop(logContent.value.scrollHeight);
+		}
+	});
+};
+const onDownloadImport = () => {
+  window.open("https://obs-nmbt.cucloud.cn/deer-base/excel/学生导入模板.xls")
+}
+// 打开弹窗
+const openDialog = () => {
+	state.dialog.isShowDialog = true;
+};
+// 关闭弹窗
+const closeDialog = () => {
+	state.dialog.isShowDialog = false;
+	upload.value!.clearFiles();
+	logs.value = [];
+	state.file = null;
+	state.json = [];
+  state.progressVisable=false;
+  state.progressStatus='';
+  state.percentage=0;
+  state.percentLength=0;
+};
+
+//进度条增长
+const onProgress = () => {
+  state.percentage = parseFloat(((state.percentage + 1 / state.percentLength * 100).toFixed(2)));
+};
+
+// 取消
+const onCancel = () => {
+	closeDialog();
+};
+
+
+// 暴露变量
+defineExpose({
+	openDialog,
+});
+</script>
+
+<style scoped>
+.dynamic-log-container {
+	width: 100%;
+	max-width: 800px;
+	margin: 0 auto;
+}
+
+.log-content {
+	padding: 10px;
+}
+
+.log-item {
+	margin-bottom: 5px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/system/studentUser/dialogParent.vue b/src/views/system/studentUser/dialogParent.vue
new file mode 100644
index 0000000000000000000000000000000000000000..bc298357b8ce8bb724c32a078d4bd667db6b082d
--- /dev/null
+++ b/src/views/system/studentUser/dialogParent.vue
@@ -0,0 +1,204 @@
+<template>
+	<div class="system-user-dialog-container">
+		<el-dialog :title="state.dialog.title" v-model="state.dialog.isShowDialog" width="769px">
+			<el-form ref="parentUserDialogFormRef" :model="state.ruleForm" size="default" label-width="90px" :rules="rules">
+				<el-row :gutter="35">
+          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+            <el-form-item label="学生ID" >
+              <el-input v-model="state.studentRow.id" placeholder="" disabled></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.studentRow.nickName" placeholder="" disabled></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="家长手机号" 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-form-item label="家长姓名" prop="nickName">
+							<el-input v-model="state.ruleForm.nickName" 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="关系" prop="gender">
+              <el-select v-model="state.ruleForm.gender" placeholder="请选择" clearable class="w100">
+                <el-option label="父子关系"  :value="0"></el-option>
+                <el-option label="母子关系"  :value="1"></el-option>
+              </el-select>
+            </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.roleSign" placeholder="请选择" clearable class="w100">-->
+<!--								<el-option label="超级管理员" value="admin"></el-option>-->
+<!--								<el-option label="普通用户" value="common"></el-option>-->
+<!--							</el-select>-->
+<!--						</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.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-form-item label="用户状态">
+              <el-select v-model="state.ruleForm.isDelete" placeholder="请选择"  class="w100" :disabled="state.ruleForm.isDelete==0">
+                <el-option label="正常"  :value="0"></el-option>
+                <el-option label="禁用"  :value="1"></el-option>
+              </el-select>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<template #footer>
+				<span class="dialog-footer">
+					<el-button @click="onCancel" size="default">取 消</el-button>
+					<el-button type="primary" @click="onSubmit(parentUserDialogFormRef)" size="default">{{ state.dialog.submitTxt }}</el-button>
+				</span>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script setup lang="ts" name="parentUserDialog">
+import { reactive, ref} from 'vue';
+import {ElMessage, FormInstance, FormRules} from 'element-plus'
+import {userApi} from "/@/api/user";
+
+const {saveOrUpdateParent} = userApi();
+// 定义子组件向父组件传值/事件
+const emit = defineEmits(['refresh']);
+const validatePhone = (rule: any, value: string, callback: any) => {
+  const phoneRegex = /^1[3-9]\d{9}$/;
+  if (!value) {
+    callback(new Error('请输入家长电话号码'));
+  } else if (!phoneRegex.test(value)) {
+    callback(new Error('手机号格式不正确'));
+  } else {
+    callback();
+  }
+};
+const rules = reactive<FormRules<RowStudentUserType>>({
+  username: [
+    {required: true, validator: validatePhone, trigger: 'blur' },
+    //{ min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
+  ],
+  nickName: [
+    { required: true, message: '请输入家长姓名', trigger: 'blur' },
+    //{ min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
+  ],
+  gender: [
+    {
+      required: true,
+      message: '请选择关系',
+      trigger: 'change',
+    },
+  ],
+
+})
+
+// 定义变量内容
+const parentUserDialogFormRef = ref();
+const state = reactive({
+	ruleForm: {
+    id: '',
+    nickName: '',
+    username:'',
+    isDelete:0,
+    gender: 0,
+	},
+  studentRow:{
+    id: '',
+    nickName: '',
+  },
+	dialog: {
+		isShowDialog: false,
+		type: '',
+		title: '',
+		submitTxt: '',
+	},
+});
+
+// 打开弹窗
+const openDialog = (type: string, studentRow:RowStudentUserType,row: RowStudentUserType) => {
+  // console.log("student");
+  // console.log(studentRow)
+  // console.log("parent");
+  // console.log(row);
+	if (type === 'edit') {
+		state.ruleForm = JSON.parse(JSON.stringify(row));
+    state.studentRow = JSON.parse(JSON.stringify(studentRow));
+		state.dialog.title = '修改家长信息';
+		state.dialog.submitTxt = '修 改';
+	} else {
+		state.dialog.title = '新增家长';
+		state.dialog.submitTxt = '新 增';
+    state.studentRow = JSON.parse(JSON.stringify(studentRow));
+    clearForm();
+	}
+	state.dialog.isShowDialog = true;
+};
+// 关闭弹窗
+const closeDialog = () => {
+	state.dialog.isShowDialog = false;
+};
+// 取消
+const onCancel = () => {
+	closeDialog();
+};
+// 提交
+// const onSubmit = () => {
+// 	closeDialog();
+// 	emit('refresh');
+// 	// if (state.dialog.type === 'add') { }
+// };
+const onSubmit = async (formEl: FormInstance | undefined) => {
+  if (!formEl) return
+  await formEl.validate(async (valid, ) => {
+    if (valid) {
+      const res = await saveOrUpdateParent(
+          {
+            parentId:state.ruleForm.id,
+            nickName:state.ruleForm.nickName,
+            username:state.ruleForm.username,
+            studentId:state.studentRow.id,
+            userMobile:state.ruleForm.username,
+            gender:state.ruleForm.gender,
+            isDelete:state.ruleForm.isDelete,
+          }
+      )
+      if (res.status === 200) {
+        ElMessage.success('更改成功');
+        emit('refresh');
+      }else{
+        ElMessage.error('更改失败');
+      }
+      closeDialog();
+
+    }
+  })
+}
+
+
+
+const clearForm = () => {
+  state.ruleForm = {
+    id: '',
+    nickName: '',
+    username:'',
+    isDelete:0,
+    gender: 0,
+  }
+
+}
+// 暴露变量
+defineExpose({
+	openDialog,
+});
+</script>
diff --git a/src/views/system/studentUser/index.vue b/src/views/system/studentUser/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..46467fa44e2b7b8ce922ca1cb4480fe0e928a26f
--- /dev/null
+++ b/src/views/system/studentUser/index.vue
@@ -0,0 +1,282 @@
+<template>
+	<div class="system-studentUser-container layout-padding">
+		<el-card shadow="hover" class="layout-padding-auto">
+			<div class="system-studentUser-search mb15">
+				<el-input v-model="state.tableData.param.nickName" size="default" placeholder="请输入姓名" :prefix-icon="Search" style="max-width: 180px"> </el-input>
+        <el-input v-model="state.tableData.param.userName" size="default" placeholder="请输入学号" :prefix-icon="Search" style="max-width: 180px;margin-left: 10px"> </el-input>
+        <el-tree-select
+            v-model="state.tableData.param.orgId"
+            :data="state.tableData.sysOrgData"
+            :render-after-expand="false"
+            size="default"
+            style="width: 400px;margin-left: 10px"
+            filterable
+            clearable
+            placeholder="学校筛选"
+            show-all-levels
+        />
+				<el-button size="default" type="primary" class="ml10" @click="getTableData()">
+					<el-icon>
+						<ele-Search />
+					</el-icon>
+					查询
+				</el-button>
+				<el-button size="default" type="success" class="ml10" @click="onOpenAddUser('add')">
+					<el-icon>
+						<ele-FolderAdd />
+					</el-icon>
+					新增学生
+				</el-button>
+        <el-button size="default" type="primary" class="ml10" @click="onOpenImport()">
+          <el-icon>
+            <Upload />
+          </el-icon>
+          批量导入
+        </el-button>
+
+			</div>
+			<el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%" stripe >
+        <el-table-column type="expand" >
+          <template #default="scope">
+              <el-row >
+                <el-col :span="12" :offset="1">
+                  <el-text size="large" type="primary" style="margin-right: 10px">父母信息</el-text>
+                  <el-button size="default" type="success" class="ml10" @click="onOpenAddParent('add',scope.row)" :disabled="scope.row.isDelete === 1">
+                    <el-icon>
+                      <ele-FolderAdd />
+                    </el-icon>
+                    新增家长
+                  </el-button>
+                </el-col>
+              </el-row>
+              <el-row style="margin-top: 20px;">
+                <el-col :span="11" :offset="1">
+                  <el-table :data="scope.row.parentUserList" v-loading="state.tableData.loading" style="" border>
+                    <el-table-column label="家长姓名" prop="nickName" width="150"/>
+                    <el-table-column label="家长电话（帐号）" prop="username" width="200"/>
+                    <el-table-column prop="gender" label="家长状态" width="100" show-overflow-tooltip>
+                      <template #default="scope3">
+                        <el-tag type="success" v-if="scope3.row.gender==0">父子</el-tag>
+                        <el-tag type="info" v-else>母子</el-tag>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="isDelete" label="家长状态" width="100" show-overflow-tooltip>
+                      <template #default="scope1">
+                        <el-tag type="success" v-if="scope1.row.isDelete==0">正常</el-tag>
+                        <el-tag type="info" v-else>禁用</el-tag>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="操作" width="200" >
+                      <template #default="scope2">
+                        <el-button  size="small" text type="primary" @click="onOpenAuthorizeDialog(scope2.row.id)" >授权管理</el-button>
+                        <el-button :disabled="scope.row.isDelete === 1" size="small" text type="primary" @click="onOpenEditParent('edit', scope.row,scope2.row)"
+                        >修改</el-button
+                        >
+                        <el-button :disabled="scope2.row.isDelete === 1" size="small" text type="primary" @click="onParentDel(scope.row,scope2.row)">删除</el-button>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                </el-col>
+              </el-row>
+          </template>
+        </el-table-column>
+				<el-table-column type="index" label="序号" width="60" />
+				<el-table-column prop="username" label="学号（帐号）" width="200" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="nickName" label="姓名" width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="orgName" label="所在班级" width="200" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="gender" label="性别" width="100" show-overflow-tooltip>
+          <template #default="scope">
+            <el-tag effect="dark" v-if="scope.row.gender==0">男</el-tag>
+            <el-tag effect="dark" type="danger" v-else>女</el-tag>
+          </template>
+        </el-table-column>
+				<el-table-column prop="idType" label="证件类型" width="100" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="userIdCardNumber" label="证件号码" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="nth" label="入学年级" width="100" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="isDelete" label="学生状态" width="100" show-overflow-tooltip>
+					<template #default="scope">
+						<el-tag type="success" v-if="scope.row.isDelete==0">正常</el-tag>
+						<el-tag type="info" v-else>禁用</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="gmtModified" label="修改时间" show-overflow-tooltip></el-table-column>
+				<el-table-column label="操作" width="100">
+					<template #default="scope">
+						<el-button  size="small" text type="primary" @click="onOpenEditUser('edit', scope.row)"
+							>修改</el-button
+						>
+						<el-button :disabled="scope.row.isDelete === 1" size="small" text type="primary" @click="onRowDel(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,50,100, 200, 500]"
+				v-model:current-page="state.tableData.param.current"
+				background
+				v-model:page-size="state.tableData.param.pageSize"
+				layout="total, sizes, prev, pager, next, jumper"
+				:total="state.tableData.total"
+			>
+			</el-pagination>
+		</el-card>
+		<studentUserDialog ref="studentUserDialogRef" @refresh="getTableData()" />
+    <parentUserDialog ref="parentUserDialogRef" @refresh="getTableData()" />
+    <importDialog ref="importDialogRef" />
+    <authorizeDialog ref="authorizeDialogRef" @refresh="getTableData()" />
+	</div>
+</template>
+
+<script setup lang="ts" name="systemStudentUser">
+import { defineAsyncComponent, reactive, onMounted, ref } from 'vue';
+import { ElMessageBox, ElMessage } from 'element-plus';
+import {Search,Upload} from "@element-plus/icons-vue";
+import {userApi} from "/@/api/user";
+import {systemApi} from "/@/api/system";
+const {orgSchoolOnlyTree} = systemApi();
+const {studentRemoveById,studentListByPage,parentRemoveById} = userApi();
+
+// 引入组件
+const studentUserDialog = defineAsyncComponent(() => import('/src/views/system/studentUser/dialog.vue'));
+const parentUserDialog = defineAsyncComponent(() => import('/src/views/system/studentUser/dialogParent.vue'));
+const importDialog = defineAsyncComponent(() => import('/src/views/system/studentUser/dialogImport.vue'));
+const authorizeDialog = defineAsyncComponent(() => import('/src/views/system/noRole/authorizeDialog.vue'));
+const authorizeDialogRef = ref();
+// 定义变量内容
+const studentUserDialogRef = ref();
+const parentUserDialogRef = ref();
+const importDialogRef = ref();
+const state = reactive<StudentSysUserState>({
+	tableData: {
+		data: [],
+		total: 0,
+		loading: false,
+    sysOrgData:[],
+		param: {
+			current: 1,
+			pageSize: 10,
+      nickName:'',
+      userName:'',
+      orgId:'',
+		},
+	},
+});
+
+// 初始化表格数据
+const getTableData = async () => {
+  state.tableData.loading = true;
+  const res = await studentListByPage(state.tableData.param)
+  if (res.status === 200) {
+    state.tableData.data = res.data.records;
+    state.tableData.total = res.data.total;
+    state.tableData.loading = false;
+  }
+};
+// 初始化机构数据
+const getMenuData = async () => {
+  const res = await orgSchoolOnlyTree()
+  if (res.status === 200) {
+    state.tableData.sysOrgData = res.data;
+  }
+};
+
+// 打开新增用户弹窗
+const onOpenAddUser = (type: string) => {
+  studentUserDialogRef.value.openDialog(type);
+};
+const onOpenAddParent = (type: string,studentRow: RowStudentUserType) => {
+  parentUserDialogRef.value.openDialog(type, studentRow);
+};
+// 打开修改用户弹窗
+const onOpenEditUser = (type: string, row: RowStudentUserType) => {
+  studentUserDialogRef.value.openDialog(type, row);
+};
+const onOpenEditParent = (type: string, studentRow: RowStudentUserType,row: RowStudentUserType) => {
+  parentUserDialogRef.value.openDialog(type,studentRow,row);
+};
+const onOpenImport = () => {
+  importDialogRef.value.openDialog();
+};
+
+const onOpenAuthorizeDialog = (userId: string) => {
+  authorizeDialogRef.value.openDialog(userId);
+};
+// 删除用户
+const onRowDel = (row: RowStudentUserType) => {
+	ElMessageBox.confirm(`此操作将删除该用户的所有学生身份，账户名称：“${row.nickName}”，是否继续?`, '提示', {
+		confirmButtonText: '确认',
+		cancelButtonText: '取消',
+		type: 'warning',
+	})
+		.then(async () => {
+      const res = await studentRemoveById({id: row.id})
+      if (res.status === 200) {
+        await getTableData();
+        ElMessage.success('删除成功');
+      }else{
+        ElMessage.error('删除失败');
+      }
+    })
+		.catch(() => {});
+};
+
+const onParentDel = (row: RowStudentUserType, parentRow: RowStudentUserType) => {
+  // console.log("student");
+  // console.log(row)
+  // console.log("parent");
+  // console.log(parentRow);
+  ElMessageBox.confirm(`此操作将删除家长与学生的关系：“${parentRow.nickName}”，是否继续?`, '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  })
+      .then(async () => {
+        const res = await parentRemoveById(
+            {
+                studentId: row.id,
+                parentId: parentRow.id
+            }
+        )
+        if (res.status === 200) {
+          await getTableData();
+          ElMessage.success('删除成功');
+        }else{
+          ElMessage.error('删除失败');
+        }
+      })
+      .catch(() => {});
+};
+// 分页改变
+const onHandleSizeChange = (val: number) => {
+	state.tableData.param.pageSize = val;
+	getTableData();
+};
+// 分页改变
+const onHandleCurrentChange = (val: number) => {
+	state.tableData.param.pageNum = val;
+	getTableData();
+};
+// 页面加载时
+onMounted(() => {
+	getTableData();
+  getMenuData();
+});
+</script>
+
+<style scoped lang="scss">
+.system-studentUser-container {
+	:deep(.el-card__body) {
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+		overflow: auto;
+		.el-table {
+			flex: 1;
+		}
+	}
+}
+</style>
diff --git a/src/views/system/teacherUser/dialog.vue b/src/views/system/teacherUser/dialog.vue
new file mode 100644
index 0000000000000000000000000000000000000000..2b2bde37990e78a3925a25b34300f2b3b0341410
--- /dev/null
+++ b/src/views/system/teacherUser/dialog.vue
@@ -0,0 +1,264 @@
+<template>
+	<div class="system-user-dialog-container">
+		<el-dialog :title="state.dialog.title" v-model="state.dialog.isShowDialog" width="769px">
+			<el-form ref="teacherUserDialogFormRef" :model="state.ruleForm" size="default" label-width="90px" :rules="rules">
+				<el-row :gutter="35">
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="姓名" prop="nickName">
+							<el-input v-model="state.ruleForm.nickName" 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="电话号码" 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-form-item label="证件类型" prop="idType">
+              <el-select v-model="state.ruleForm.idType" placeholder="请选择" clearable class="w100">
+                <el-option label="身份证" value="身份证"></el-option>
+                <el-option label="护照" value="护照"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+            <el-form-item label="身份证号" prop="userIdCardNumber">
+              <el-input v-model="state.ruleForm.userIdCardNumber" 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.roleSign" placeholder="请选择" clearable class="w100">-->
+<!--								<el-option label="超级管理员" value="admin"></el-option>-->
+<!--								<el-option label="普通用户" value="common"></el-option>-->
+<!--							</el-select>-->
+<!--						</el-form-item>-->
+<!--					</el-col>-->
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="state.dialog.type=='add'">
+						<el-form-item label="学校" prop="orgId">
+              <el-tree-select
+                  v-model="state.ruleForm.orgId"
+                  :data="state.sysOrgData"
+                  :render-after-expand="false"
+                  style="width: 500px"
+                  filterable
+                  multiple
+                  show-all-levels
+              />
+						</el-form-item>
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="性别" prop="gender">
+							<el-select v-model="state.ruleForm.gender" placeholder="请选择" clearable class="w100">
+								<el-option label="男"  :value="0"></el-option>
+								<el-option label="女"  :value="1"></el-option>
+							</el-select>
+						</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.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-form-item label="用户状态">
+              <el-select v-model="state.ruleForm.isDelete" placeholder="请选择"  class="w100" :disabled="state.ruleForm.isDelete==0">
+                <el-option label="正常"  :value="0"></el-option>
+                <el-option label="禁用"  :value="1"></el-option>
+              </el-select>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<template #footer>
+				<span class="dialog-footer">
+					<el-button @click="onCancel" size="default">取 消</el-button>
+					<el-button type="primary" @click="onSubmit(teacherUserDialogFormRef)" size="default">{{ state.dialog.submitTxt }}</el-button>
+				</span>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script setup lang="ts" name="systemUserDialog">
+import { reactive, ref} from 'vue';
+import {systemApi} from "/@/api/system";
+import {userApi} from "/@/api/user";
+import {ElMessage, FormInstance, FormRules} from 'element-plus'
+const {orgSchoolOnlyTree} = systemApi();
+const {saveOrUpdateTeacher} = userApi();
+// 定义子组件向父组件传值/事件
+const emit = defineEmits(['refresh']);
+const validateIdCard = (rule: any, value: string, callback: any) => {
+  const idCardRegex = /(^\d{15}$)|(^\d{18}$)|(^\d{17}[\dXx]$)/;
+  if (!value) {
+    callback(new Error('请输入身份证号码'));
+  } else if(!state.ruleForm.idType){
+    callback(new Error('请先选择证件类型'));
+  } else if(state.ruleForm.idType=="护照"){
+    callback();
+  } else if (!idCardRegex.test(value)) {
+    callback(new Error('身份证号码格式不正确'));
+  } else {
+    callback();
+  }
+};
+const validatePhone = (rule: any, value: string, callback: any) => {
+  const phoneRegex = /^1[3-9]\d{9}$/;
+  if (!value) {
+    callback(new Error('请输入电话号码'));
+  } else if (!phoneRegex.test(value)) {
+    callback(new Error('手机号格式不正确'));
+  } else {
+    callback();
+  }
+};
+const rules = reactive<FormRules<RowStudentUserType>>({
+  username: [
+    {required: true, validator: validatePhone, trigger: 'blur' }, // 添加自定义校验规则
+    //{ min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
+  ],
+  nickName: [
+    {
+      required: true,
+      message: '请输入姓名',
+      trigger: 'blur',
+    },
+  ],
+  idType: [
+    {
+      required: true,
+      message: '请选择证件类型',
+      trigger: 'change',
+    },
+  ],
+  userIdCardNumber: [
+    { required: true,validator: validateIdCard, trigger: 'blur' }, // 添加自定义校验规则
+    //{ min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
+  ],
+  orgId: [
+    {
+      required: true,
+      message: '请选择学校',
+      trigger: 'change',
+    },
+  ],
+  gender: [
+    {
+      required: true,
+      message: '请选择性别',
+      trigger: 'change',
+    },
+  ],
+
+})
+
+// 定义变量内容
+const teacherUserDialogFormRef = ref();
+const state = reactive({
+	ruleForm: {
+    id: '',
+    username: '',
+    orgId: '',
+    orgName: '',
+    nickName: '',
+    userType: 2,
+    gender: 0,
+    userMobile: '',
+    idType: '',
+    userIdCardNumber: '',
+    nth: '',
+    gmtCreate: '',
+    isDelete: 0,
+    gmtModified: '',
+	},
+  sysOrgData: [] as OrgTreeType[], // 部门数据multiple
+	dialog: {
+		isShowDialog: false,
+		type: '',
+		title: '',
+		submitTxt: '',
+	},
+});
+
+// 打开弹窗
+const openDialog = (type: string, row: RowStudentUserType) => {
+	if (type === 'edit') {
+		state.ruleForm = JSON.parse(JSON.stringify(row));
+		state.dialog.title = '修改老师';
+		state.dialog.submitTxt = '修 改';
+	} else {
+		state.dialog.title = '新增老师';
+		state.dialog.submitTxt = '新 增';
+    clearForm();
+	}
+  state.dialog.type = type;
+	state.dialog.isShowDialog = true;
+	getMenuData();
+};
+// 关闭弹窗
+const closeDialog = () => {
+	state.dialog.isShowDialog = false;
+};
+// 取消
+const onCancel = () => {
+	closeDialog();
+};
+// 提交
+// const onSubmit = () => {
+// 	closeDialog();
+// 	emit('refresh');
+// 	// if (state.dialog.type === 'add') { }
+// };
+const onSubmit = async (formEl: FormInstance | undefined) => {
+  if (!formEl) return
+  await formEl.validate(async (valid, fields) => {
+    if (valid) {
+      state.ruleForm.userType = 2;
+      let params = JSON.parse(JSON.stringify(state.ruleForm))
+      params.userMobile = params.username;
+      params.orgId = params.orgId.join(',');
+      const res = await saveOrUpdateTeacher(params)
+      if (res.status === 200) {
+        ElMessage.success('更改成功');
+        emit('refresh');
+      }else{
+        ElMessage.error('更改失败');
+      }
+      closeDialog();
+
+    }
+  })
+}
+
+// 初始化机构数据
+const getMenuData = async () => {
+  const res = await orgSchoolOnlyTree()
+  if (res.status === 200) {
+    state.sysOrgData = res.data;
+  }
+};
+
+const clearForm = () => {
+  state.ruleForm = {
+    id: '',
+    username: '',
+    orgId: '',
+    orgName: '',
+    nickName: '',
+    userType: 2,
+    gender: 0,
+    userMobile: '',
+    idType: '',
+    userIdCardNumber: '',
+    nth: '',
+    gmtCreate: '',
+    isDelete: 0,
+    gmtModified: '',
+  }
+}
+// 暴露变量
+defineExpose({
+	openDialog,
+});
+</script>
diff --git a/src/views/system/teacherUser/dialogImport.vue b/src/views/system/teacherUser/dialogImport.vue
new file mode 100644
index 0000000000000000000000000000000000000000..7b804af3f4e31c88b7399fe68c5bbeb84fda1351
--- /dev/null
+++ b/src/views/system/teacherUser/dialogImport.vue
@@ -0,0 +1,290 @@
+<template>
+	<div class="system-user-dialog-container">
+		<el-dialog :title="state.dialog.title" v-model="state.dialog.isShowDialog" width="769px">
+      <el-button size="default" type="primary"  @click="onDownloadImport()">
+        <el-icon>
+          <Download />
+        </el-icon>
+        模板下载
+      </el-button>
+			<template #footer>
+				<el-upload
+					ref="upload"
+					class="upload-demo"
+					drag
+					action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
+					:limit="1"
+					:on-exceed="handleExceed"
+					:on-change="handleChange"
+					:auto-upload="false"
+          :disabled="state.disabled"
+				>
+					<el-icon class="el-icon--upload"><upload-filled /></el-icon>
+					<div class="el-upload__text">拖拽文件到这里或者<em>点击上传</em></div>
+					<template #tip>
+						<div class="el-upload__tip">
+							<el-row justify="end" align="middle">
+								<el-col :span="10" :pull="8">
+									<el-text class="mx-1" type="danger">只允许上传模板文件，仅支持xls、xlsx！</el-text>
+								</el-col>
+								<el-col :span="6">
+									<el-button @click="submitUpload" size="default" type="success" style="text-align: right" :disabled="state.disabled">执行导入</el-button>
+								</el-col>
+							</el-row>
+						</div>
+					</template>
+				</el-upload>
+				<div class="dynamic-log-container" style="margin-top: 20px; margin-bottom: 20px">
+          <el-row align="middle" :gutter="15" style="margin-bottom: 20px" v-if="state.progressVisable">
+            <el-col :span="4">
+              <el-text class="mx-1" type="primary" size="large">导入进度</el-text>
+            </el-col>
+            <el-col :span="20">
+              <el-progress
+                  :percentage="state.percentage"
+                  :stroke-width="15"
+                  :status="state.progressStatus"
+                  striped
+                  striped-flow
+                  :duration="10"
+              />
+            </el-col>
+          </el-row>
+					<el-card shadow="always" style="text-align: left; height: 380px">
+						<template #header>
+							<span>动态日志</span>
+						</template>
+						<el-scrollbar max-height="300px" ref="scrollbarRef">
+							<div class="log-content" ref="logContent">
+								<div v-for="(log, index) in logs" :key="index" class="log-item">
+									{{ log }}
+								</div>
+							</div>
+						</el-scrollbar>
+					</el-card>
+				</div>
+				<span class="dialog-footer">
+					<el-button @click="onCancel" size="default" :disabled="state.disabled">清除记录</el-button>
+				</span>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script setup lang="ts" name="systemUserDialog">
+import { nextTick, reactive, ref } from 'vue';
+import {Download, UploadFilled} from '@element-plus/icons-vue';
+import { ElMessage, ElScrollbar, genFileId, UploadInstance, UploadProps, UploadRawFile } from 'element-plus';
+import * as XLSX from 'xlsx';
+import { userApi } from '/@/api/user';
+
+const { teacherImport,teacherImportMQMessage } = userApi();
+
+const upload = ref<UploadInstance>();
+// 获取 log-content 元素
+const scrollbarRef = ref<InstanceType<typeof ElScrollbar>>();
+const logContent = ref<HTMLElement | null>(null);
+// 日志列表
+const logs = ref<string[]>([]);
+// 定义子组件向父组件传值/事件
+// eslint-disable-next-line @typescript-eslint/no-unused-vars,no-unused-vars
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const state = reactive({
+	file: null,
+	json: [],
+  disabled: false,
+  progressVisable:false,
+  progressStatus:'',
+  percentage:0,
+  percentLength:0,
+	dialog: {
+		isShowDialog: false,
+		type: '',
+		title: '批量导入老师',
+	},
+});
+
+const handleExceed: UploadProps['onExceed'] = (files) => {
+	upload.value!.clearFiles();
+	const file = files[0] as UploadRawFile;
+	file.uid = genFileId();
+	upload.value!.handleStart(file);
+};
+const handleChange: UploadProps['onChange'] = (uploadFile) => {
+	const file = uploadFile;
+	state.file = file.raw;
+	if (state.file.type == 'application/vnd.ms-excel' || state.file.type == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet') {
+		return true;
+	} else {
+		ElMessage.error('仅支持xls、xlsx！');
+		upload.value!.clearFiles();
+		return false;
+	}
+};
+//处理excel导入
+const submitUpload = () => {
+	//处理excel文件
+	// 判断文件是否存在
+	if (!state.file) {
+		ElMessage.error('请选择一个文件进行上传！');
+		return;
+	}
+	const reader = new FileReader();
+	reader.onload = (e) => {
+		const data = new Uint8Array(e.target?.result as ArrayBuffer);
+		const workbook = XLSX.read(data, { type: 'array' });
+		const firstSheetName = workbook.SheetNames[0];
+		const worksheet = workbook.Sheets[firstSheetName];
+    state.json = XLSX.utils.sheet_to_json(worksheet, { header: 1 });
+    // 过滤掉空行
+    state.json = state.json.filter(row => row.some(cell => cell !== ''));
+    state.percentLength = state.json.length;
+    importFile();
+	};
+	reader.readAsArrayBuffer(state.file);
+
+};
+
+const importFile = async () => {
+  state.disabled = true;
+  state.progressVisable = true;
+  state.percentage= 0;
+  state.progressStatus = '';
+  const ids: string[] = [];
+  addLog(`处理文件开始`);
+  let errorStatus= '';
+  if(state.percentLength<2){
+    errorStatus = 'exception';
+    addLog(`文件没检查到数据！请检查文件是否正确！`)
+  }
+  for (const [index, row] of state.json.entries()) {
+    // 处理每一行数据
+    // 判断第一行是否正确
+    if (index == 0) {
+      addLog(`文件格式检查开始`);
+      if (
+          row[0] == '学校' &&
+          row[1] == '电话号码（账号）' &&
+          row[2] == '姓名' &&
+          row[3] == '证件类型' &&
+          row[4] == '证件号码' &&
+          row[5] == '性别'
+      ) {
+        addLog(`文件格式检查通过！`);
+        continue;
+      } else {
+        ElMessage.error('请检查文件格式是否正确！');
+        addLog('文件格式检查不通过！请检查文件格式是否正确！');
+        errorStatus = 'exception';
+        break;
+      }
+    }
+    let uploadRequest = {
+      school: row[0],
+      nickName: row[2],
+      username: row[1],
+      idType: row[3],
+      userIdCardNumber: row[4],
+      gender: row[5],
+    };
+    try {
+      const res = await teacherImport(uploadRequest);
+      if (res.status === 200) {
+        addLog(`处理数据: ${JSON.stringify(row)}`);
+        addLog(`处理完成,` + res.data.msg);
+        ids.push(res.data.id);
+        onProgress();
+      }
+    } catch (error:any) {
+      addLog(`处理数据: ${JSON.stringify(row)}`);
+      if(typeof error.data=='string')
+        addLog("处理报错，异常为：" + error.data);
+      else
+        addLog("处理报错，异常为：" + error.data.errMsg);
+    }
+  }
+  addLog(`处理文件结束`);
+  try {
+    const res = await teacherImportMQMessage(
+        {
+          id: ids.join(",")
+        })
+    if (res.status === 200) {
+      addLog(`处理消息队列成功`);
+    } else
+      addLog(`处理消息队列失败`);
+  }  catch (error:any) {
+    addLog(`处理消息队列失败`);
+  }
+  state.percentage = 100;
+  state.disabled = false;
+  if(errorStatus=='')
+    state.progressStatus = 'success';
+  else
+    state.progressStatus = 'exception';
+};
+
+// 添加日志的方法
+const addLog = (newLog: string) => {
+	logs.value.push(newLog + ` - ${new Date().toLocaleTimeString()}`);
+	// 滚动到底部
+	nextTick(() => {
+		if (logContent.value) {
+			scrollbarRef.value!.setScrollTop(logContent.value.scrollHeight);
+		}
+	});
+};
+const onDownloadImport = () => {
+  window.open("https://obs-nmbt.cucloud.cn/deer-base/excel/老师导入模板.xlsx")
+}
+// 打开弹窗
+const openDialog = () => {
+	state.dialog.isShowDialog = true;
+};
+// 关闭弹窗
+const closeDialog = () => {
+	state.dialog.isShowDialog = false;
+	upload.value!.clearFiles();
+	logs.value = [];
+	state.file = null;
+	state.json = [];
+  state.progressVisable=false;
+  state.progressStatus='';
+  state.percentage=0;
+  state.percentLength=0;
+};
+
+//进度条增长
+const onProgress = () => {
+  state.percentage = parseFloat(((state.percentage + 1 / state.percentLength * 100).toFixed(2)));
+};
+
+// 取消
+const onCancel = () => {
+	closeDialog();
+};
+
+
+// 暴露变量
+defineExpose({
+	openDialog,
+});
+</script>
+
+<style scoped>
+.dynamic-log-container {
+	width: 100%;
+	max-width: 800px;
+	margin: 0 auto;
+}
+
+.log-content {
+	padding: 10px;
+}
+
+.log-item {
+	margin-bottom: 5px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/system/teacherUser/dialogTeach.vue b/src/views/system/teacherUser/dialogTeach.vue
new file mode 100644
index 0000000000000000000000000000000000000000..b9c0a27817530e0888ef8e039c30a11420beaf89
--- /dev/null
+++ b/src/views/system/teacherUser/dialogTeach.vue
@@ -0,0 +1,191 @@
+<template>
+	<div class="system-teach-dialog-container">
+		<el-dialog :title="state.dialog.title" v-model="state.dialog.isShowDialog" width="769px">
+			<el-form ref="teachDialogFormRef" :model="state.ruleForm" size="default" label-width="90px" :rules="rules">
+				<el-row :gutter="35">
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="教师id" prop="teacherId">
+							<el-input v-model="state.ruleForm.teacherId" placeholder="" disabled></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="教师姓名" prop="teacherId">
+              <el-input v-model="state.ruleForm.teacherName" placeholder="" disabled></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="科目" prop="idType">
+              <el-select v-model="state.ruleForm.teachSubject" placeholder="请选择科目" clearable class="w100">
+                <el-option label="班主任" value="班主任"></el-option>
+                <el-option label="语文" value="语文"></el-option>
+                <el-option label="数学" value="数学"></el-option>
+                <el-option label="英语" value="英语"></el-option>
+                <el-option label="物理" value="物理"></el-option>
+                <el-option label="化学" value="化学"></el-option>
+                <el-option label="生物" value="生物"></el-option>
+                <el-option label="历史" value="历史"></el-option>
+                <el-option label="地理" value="地理"></el-option>
+                <el-option label="科学" value="科学"></el-option>
+                <el-option label="思想品德" value="思想品德"></el-option>
+                <el-option label="信息技术" value="信息技术"></el-option>
+                <el-option label="体育" value="体育"></el-option>
+                <el-option label="道德与法治" value="道德与法治"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="班级" prop="orgId">
+              <el-tree-select
+                  v-model="state.ruleForm.orgId"
+                  :data="state.sysOrgData"
+                  :render-after-expand="false"
+                  style="width: 500px"
+                  filterable
+                  show-all-levels
+              />
+						</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.isDelete" placeholder="请选择"  class="w100" :disabled="state.ruleForm.isDelete==0">
+                <el-option label="正常"  :value="0"></el-option>
+                <el-option label="禁用"  :value="1"></el-option>
+              </el-select>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<template #footer>
+				<span class="dialog-footer">
+					<el-button @click="onCancel" size="default">取 消</el-button>
+					<el-button type="primary" @click="onSubmit(teachDialogFormRef)" size="default">{{ state.dialog.submitTxt }}</el-button>
+				</span>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script setup lang="ts" name="TeachDialog">
+import { reactive, ref} from 'vue';
+import {systemApi} from "/@/api/system";
+import {userApi} from "/@/api/user";
+import {ElMessage, FormInstance, FormRules} from 'element-plus'
+const {orgSchoolTree} = systemApi();
+const {saveOrUpdateTeach} = userApi();
+// 定义子组件向父组件传值/事件
+const emit = defineEmits(['refresh']);
+
+const rules = reactive<FormRules<RowTeachType>>({
+
+  teachSubject: [
+    {
+      required: true,
+      message: '请选择科目',
+      trigger: 'change',
+    },
+  ],
+  orgId: [
+    {
+      required: true,
+      message: '请选择班级',
+      trigger: 'change',
+    },
+  ],
+
+})
+
+// 定义变量内容
+const teachDialogFormRef = ref();
+const state = reactive({
+	ruleForm: {
+    id:'',
+    isDelete:0,
+    isHeadTeacher:0,
+    orgId:'',
+    orgName:'',
+    teachSubject:'',
+    teacherId:'',
+    teacherName:'',
+	},
+  teacherRow:{} as RowStudentUserType,
+  sysOrgData: [] as OrgTreeType[], // 部门数据
+	dialog: {
+		isShowDialog: false,
+		type: '',
+		title: '',
+		submitTxt: '',
+	},
+});
+
+// 打开弹窗
+const openDialog = (type: string, teacherRow: RowStudentUserType,row: RowTeachType) => {
+	if (type === 'edit') {
+		state.ruleForm = JSON.parse(JSON.stringify(row));
+		state.dialog.title = '修改任教信息';
+		state.dialog.submitTxt = '修 改';
+	} else {
+		state.dialog.title = '新增任教信息';
+		state.dialog.submitTxt = '新 增';
+    clearForm();
+    state.ruleForm.teacherId = teacherRow.id;
+    state.ruleForm.teacherName = teacherRow.nickName;
+	}
+	state.dialog.isShowDialog = true;
+	getMenuData();
+};
+// 关闭弹窗
+const closeDialog = () => {
+	state.dialog.isShowDialog = false;
+};
+// 取消
+const onCancel = () => {
+	closeDialog();
+};
+// 提交
+// const onSubmit = () => {
+// 	closeDialog();
+// 	emit('refresh');
+// 	// if (state.dialog.type === 'add') { }
+// };
+const onSubmit = async (formEl: FormInstance | undefined) => {
+  if (!formEl) return
+  await formEl.validate(async (valid, fields) => {
+    if (valid) {
+      const res = await saveOrUpdateTeach(state.ruleForm)
+      if (res.status === 200) {
+        ElMessage.success('更改成功');
+        emit('refresh');
+      }else{
+        ElMessage.error('更改失败');
+      }
+      closeDialog();
+
+    }
+  })
+}
+
+// 初始化机构数据
+const getMenuData = async () => {
+  const res = await orgSchoolTree()
+  if (res.status === 200) {
+    state.sysOrgData = res.data;
+  }
+};
+
+const clearForm = () => {
+  state.ruleForm = {
+    id:'',
+    isDelete:0,
+    isHeadTeacher:0,
+    orgId:'',
+    orgName:'',
+    teachSubject:'',
+    teacherId:'',
+    teacherName:'',
+  }
+}
+// 暴露变量
+defineExpose({
+	openDialog,
+});
+</script>
diff --git a/src/views/system/teacherUser/index.vue b/src/views/system/teacherUser/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..231a7c22c339ffbe94f42b62e62f2580d6f7df5d
--- /dev/null
+++ b/src/views/system/teacherUser/index.vue
@@ -0,0 +1,271 @@
+<template>
+	<div class="system-teacherUser-container layout-padding">
+		<el-card shadow="hover" class="layout-padding-auto">
+			<div class="system-teacherUser-search mb15">
+				<el-input v-model="state.tableData.param.nickName" size="default" placeholder="请输入姓名" :prefix-icon="Search" style="max-width: 180px"> </el-input>
+        <el-input v-model="state.tableData.param.userName" size="default" placeholder="请输入电话号码" :prefix-icon="Search" style="max-width: 180px;margin-left: 10px"> </el-input>
+        <el-tree-select
+            v-model="state.tableData.param.orgId"
+            :data="state.tableData.sysOrgData"
+            :render-after-expand="false"
+            size="default"
+            style="width: 400px;margin-left: 10px"
+            filterable
+            clearable
+            placeholder="学校筛选"
+            show-all-levels
+        />
+        <el-button size="default" type="primary" class="ml10" @click="getTableData()">
+					<el-icon>
+						<ele-Search />
+					</el-icon>
+					查询
+				</el-button>
+				<el-button size="default" type="success" class="ml10" @click="onOpenAddUser('add')">
+					<el-icon>
+						<ele-FolderAdd />
+					</el-icon>
+					新增老师
+				</el-button>
+        <el-button size="default" type="primary" class="ml10" @click="onOpenImport()">
+          <el-icon>
+            <Upload />
+          </el-icon>
+          批量导入
+        </el-button>
+			</div>
+			<el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%">
+        <el-table-column type="expand" >
+          <template #default="scope">
+            <el-row >
+              <el-col :span="12" :offset="1">
+                <el-text size="large" type="primary" style="margin-right: 10px">任教信息</el-text>
+                <el-button size="default" type="success" class="ml10" @click="onOpenAddTeach('add',scope.row)" :disabled="scope.row.isDelete === 1">
+                  <el-icon>
+                    <ele-FolderAdd />
+                  </el-icon>
+                  新增任教信息
+                </el-button>
+              </el-col>
+            </el-row>
+            <el-row style="margin-top: 20px;">
+              <el-col :span="11" :offset="1">
+                <el-table :data="scope.row.teacherTeachList" v-loading="state.tableData.loading" style="" border>
+                  <el-table-column label="班级" prop="orgName" width="350"/>
+                  <el-table-column label="课程" prop="teachSubject" width="150"/>
+                  <el-table-column prop="isDelete" label="状态" width="120" show-overflow-tooltip>
+                    <template #default="scope1">
+                      <el-tag type="success" v-if="scope1.row.isDelete==0">正常</el-tag>
+                      <el-tag type="info" v-else>禁用</el-tag>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="操作" width="125" >
+                    <template #default="scope2">
+                      <el-button :disabled="scope.row.isDelete === 1" size="small" text type="primary" @click="onOpenEditTeach('edit', scope.row,scope2.row)"
+                      >修改</el-button
+                      >
+                      <el-button :disabled="scope2.row.isDelete === 1" size="small" text type="primary" @click="onRowTeachDel(scope2.row)">禁用</el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </el-col>
+            </el-row>
+          </template>
+        </el-table-column>
+				<el-table-column type="index" label="序号" width="60" />
+				<el-table-column prop="username" label="电话号码（帐号）" width="150" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="nickName" label="姓名" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="orgName" label="所在学校" width="200" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="gender" label="性别" width="100" show-overflow-tooltip>
+          <template #default="scope">
+            <el-tag effect="dark" v-if="scope.row.gender==0">男</el-tag>
+            <el-tag effect="dark" type="danger" v-else-if="scope.row.gender==1">女</el-tag>
+            <el-tag effect="dark" type="warning" v-else>未知</el-tag>
+          </template>
+        </el-table-column>
+				<el-table-column prop="userIdCardNumber" label="证件号码" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="idType" label="证件类型" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="isDelete" label="老师状态" width="100" show-overflow-tooltip>
+					<template #default="scope">
+						<el-tag type="success" v-if="scope.row.isDelete==0">正常</el-tag>
+						<el-tag type="info" v-else>禁用</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="gmtModified" label="修改时间" show-overflow-tooltip></el-table-column>
+				<el-table-column label="操作" width="200">
+					<template #default="scope">
+            <el-button  size="small" text type="primary" @click="onOpenAuthorizeDialog(scope.row.id)" >授权管理</el-button>
+						<el-button  size="small" text type="primary" @click="onOpenEditUser('edit', scope.row)"
+							>修改</el-button
+						>
+						<el-button :disabled="scope.row.isDelete === 1" size="small" text type="primary" @click="onRowDel(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,50,100, 200, 500]"
+				v-model:current-page="state.tableData.param.current"
+				background
+				v-model:page-size="state.tableData.param.pageSize"
+				layout="total, sizes, prev, pager, next, jumper"
+				:total="state.tableData.total"
+			>
+			</el-pagination>
+		</el-card>
+		<teacherUserDialog ref="teacherUserDialogRef" @refresh="getTableData()" />
+    <teachDialog ref="teachDialogRef" @refresh="getTableData()" />
+    <importDialog ref="importDialogRef" />
+    <authorizeDialog ref="authorizeDialogRef" @refresh="getTableData()" />
+	</div>
+</template>
+
+<script setup lang="ts" name="systemteacherUser">
+import { defineAsyncComponent, reactive, onMounted, ref } from 'vue';
+import { ElMessageBox, ElMessage } from 'element-plus';
+import {Search, Upload} from "@element-plus/icons-vue";
+import {userApi} from "/@/api/user";
+import {systemApi} from "/@/api/system";
+const {orgSchoolOnlyTree} = systemApi();
+const {teacherListByPage,teacherRemoveById,teachRemoveById} = userApi();
+
+// 引入组件
+const teacherUserDialog = defineAsyncComponent(() => import('/src/views/system/teacherUser/dialog.vue'));
+const teachDialog = defineAsyncComponent(() => import('/src/views/system/teacherUser/dialogTeach.vue'));
+const importDialog = defineAsyncComponent(() => import('/src/views/system/teacherUser/dialogImport.vue'));
+const authorizeDialog = defineAsyncComponent(() => import('/src/views/system/noRole/authorizeDialog.vue'));
+const authorizeDialogRef = ref();
+// 定义变量内容
+const teacherUserDialogRef = ref();
+const teachDialogRef = ref();
+const importDialogRef = ref();
+const state = reactive<StudentSysUserState>({
+	tableData: {
+		data: [],
+		total: 0,
+		loading: false,
+    sysOrgData: [],
+		param: {
+			current: 1,
+			pageSize: 10,
+      nickName:'',
+      userName:'',
+      orgId:'',
+		},
+	},
+});
+
+// 初始化表格数据
+const getTableData = async () => {
+  state.tableData.loading = true;
+  const res = await teacherListByPage(state.tableData.param)
+  if (res.status === 200) {
+    state.tableData.data = res.data.records;
+    state.tableData.total = res.data.total;
+    state.tableData.loading = false;
+  }
+};
+
+// 初始化机构数据
+const getMenuData = async () => {
+  const res = await orgSchoolOnlyTree()
+  if (res.status === 200) {
+    state.tableData.sysOrgData = res.data;
+  }
+};
+
+// 打开新增用户弹窗
+const onOpenAddUser = (type: string) => {
+  teacherUserDialogRef.value.openDialog(type);
+};
+// 打开修改用户弹窗
+const onOpenEditUser = (type: string, row: RowStudentUserType) => {
+  teacherUserDialogRef.value.openDialog(type, row);
+};
+
+const onOpenAddTeach = (type: string,teacherRow: RowStudentUserType) => {
+  teachDialogRef.value.openDialog(type,teacherRow);
+};
+// 打开修改用户弹窗
+const onOpenEditTeach = (type: string,teacherRow: RowStudentUserType,row: RowTeachType) => {
+  teachDialogRef.value.openDialog(type, teacherRow,row);
+};
+
+const onOpenImport = () => {
+  importDialogRef.value.openDialog();
+};
+
+const onOpenAuthorizeDialog = (userId: string) => {
+  authorizeDialogRef.value.openDialog(userId);
+};
+// 删除用户
+const onRowDel = (row: RowStudentUserType) => {
+	ElMessageBox.confirm(`此操作将删除该用户的所有教师身份，账户名称：“${row.nickName}”，是否继续?`, '提示', {
+		confirmButtonText: '确认',
+		cancelButtonText: '取消',
+		type: 'warning',
+	})
+		.then(async () => {
+      const res = await teacherRemoveById({id: row.id})
+      if (res.status === 200) {
+        await getTableData();
+        ElMessage.success('删除成功');
+      } else {
+        ElMessage.error('删除失败');
+      }
+    })
+		.catch(() => {});
+};
+//删除任教信息
+const onRowTeachDel = (row: RowTeachType) => {
+  ElMessageBox.confirm(`此操作将禁用任教信息：“${row.orgName}的${row.teachSubject}课，老师为${row.teacherName}”，是否继续?`, '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  })
+      .then(async () => {
+        const res = await teachRemoveById({id: row.id})
+        if (res.status === 200) {
+          await getTableData();
+          ElMessage.success('删除成功');
+        } else {
+          ElMessage.error('删除失败');
+        }
+      })
+      .catch(() => {});
+};
+
+// 分页改变
+const onHandleSizeChange = (val: number) => {
+	state.tableData.param.pageSize = val;
+	getTableData();
+};
+// 分页改变
+const onHandleCurrentChange = (val: number) => {
+	state.tableData.param.pageNum = val;
+	getTableData();
+};
+// 页面加载时
+onMounted(() => {
+	getTableData();
+  getMenuData();
+});
+</script>
+
+<style scoped lang="scss">
+.system-teacherUser-container {
+	:deep(.el-card__body) {
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+		overflow: auto;
+		.el-table {
+			flex: 1;
+		}
+	}
+}
+</style>
diff --git a/src/views/system/user/dialog.vue b/src/views/system/user/dialog.vue
deleted file mode 100644
index c3043897cdac5c0124d57ec2d9225ecbf935474e..0000000000000000000000000000000000000000
--- a/src/views/system/user/dialog.vue
+++ /dev/null
@@ -1,187 +0,0 @@
-<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-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>
-					</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.userNickname" 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.roleSign" placeholder="请选择" clearable class="w100">
-								<el-option label="超级管理员" value="admin"></el-option>
-								<el-option label="普通用户" value="common"></el-option>
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-						<el-form-item label="部门">
-							<el-cascader
-								:options="state.deptData"
-								:props="{ checkStrictly: true, value: 'deptName', label: 'deptName' }"
-								placeholder="请选择部门"
-								clearable
-								class="w100"
-								v-model="state.ruleForm.department"
-							>
-								<template #default="{ node, data }">
-									<span>{{ data.deptName }}</span>
-									<span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
-								</template>
-							</el-cascader>
-						</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.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>
-					</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-option label="男" value="男"></el-option>
-								<el-option label="女" value="女"></el-option>
-							</el-select>
-						</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.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-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-form-item label="用户状态">
-							<el-switch v-model="state.ruleForm.status" inline-prompt active-text="启" inactive-text="禁"></el-switch>
-						</el-form-item>
-					</el-col>
-					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
-						<el-form-item label="用户描述">
-							<el-input v-model="state.ruleForm.describe" type="textarea" placeholder="请输入用户描述" maxlength="150"></el-input>
-						</el-form-item>
-					</el-col>
-				</el-row>
-			</el-form>
-			<template #footer>
-				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="default">{{ state.dialog.submitTxt }}</el-button>
-				</span>
-			</template>
-		</el-dialog>
-	</div>
-</template>
-
-<script setup lang="ts" name="systemUserDialog">
-import { reactive, ref } from 'vue';
-
-// 定义子组件向父组件传值/事件
-const emit = defineEmits(['refresh']);
-
-// 定义变量内容
-const userDialogFormRef = ref();
-const state = reactive({
-	ruleForm: {
-		userName: '', // 账户名称
-		userNickname: '', // 用户昵称
-		roleSign: '', // 关联角色
-		department: [] as string[], // 部门
-		phone: '', // 手机号
-		email: '', // 邮箱
-		sex: '', // 性别
-		password: '', // 账户密码
-		overdueTime: '', // 账户过期
-		status: true, // 用户状态
-		describe: '', // 用户描述
-	},
-	deptData: [] as DeptTreeType[], // 部门数据
-	dialog: {
-		isShowDialog: false,
-		type: '',
-		title: '',
-		submitTxt: '',
-	},
-});
-
-// 打开弹窗
-const openDialog = (type: string, row: RowUserType) => {
-	if (type === 'edit') {
-		state.ruleForm = row;
-		state.dialog.title = '修改用户';
-		state.dialog.submitTxt = '修 改';
-	} else {
-		state.dialog.title = '新增用户';
-		state.dialog.submitTxt = '新 增';
-		// 清空表单，此项需加表单验证才能使用
-		// nextTick(() => {
-		// 	userDialogFormRef.value.resetFields();
-		// });
-	}
-	state.dialog.isShowDialog = true;
-	getMenuData();
-};
-// 关闭弹窗
-const closeDialog = () => {
-	state.dialog.isShowDialog = false;
-};
-// 取消
-const onCancel = () => {
-	closeDialog();
-};
-// 提交
-const onSubmit = () => {
-	closeDialog();
-	emit('refresh');
-	// if (state.dialog.type === 'add') { }
-};
-// 初始化部门数据
-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,
-});
-</script>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
deleted file mode 100644
index c7b1f85ce5048f03af4ab0e102f8257fb8c5aab4..0000000000000000000000000000000000000000
--- a/src/views/system/user/index.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<template>
-	<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-icon>
-						<ele-Search />
-					</el-icon>
-					查询
-				</el-button>
-				<el-button size="default" type="success" class="ml10" @click="onOpenAddUser('add')">
-					<el-icon>
-						<ele-FolderAdd />
-					</el-icon>
-					新增用户
-				</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 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>
-					<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 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
-						>
-						<el-button :disabled="scope.row.userName === 'admin'" size="small" text type="primary" @click="onRowDel(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.pageNum"
-				background
-				v-model:page-size="state.tableData.param.pageSize"
-				layout="total, sizes, prev, pager, next, jumper"
-				:total="state.tableData.total"
-			>
-			</el-pagination>
-		</el-card>
-		<UserDialog ref="userDialogRef" @refresh="getTableData()" />
-	</div>
-</template>
-
-<script setup lang="ts" name="systemUser">
-import { defineAsyncComponent, reactive, onMounted, ref } from 'vue';
-import { ElMessageBox, ElMessage } from 'element-plus';
-
-// 引入组件
-const UserDialog = defineAsyncComponent(() => import('/@/views/system/user/dialog.vue'));
-
-// 定义变量内容
-const userDialogRef = ref();
-const state = reactive<SysUserState>({
-	tableData: {
-		data: [],
-		total: 0,
-		loading: false,
-		param: {
-			pageNum: 1,
-			pageSize: 10,
-		},
-	},
-});
-
-// 初始化表格数据
-const getTableData = () => {
-	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(() => {
-		state.tableData.loading = false;
-	}, 500);
-};
-// 打开新增用户弹窗
-const onOpenAddUser = (type: string) => {
-	userDialogRef.value.openDialog(type);
-};
-// 打开修改用户弹窗
-const onOpenEditUser = (type: string, row: RowUserType) => {
-	userDialogRef.value.openDialog(type, row);
-};
-// 删除用户
-const onRowDel = (row: RowUserType) => {
-	ElMessageBox.confirm(`此操作将永久删除账户名称：“${row.userName}”，是否继续?`, '提示', {
-		confirmButtonText: '确认',
-		cancelButtonText: '取消',
-		type: 'warning',
-	})
-		.then(() => {
-			getTableData();
-			ElMessage.success('删除成功');
-		})
-		.catch(() => {});
-};
-// 分页改变
-const onHandleSizeChange = (val: number) => {
-	state.tableData.param.pageSize = val;
-	getTableData();
-};
-// 分页改变
-const onHandleCurrentChange = (val: number) => {
-	state.tableData.param.pageNum = val;
-	getTableData();
-};
-// 页面加载时
-onMounted(() => {
-	getTableData();
-});
-</script>
-
-<style scoped lang="scss">
-.system-user-container {
-	:deep(.el-card__body) {
-		display: flex;
-		flex-direction: column;
-		flex: 1;
-		overflow: auto;
-		.el-table {
-			flex: 1;
-		}
-	}
-}
-</style>
diff --git a/vite.config.ts b/vite.config.ts
index 6c2b27422c25a6392ea00704fd7e50638fc67d67..7087b8468144d60c857cdd403570aa111ceb38c6 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -28,12 +28,22 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
 			open: JSON.parse(env.VITE_OPEN),
 			hmr: true,
 			proxy: {
-				'/gitee': {
-					target: 'https://gitee.com',
+				'/api': {
+					target: 'http://11.1.11.103:9000', // 确保这是正确的后端服务地址
 					ws: true,
 					changeOrigin: true,
-					rewrite: (path) => path.replace(/^\/gitee/, ''),
 				},
+				'/open': {
+					target: 'http://11.1.11.103:9000', // 确保这是正确的后端服务地址
+					ws: true,
+					changeOrigin: true,
+				},
+				// '/gitee': {
+				// 	target: 'https://gitee.com',
+				// 	ws: true,
+				// 	changeOrigin: true,
+				// 	rewrite: (path) => path.replace(/^\/gitee/, ''),
+				// },
 			},
 		},
 		build: {
@@ -64,4 +74,4 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
 	};
 });
 
-export default viteConfig;
+export default viteConfig;
\ No newline at end of file