From 4dadffa872d9a16b8467bbfbbd69781115978171 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Sat, 1 Apr 2023 09:32:14 +0800
Subject: [PATCH] =?UTF-8?q?:recycle:=20Refactoring=20code.=20=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E9=87=8D=E6=96=B0=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                             |  24 +--
 src/api/admin/dept.ts                         |   2 +-
 .../{iconSelector => IconSelector}/index.ts   |   0
 .../{iconSelector => IconSelector}/index.vue  |   2 +-
 .../{iconSelector => IconSelector}/list.vue   |   0
 .../{noticeBar => NoticeBar}/index.vue        |   0
 src/components/QueryTree/index.vue            |   8 +-
 .../{wechart => Wechat}/fileUpload/index.vue  |   0
 .../wx-material-select/main.vue               |   0
 .../{wechart => Wechat}/wx-msg/card.scss      |   0
 .../{wechart => Wechat}/wx-msg/comment.scss   |   0
 .../{wechart => Wechat}/wx-msg/index.vue      |   0
 .../{wechart => Wechat}/wx-news/index.vue     |   0
 .../{wechart => Wechat}/wx-reply/index.vue    |   9 +-
 src/components/cropper/index.vue              | 143 ------------------
 src/components/verifition/Verify.vue          |   4 +-
 .../verifition/Verify/VerifyPoints.vue        |   6 +-
 .../verifition/Verify/VerifySlide.vue         |   6 +-
 src/main.ts                                   |   2 +-
 src/utils/other.ts                            |   2 +-
 src/views/admin/dept/form.vue                 |   4 +-
 src/views/admin/dept/index.vue                |   4 +-
 src/views/admin/dict/index.vue                |   4 +-
 src/views/admin/menu/form.vue                 |   2 +-
 src/views/admin/role/form.vue                 |   4 +-
 src/views/admin/role/permession.vue           |   2 +-
 src/views/admin/user/form.vue                 |   4 +-
 src/views/admin/user/index.vue                |   4 +-
 src/views/home/schedule/calendar.vue          |  30 +++-
 src/views/mp/wx-auto-reply/index.vue          |   2 +-
 src/views/mp/wx-fans-msg/index.vue            |   2 +-
 .../mp/wx-material/components/news-form.vue   |   4 +-
 src/views/mp/wx-material/index.vue            |   4 +-
 src/views/mp/wx-menu/index.vue                |   6 +-
 vite.config.ts                                |   2 +-
 35 files changed, 82 insertions(+), 204 deletions(-)
 rename src/components/{iconSelector => IconSelector}/index.ts (100%)
 rename src/components/{iconSelector => IconSelector}/index.vue (99%)
 rename src/components/{iconSelector => IconSelector}/list.vue (100%)
 rename src/components/{noticeBar => NoticeBar}/index.vue (100%)
 rename src/components/{wechart => Wechat}/fileUpload/index.vue (100%)
 rename src/components/{wechart => Wechat}/wx-material-select/main.vue (100%)
 rename src/components/{wechart => Wechat}/wx-msg/card.scss (100%)
 rename src/components/{wechart => Wechat}/wx-msg/comment.scss (100%)
 rename src/components/{wechart => Wechat}/wx-msg/index.vue (100%)
 rename src/components/{wechart => Wechat}/wx-news/index.vue (100%)
 rename src/components/{wechart => Wechat}/wx-reply/index.vue (97%)
 delete mode 100644 src/components/cropper/index.vue

diff --git a/package-lock.json b/package-lock.json
index d6c9e985..a9b6049e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,6 +16,7 @@
 				"@wangeditor/editor-for-vue": "5.1.12",
 				"axios": "^1.3.3",
 				"crypto-js": "^3.1.9-1",
+				"driver.js": "^0.9.8",
 				"echarts": "^5.4.1",
 				"element-plus": "2.3.1",
 				"form-designer": "^0.0.2",
@@ -24,7 +25,6 @@
 				"mitt": "^3.0.0",
 				"nprogress": "^0.2.0",
 				"pinia": "^2.0.32",
-				"print-js": "^1.6.0",
 				"qrcode": "1.5.1",
 				"qs": "^6.11.0",
 				"screenfull": "^6.0.2",
@@ -1726,6 +1726,12 @@
 				"tslib": "^2.0.3"
 			}
 		},
+		"node_modules/driver.js": {
+			"version": "0.9.8",
+			"resolved": "https://registry.npmmirror.com/driver.js/-/driver.js-0.9.8.tgz",
+			"integrity": "sha512-bczjyKdX6XmFyCDkwtRmlaORDwfBk1xXmRO0CAe5VwNQTM98aWaG2LAIiIdTe53iV/B7W5lXlIy2xYtf0JRb7Q==",
+			"license": "MIT"
+		},
 		"node_modules/echarts": {
 			"version": "5.4.1",
 			"resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz",
@@ -3333,12 +3339,6 @@
 				"node": ">=10.13.0"
 			}
 		},
-		"node_modules/print-js": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmmirror.com/print-js/-/print-js-1.6.0.tgz",
-			"integrity": "sha512-BfnOIzSKbqGRtO4o0rnj/K3681BSd2QUrsIZy/+WdCIugjIswjmx3lDEZpXB2ruGf9d4b3YNINri81+J0FsBWg==",
-			"license": "MIT"
-		},
 		"node_modules/prismjs": {
 			"version": "1.29.0",
 			"resolved": "https://registry.npmmirror.com/prismjs/-/prismjs-1.29.0.tgz",
@@ -5720,6 +5720,11 @@
 				"tslib": "^2.0.3"
 			}
 		},
+		"driver.js": {
+			"version": "0.9.8",
+			"resolved": "https://registry.npmmirror.com/driver.js/-/driver.js-0.9.8.tgz",
+			"integrity": "sha512-bczjyKdX6XmFyCDkwtRmlaORDwfBk1xXmRO0CAe5VwNQTM98aWaG2LAIiIdTe53iV/B7W5lXlIy2xYtf0JRb7Q=="
+		},
 		"echarts": {
 			"version": "5.4.1",
 			"resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz",
@@ -6935,11 +6940,6 @@
 			"integrity": "sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==",
 			"dev": true
 		},
-		"print-js": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmmirror.com/print-js/-/print-js-1.6.0.tgz",
-			"integrity": "sha512-BfnOIzSKbqGRtO4o0rnj/K3681BSd2QUrsIZy/+WdCIugjIswjmx3lDEZpXB2ruGf9d4b3YNINri81+J0FsBWg=="
-		},
 		"prismjs": {
 			"version": "1.29.0",
 			"resolved": "https://registry.npmmirror.com/prismjs/-/prismjs-1.29.0.tgz",
diff --git a/src/api/admin/dept.ts b/src/api/admin/dept.ts
index bbbbcdc6..60439843 100644
--- a/src/api/admin/dept.ts
+++ b/src/api/admin/dept.ts
@@ -1,6 +1,6 @@
 import request from '/@/utils/request';
 
-export const depttree = (params?: Object) => {
+export const deptTree = (params?: Object) => {
 	return request({
 		url: '/admin/dept/tree',
 		method: 'get',
diff --git a/src/components/iconSelector/index.ts b/src/components/IconSelector/index.ts
similarity index 100%
rename from src/components/iconSelector/index.ts
rename to src/components/IconSelector/index.ts
diff --git a/src/components/iconSelector/index.vue b/src/components/IconSelector/index.vue
similarity index 99%
rename from src/components/iconSelector/index.vue
rename to src/components/IconSelector/index.vue
index 00df68a6..69afd713 100644
--- a/src/components/iconSelector/index.vue
+++ b/src/components/IconSelector/index.vue
@@ -100,7 +100,7 @@ const props = defineProps({
 const emit = defineEmits(['update:modelValue', 'get', 'clear']);
 
 // 引入组件
-const IconList = defineAsyncComponent(() => import('/@/components/iconSelector/list.vue'));
+const IconList = defineAsyncComponent(() => import('/@/components/IconSelector/list.vue'));
 
 // 定义变量内容
 const inputWidthRef = ref();
diff --git a/src/components/iconSelector/list.vue b/src/components/IconSelector/list.vue
similarity index 100%
rename from src/components/iconSelector/list.vue
rename to src/components/IconSelector/list.vue
diff --git a/src/components/noticeBar/index.vue b/src/components/NoticeBar/index.vue
similarity index 100%
rename from src/components/noticeBar/index.vue
rename to src/components/NoticeBar/index.vue
diff --git a/src/components/QueryTree/index.vue b/src/components/QueryTree/index.vue
index 088db42c..5ef9232a 100644
--- a/src/components/QueryTree/index.vue
+++ b/src/components/QueryTree/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="head-container">
 		<div style="display: flex">
-			<el-input v-model="searchName" suffix-icon="search" :placeholder="placeholder" clearable style="margin-bottom: 20px" @change="getDeptTree" />
+			<el-input v-model="searchName" suffix-icon="search" :placeholder="placeholder" clearable style="margin-bottom: 20px" @change="getdeptTree" />
 			<el-dropdown :hide-on-click="false" class="mt10 mr10">
 				<el-icon style="transform: rotate(90deg)">
 					<MoreFilled />
@@ -116,7 +116,7 @@ const handleNodeClick = (item: any) => {
 /**
  * 获取部门树形结构数据。
  */
-const getDeptTree = () => {
+const getdeptTree = () => {
 	if (props.query instanceof Function) {
 		state.localLoading = true;
 
@@ -150,11 +150,11 @@ const toggleRowExpansionAll = (status) => {
 };
 
 onMounted(() => {
-	getDeptTree();
+	getdeptTree();
 });
 
 // 方便父组件调用刷新树方法
 defineExpose({
-	getDeptTree,
+	getdeptTree,
 });
 </script>
diff --git a/src/components/wechart/fileUpload/index.vue b/src/components/Wechat/fileUpload/index.vue
similarity index 100%
rename from src/components/wechart/fileUpload/index.vue
rename to src/components/Wechat/fileUpload/index.vue
diff --git a/src/components/wechart/wx-material-select/main.vue b/src/components/Wechat/wx-material-select/main.vue
similarity index 100%
rename from src/components/wechart/wx-material-select/main.vue
rename to src/components/Wechat/wx-material-select/main.vue
diff --git a/src/components/wechart/wx-msg/card.scss b/src/components/Wechat/wx-msg/card.scss
similarity index 100%
rename from src/components/wechart/wx-msg/card.scss
rename to src/components/Wechat/wx-msg/card.scss
diff --git a/src/components/wechart/wx-msg/comment.scss b/src/components/Wechat/wx-msg/comment.scss
similarity index 100%
rename from src/components/wechart/wx-msg/comment.scss
rename to src/components/Wechat/wx-msg/comment.scss
diff --git a/src/components/wechart/wx-msg/index.vue b/src/components/Wechat/wx-msg/index.vue
similarity index 100%
rename from src/components/wechart/wx-msg/index.vue
rename to src/components/Wechat/wx-msg/index.vue
diff --git a/src/components/wechart/wx-news/index.vue b/src/components/Wechat/wx-news/index.vue
similarity index 100%
rename from src/components/wechart/wx-news/index.vue
rename to src/components/Wechat/wx-news/index.vue
diff --git a/src/components/wechart/wx-reply/index.vue b/src/components/Wechat/wx-reply/index.vue
similarity index 97%
rename from src/components/wechart/wx-reply/index.vue
rename to src/components/Wechat/wx-reply/index.vue
index 2dd4119d..a8023583 100644
--- a/src/components/wechart/wx-reply/index.vue
+++ b/src/components/Wechat/wx-reply/index.vue
@@ -65,8 +65,7 @@
 			</el-row>
 			<el-row style="text-align: center">
 				<el-col :span="12" class="col-select">
-					<a v-if="objData.repUrl" target="_blank" :href="objData.repUrl">
-						<SvgIcon name="local-wx-video" :size="45" /> </a
+					<a v-if="objData.repUrl" target="_blank" :href="objData.repUrl"> <SvgIcon name="local-wx-video" :size="45" /> </a
 				></el-col>
 				<el-col :span="12" class="col-add">
 					<el-button type="success" @click="openMaterial({ type: 'video', accountId: props.objData.appId })">素材库选择 </el-button>
@@ -102,11 +101,11 @@
 <script setup lang="ts" name="wx-reply">
 import { getMaterialVideo } from '/@/api/mp/wx-material';
 import { useMessage } from '/@/hooks/message';
-const WxMaterialSelect = defineAsyncComponent(() => import('/@/components/wechart/wx-material-select/main.vue'));
+const WxMaterialSelect = defineAsyncComponent(() => import('/@/components/Wechat/wx-material-select/main.vue'));
 
-const WxFileUpload = defineAsyncComponent(() => import('/@/components/wechart/fileUpload/index.vue'));
+const WxFileUpload = defineAsyncComponent(() => import('/@/components/Wechat/fileUpload/index.vue'));
 
-const WxNews = defineAsyncComponent(() => import('/@/components/wechart/wx-news/index.vue'));
+const WxNews = defineAsyncComponent(() => import('/@/components/Wechat/wx-news/index.vue'));
 
 const props = defineProps({
 	objData: {
diff --git a/src/components/cropper/index.vue b/src/components/cropper/index.vue
deleted file mode 100644
index 876eddc5..00000000
--- a/src/components/cropper/index.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<template>
-	<div>
-		<el-dialog title="更换头像" v-model="state.isShowDialog" width="769px">
-			<div class="cropper-warp">
-				<div class="cropper-warp-left">
-					<img :src="state.cropperImg" class="cropper-warp-left-img" />
-				</div>
-				<div class="cropper-warp-right">
-					<div class="cropper-warp-right-title">预览</div>
-					<div class="cropper-warp-right-item">
-						<div class="cropper-warp-right-value">
-							<img :src="state.cropperImgBase64" class="cropper-warp-right-value-img" />
-						</div>
-						<div class="cropper-warp-right-label">100 x 100</div>
-					</div>
-					<div class="cropper-warp-right-item">
-						<div class="cropper-warp-right-value">
-							<img :src="state.cropperImgBase64" class="cropper-warp-right-value-img cropper-size" />
-						</div>
-						<div class="cropper-warp-right-label">50 x 50</div>
-					</div>
-				</div>
-			</div>
-			<template #footer>
-				<span class="dialog-footer">
-					<el-button @click="onCancel">取 消</el-button>
-					<el-button type="primary" @click="onSubmit">更 换</el-button>
-				</span>
-			</template>
-		</el-dialog>
-	</div>
-</template>
-
-<script setup lang="ts" name="cropper">
-import { reactive, nextTick } from 'vue';
-import Cropper from 'cropperjs';
-import 'cropperjs/dist/cropper.css';
-
-// 定义变量内容
-const state = reactive({
-	isShowDialog: false,
-	cropperImg: '',
-	cropperImgBase64: '',
-	cropper: '' as RefType,
-});
-
-// 打开弹窗
-const openDialog = (imgs: string) => {
-	state.cropperImg = imgs;
-	state.isShowDialog = true;
-	nextTick(() => {
-		initCropper();
-	});
-};
-// 关闭弹窗
-const closeDialog = () => {
-	state.isShowDialog = false;
-};
-// 取消
-const onCancel = () => {
-	closeDialog();
-};
-// 更换
-const onSubmit = () => {
-	// state.cropperImgBase64 = state.cropper.getCroppedCanvas().toDataURL('image/jpeg');
-};
-// 初始化cropperjs图片裁剪
-const initCropper = () => {
-	const letImg = <HTMLImageElement>document.querySelector('.cropper-warp-left-img');
-	state.cropper = new Cropper(letImg, {
-		viewMode: 1,
-		dragMode: 'none',
-		initialAspectRatio: 1,
-		aspectRatio: 1,
-		preview: '.before',
-		background: false,
-		autoCropArea: 0.6,
-		zoomOnWheel: false,
-		crop: () => {
-			state.cropperImgBase64 = state.cropper.getCroppedCanvas().toDataURL('image/jpeg');
-		},
-	});
-};
-
-// 暴露变量
-defineExpose({
-	openDialog,
-});
-</script>
-
-<style scoped lang="scss">
-.cropper-warp {
-	display: flex;
-	.cropper-warp-left {
-		position: relative;
-		display: inline-block;
-		height: 350px;
-		flex: 1;
-		border: 1px solid var(--el-border-color);
-		background: var(--el-color-white);
-		overflow: hidden;
-		background-repeat: no-repeat;
-		cursor: move;
-		border-radius: var(--el-border-radius-base);
-		.cropper-warp-left-img {
-			width: 100%;
-			height: 100%;
-		}
-	}
-	.cropper-warp-right {
-		width: 150px;
-		height: 350px;
-		.cropper-warp-right-title {
-			text-align: center;
-			height: 20px;
-			line-height: 20px;
-		}
-		.cropper-warp-right-item {
-			margin: 15px 0;
-			.cropper-warp-right-value {
-				display: flex;
-				.cropper-warp-right-value-img {
-					width: 100px;
-					height: 100px;
-					border-radius: var(--el-border-radius-circle);
-					margin: auto;
-				}
-				.cropper-size {
-					width: 50px;
-					height: 50px;
-				}
-			}
-			.cropper-warp-right-label {
-				text-align: center;
-				font-size: 12px;
-				color: var(--el-text-color-primary);
-				height: 30px;
-				line-height: 30px;
-			}
-		}
-	}
-}
-</style>
diff --git a/src/components/verifition/Verify.vue b/src/components/verifition/Verify.vue
index 12dae0c9..92d90e39 100644
--- a/src/components/verifition/Verify.vue
+++ b/src/components/verifition/Verify.vue
@@ -34,8 +34,8 @@
  * @description 分发验证码使用
  * */
 import { computed, ref, toRefs, watchEffect, defineAsyncComponent } from 'vue';
-const VerifySlide = defineAsyncComponent(() => import('/@/components/verifition/Verify/VerifySlide.vue'));
-const VerifyPoints = defineAsyncComponent(() => import('/@/components/verifition/Verify/VerifyPoints.vue'));
+const VerifySlide = defineAsyncComponent(() => import('/@/components/Verifition/Verify/VerifySlide.vue'));
+const VerifyPoints = defineAsyncComponent(() => import('/@/components/Verifition/Verify/VerifyPoints.vue'));
 
 export default {
 	name: 'Vue2Verify',
diff --git a/src/components/verifition/Verify/VerifyPoints.vue b/src/components/verifition/Verify/VerifyPoints.vue
index 5c597fb1..bbd1abeb 100644
--- a/src/components/verifition/Verify/VerifyPoints.vue
+++ b/src/components/verifition/Verify/VerifyPoints.vue
@@ -57,9 +57,9 @@
  * VerifyPoints
  * @description 点选
  * */
-import { resetSize } from './../utils/util';
-import { aesEncrypt } from './../utils/ase';
-import { reqGet, reqCheck } from './../api/index';
+import { resetSize } from '../utils/util';
+import { aesEncrypt } from '../utils/ase';
+import { reqGet, reqCheck } from '../api/index';
 import { onMounted, reactive, ref, nextTick, toRefs, getCurrentInstance } from 'vue';
 export default {
 	name: 'VerifyPoints',
diff --git a/src/components/verifition/Verify/VerifySlide.vue b/src/components/verifition/Verify/VerifySlide.vue
index 3585a736..6556d204 100644
--- a/src/components/verifition/Verify/VerifySlide.vue
+++ b/src/components/verifition/Verify/VerifySlide.vue
@@ -61,9 +61,9 @@
  * VerifySlide
  * @description 滑块
  * */
-import { aesEncrypt } from './../utils/ase';
-import { resetSize } from './../utils/util';
-import { reqCheck, reqGet } from './../api/index';
+import { aesEncrypt } from '../utils/ase';
+import { resetSize } from '../utils/util';
+import { reqCheck, reqGet } from '../api/index';
 import { computed, getCurrentInstance, nextTick, onMounted, reactive, ref, toRefs, watch } from 'vue';
 export default {
 	name: 'VerifySlide',
diff --git a/src/main.ts b/src/main.ts
index 123974ef..d2f5321c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -12,7 +12,7 @@ import 'element-plus/dist/index.css';
 import VForm3 from 'form-designer'; //引入VForm3库
 import 'form-designer/dist/designer.style.css'; //引入VForm3样式
 
-import elementIcons from '/@//components/svgIcon/svgicon';
+import elementIcons from '/@/components/SvgIcon/svgicon';
 import '/@/theme/index.scss';
 import 'vxe-table/lib/style.css';
 import 'xe-utils';
diff --git a/src/utils/other.ts b/src/utils/other.ts
index 6408834b..bbb93ce2 100644
--- a/src/utils/other.ts
+++ b/src/utils/other.ts
@@ -15,7 +15,7 @@ import * as CryptoJS from 'crypto-js';
 import { validateNull } from './validate';
 
 // 引入组件
-const SvgIcon = defineAsyncComponent(() => import('/@/components/svgIcon/index.vue'));
+const SvgIcon = defineAsyncComponent(() => import('/@/components/SvgIcon/index.vue'));
 
 /**
  * 导出全局注册 element plus svg 图标
diff --git a/src/views/admin/dept/form.vue b/src/views/admin/dept/form.vue
index dfdd73e3..6d037f7e 100644
--- a/src/views/admin/dept/form.vue
+++ b/src/views/admin/dept/form.vue
@@ -41,7 +41,7 @@
 
 <script setup lang="ts" name="systemDeptDialog">
 import { useI18n } from 'vue-i18n';
-import { getObj, depttree, addObj, putObj } from '/@/api/admin/dept';
+import { getObj, deptTree, addObj, putObj } from '/@/api/admin/dept';
 import { useMessage } from '/@/hooks/message';
 
 // 定义子组件向父组件传值/事件
@@ -104,7 +104,7 @@ const onSubmit = async () => {
 
 // 从后端获取菜单信息
 const getDeptData = async () => {
-	depttree().then((res) => {
+	deptTree().then((res) => {
 		parentData.value = [];
 		const dept = {
 			id: '0',
diff --git a/src/views/admin/dept/index.vue b/src/views/admin/dept/index.vue
index 10ef0ad2..2c3675e3 100644
--- a/src/views/admin/dept/index.vue
+++ b/src/views/admin/dept/index.vue
@@ -73,7 +73,7 @@
 
 <script setup lang="ts" name="systemDept">
 import { BasicTableProps, useTable } from '/@/hooks/table';
-import { depttree, delObj } from '/@/api/admin/dept';
+import { deptTree, delObj } from '/@/api/admin/dept';
 import { useMessage, useMessageBox } from '/@/hooks/message';
 import { useI18n } from 'vue-i18n';
 import { downBlobFile } from '/@/utils/other';
@@ -87,7 +87,7 @@ const excelUploadRef = ref();
 const showSearch = ref(true);
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-	pageList: depttree,
+	pageList: deptTree,
 	queryForm: {
 		deptName: '',
 	},
diff --git a/src/views/admin/dict/index.vue b/src/views/admin/dict/index.vue
index f23129cb..ec43afd4 100644
--- a/src/views/admin/dict/index.vue
+++ b/src/views/admin/dict/index.vue
@@ -101,7 +101,7 @@ const handleNodeClick = (data: any) => {
 
 // 刷新树
 const handleRefreshTree = async (data: any) => {
-	await dictTreeRef.value.getDeptTree();
+	await dictTreeRef.value.getdeptTree();
 	// 选择当前编辑、新增的节点
 	handleNodeClick(data);
 };
@@ -117,7 +117,7 @@ const handleDelete = async (ids: string[]) => {
 	try {
 		await delObj(ids);
 		useMessage().success(t('common.delSuccessText'));
-		dictTreeRef.value.getDeptTree();
+		dictTreeRef.value.getdeptTree();
 	} catch (err: any) {
 		useMessage().error(err.msg);
 	}
diff --git a/src/views/admin/menu/form.vue b/src/views/admin/menu/form.vue
index 0361ce8e..67d0c0b4 100644
--- a/src/views/admin/menu/form.vue
+++ b/src/views/admin/menu/form.vue
@@ -94,7 +94,7 @@ import { useMessage } from '/@/hooks/message';
 const emit = defineEmits(['refresh']);
 const { t } = useI18n();
 // 引入组件
-const IconSelector = defineAsyncComponent(() => import('/@/components/iconSelector/index.vue'));
+const IconSelector = defineAsyncComponent(() => import('/@/components/IconSelector/index.vue'));
 
 // 定义变量内容
 const visible = ref(false);
diff --git a/src/views/admin/role/form.vue b/src/views/admin/role/form.vue
index 3a9abe1c..bbd92ba5 100644
--- a/src/views/admin/role/form.vue
+++ b/src/views/admin/role/form.vue
@@ -62,7 +62,7 @@
 
 <script lang="ts" name="systemRoleDialog" setup>
 import { rule } from '/@/utils/validate';
-import { depttree } from '/@/api/admin/dept';
+import { deptTree } from '/@/api/admin/dept';
 import { useMessage } from '/@/hooks/message';
 import { addObj, getObj, putObj, validateRoleCode, validateRoleName } from '/@/api/admin/role';
 import { useI18n } from 'vue-i18n';
@@ -203,7 +203,7 @@ const getRoleData = (id: string) => {
 
 // 获取菜单结构数据
 const getDeptData = () => {
-	depttree().then((res: any) => {
+	deptTree().then((res: any) => {
 		dataForm.deptData = res.data;
 	});
 };
diff --git a/src/views/admin/role/permession.vue b/src/views/admin/role/permession.vue
index ebd6c4f0..87e5191a 100644
--- a/src/views/admin/role/permession.vue
+++ b/src/views/admin/role/permession.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="system-role-dialog-container">
-		<el-dialog :title="state.dialog.title" v-model="state.dialog.isShowDialog" :close-on-click-modal="false" draggable>
+		<el-dialog :title="state.dialog.title" width="30%" v-model="state.dialog.isShowDialog" :close-on-click-modal="false" draggable>
 			<el-tree
 				v-loading="loading"
 				ref="menuTree"
diff --git a/src/views/admin/user/form.vue b/src/views/admin/user/form.vue
index 1b318261..885d79f9 100644
--- a/src/views/admin/user/form.vue
+++ b/src/views/admin/user/form.vue
@@ -85,7 +85,7 @@
 import { addObj, getObj, putObj, validatePhone, validateUsername } from '/@/api/admin/user';
 import { list as roleList } from '/@/api/admin/role';
 import { list as postList } from '/@/api/admin/post';
-import { depttree } from '/@/api/admin/dept';
+import { deptTree } from '/@/api/admin/dept';
 import { useDict } from '/@/hooks/dict';
 import { useI18n } from 'vue-i18n';
 import { useMessage } from '/@/hooks/message';
@@ -252,7 +252,7 @@ const getUserData = (id: string) => {
 // 初始化部门数据
 const getDeptData = () => {
 	// 获取部门数据
-	depttree().then((res) => {
+	deptTree().then((res) => {
 		deptData.value = res.data;
 	});
 };
diff --git a/src/views/admin/user/index.vue b/src/views/admin/user/index.vue
index 76bf4382..d987845c 100644
--- a/src/views/admin/user/index.vue
+++ b/src/views/admin/user/index.vue
@@ -132,7 +132,7 @@
 
 <script lang="ts" name="systemUser" setup>
 import { delObj, pageList } from '/@/api/admin/user';
-import { depttree } from '/@/api/admin/dept';
+import { deptTree } from '/@/api/admin/dept';
 import { BasicTableProps, useTable } from '/@/hooks/table';
 import { useDict } from '/@/hooks/dict';
 import { useMessage, useMessageBox } from '/@/hooks/message';
@@ -170,7 +170,7 @@ const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableS
 // 部门树使用的数据
 const deptData = reactive({
 	queryList: (name: String) => {
-		return depttree({
+		return deptTree({
 			deptName: name,
 		});
 	},
diff --git a/src/views/home/schedule/calendar.vue b/src/views/home/schedule/calendar.vue
index 3b7b0ebb..1d2f3d50 100644
--- a/src/views/home/schedule/calendar.vue
+++ b/src/views/home/schedule/calendar.vue
@@ -1,11 +1,9 @@
 <template>
 	<el-calendar v-model="calendar">
 		<template #date-cell="{ data }">
-			<div style="width: 100%" @click="handleSchedule(data)">
+			<div class="calendar-cell" @click="handleSchedule(data)">
 				{{ data.day.split('-').slice(2).join('-') }}
-				<span v-if="filterCellSelected(data)">
-					<el-icon><BellFilled /></el-icon>
-				</span>
+				<div class="box-yello" v-if="filterCellSelected(data)"></div>
 			</div>
 		</template>
 	</el-calendar>
@@ -80,3 +78,27 @@ const handleSchedule = (data) => {
 	}
 };
 </script>
+
+<style lang="scss" scoped>
+.el-calendar-table {
+	.calendar-cell {
+		position: relative;
+		text-align: center;
+		height: 100%;
+		align-items: center;
+		display: flex;
+		justify-content: center;
+	}
+	.box-yello {
+		position: absolute;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		background-color: #e6a23c;
+		opacity: 0.6;
+		padding: 0;
+		border-radius: 5%;
+	}
+}
+</style>
diff --git a/src/views/mp/wx-auto-reply/index.vue b/src/views/mp/wx-auto-reply/index.vue
index 2e23f6c3..b3465aa7 100644
--- a/src/views/mp/wx-auto-reply/index.vue
+++ b/src/views/mp/wx-auto-reply/index.vue
@@ -148,7 +148,7 @@ import { getPage, delObj, addObj, putObj } from '/@/api/mp/wx-auto-reply';
 
 const QueryTree = defineAsyncComponent(() => import('/@/components/QueryTree/index.vue'));
 
-const WxReply = defineAsyncComponent(() => import('/@/components/wechart/wx-reply/index.vue'));
+const WxReply = defineAsyncComponent(() => import('/@/components/Wechat/wx-reply/index.vue'));
 
 // 点击树
 const handleNodeClick = (node: any) => {
diff --git a/src/views/mp/wx-fans-msg/index.vue b/src/views/mp/wx-fans-msg/index.vue
index d6d6fed9..f571b074 100644
--- a/src/views/mp/wx-fans-msg/index.vue
+++ b/src/views/mp/wx-fans-msg/index.vue
@@ -108,7 +108,7 @@ import { useDict } from '/@/hooks/dict';
 import { useI18n } from 'vue-i18n';
 import { fetchAccountList } from '/@/api/mp/wx-account';
 
-const WxMsg = defineAsyncComponent(() => import('/@/components/wechart/wx-msg/index.vue'));
+const WxMsg = defineAsyncComponent(() => import('/@/components/Wechat/wx-msg/index.vue'));
 
 const { t } = useI18n();
 // 定义查询字典
diff --git a/src/views/mp/wx-material/components/news-form.vue b/src/views/mp/wx-material/components/news-form.vue
index 8f13b3dc..da0672fb 100644
--- a/src/views/mp/wx-material/components/news-form.vue
+++ b/src/views/mp/wx-material/components/news-form.vue
@@ -93,9 +93,9 @@
 import { useMessageBox } from '/@/hooks/message';
 import { addObj, materialNewsUpdate } from '/@/api/mp/wx-material';
 
-const WxMaterialSelect = defineAsyncComponent(() => import('/@/components/wechart/wx-material-select/main.vue'));
+const WxMaterialSelect = defineAsyncComponent(() => import('/@/components/Wechat/wx-material-select/main.vue'));
 
-const WxFileUpload = defineAsyncComponent(() => import('/@/components/wechart/fileUpload/index.vue'));
+const WxFileUpload = defineAsyncComponent(() => import('/@/components/Wechat/fileUpload/index.vue'));
 
 const WxMaterialSelectRef = ref();
 
diff --git a/src/views/mp/wx-material/index.vue b/src/views/mp/wx-material/index.vue
index 2c48fa01..89fc70d7 100644
--- a/src/views/mp/wx-material/index.vue
+++ b/src/views/mp/wx-material/index.vue
@@ -140,8 +140,8 @@ import { delObj, getMaterialOther, getMaterialVideo, getPage } from '/@/api/mp/w
 
 const QueryTree = defineAsyncComponent(() => import('/@/components/QueryTree/index.vue'));
 const NewsForm = defineAsyncComponent(() => import('./components/news-form.vue'));
-const WxFileUpload = defineAsyncComponent(() => import('/@/components/wechart/fileUpload/index.vue'));
-const WxNews = defineAsyncComponent(() => import('/@/components/wechart/wx-news/index.vue'));
+const WxFileUpload = defineAsyncComponent(() => import('/@/components/Wechat/fileUpload/index.vue'));
+const WxNews = defineAsyncComponent(() => import('/@/components/Wechat/wx-news/index.vue'));
 
 const deptData = reactive({
 	queryList: (name: string) => {
diff --git a/src/views/mp/wx-menu/index.vue b/src/views/mp/wx-menu/index.vue
index 4bb9fb22..48084481 100644
--- a/src/views/mp/wx-menu/index.vue
+++ b/src/views/mp/wx-menu/index.vue
@@ -134,13 +134,13 @@ import { saveObj, getObj } from '/@/api/mp/wx-menu';
 import { fetchAccountList } from '/@/api/mp/wx-account';
 import { useMessage, useMessageBox } from '/@/hooks/message';
 
-const WxMaterialSelect = defineAsyncComponent(() => import('/@/components/wechart/wx-material-select/main.vue'));
+const WxMaterialSelect = defineAsyncComponent(() => import('/@/components/Wechat/wx-material-select/main.vue'));
 
-const WxReply = defineAsyncComponent(() => import('/@/components/wechart/wx-reply/index.vue'));
+const WxReply = defineAsyncComponent(() => import('/@/components/Wechat/wx-reply/index.vue'));
 
 const QueryTree = defineAsyncComponent(() => import('/@/components/QueryTree/index.vue'));
 
-const WxNews = defineAsyncComponent(() => import('/@/components/wechart/wx-news/index.vue'));
+const WxNews = defineAsyncComponent(() => import('/@/components/Wechat/wx-news/index.vue'));
 
 // 点击树
 const handleNodeClick = (node: any) => {
diff --git a/vite.config.ts b/vite.config.ts
index 23d7287b..d388de53 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -7,7 +7,7 @@ import topLevelAwait from 'vite-plugin-top-level-await';
 import { createStyleImportPlugin, VxeTableResolve } from 'vite-plugin-style-import';
 import viteCompression from 'vite-plugin-compression';
 // @ts-ignore
-import { svgBuilder } from '/@/components/iconSelector/index';
+import { svgBuilder } from '/@/components/IconSelector/index';
 
 const pathResolve = (dir: string) => {
 	return resolve(__dirname, '.', dir);