😁1、修复elementplus升级造成的el-select宽度问题等 2、前端系统页面调整 3、升级npm包依赖

Web/package.json

@@ -19,13 +19,13 @@
 		"@wangeditor/editor": "^5.1.23",
 		"@wangeditor/editor-for-vue": "^5.1.12",
 		"animate.css": "^4.1.1",
-		"axios": "^1.6.5",
+		"axios": "^1.6.7",
 		"countup.js": "^2.8.0",
 		"cropperjs": "^1.6.1",
 		"echarts": "^5.4.3",
 		"echarts-gl": "^2.0.9",
 		"echarts-wordcloud": "^2.1.0",
-		"element-plus": "^2.5.2",
+		"element-plus": "^2.5.3",
 		"js-cookie": "^3.0.5",
 		"js-table2excel": "^1.1.2",
 		"jsplumb": "^2.15.6",
@@ -57,15 +57,15 @@
 	},
 	"devDependencies": {
 		"@types/lodash-es": "^4.17.12",
-		"@types/node": "^20.11.5",
+		"@types/node": "^20.11.7",
 		"@types/nprogress": "^0.2.3",
 		"@types/sortablejs": "^1.15.7",
-		"@typescript-eslint/eslint-plugin": "^6.19.0",
-		"@typescript-eslint/parser": "^6.19.0",
+		"@typescript-eslint/eslint-plugin": "^6.19.1",
+		"@typescript-eslint/parser": "^6.19.1",
 		"@vitejs/plugin-vue": "^5.0.3",
 		"@vitejs/plugin-vue-jsx": "^3.1.0",
 		"@vue/compiler-sfc": "^3.4.15",
-		"code-inspector-plugin": "^0.4.5",
+		"code-inspector-plugin": "^0.5.1",
 		"eslint": "^8.56.0",
 		"eslint-plugin-vue": "^9.20.1",
 		"less": "^4.2.0",
@@ -76,7 +76,7 @@
 		"vite-plugin-cdn-import": "^0.3.5",
 		"vite-plugin-compression": "^0.5.1",
 		"vite-plugin-vue-setup-extend-plus": "^0.1.0",
-		"vue-eslint-parser": "^9.4.0"
+		"vue-eslint-parser": "^9.4.2"
 	},
 	"browserslist": [
 		"> 1%",

Web/src/App.vue

@@ -106,3 +106,12 @@ watch(
 	}
 );
 </script>
+
+<style>
+.el-select {
+	width: 171px !important;
+}
+.el-select__wrapper {
+	line-height: 22px !important;
+}
+</style>

Web/src/layout/navBars/tagsView/tagsView.vue

@@ -601,7 +601,7 @@ watch(
 	background-color: var(--el-color-white);
 	border-bottom: 1px solid var(--next-border-color-light);
 	position: relative;
-	z-index: 2001;
+	z-index: 1999;
 	:deep(.el-scrollbar__wrap) {
 		overflow-x: auto !important;
 	}

Web/src/stores/userInfo.ts

@@ -68,7 +68,7 @@ export const useUserInfo = defineStore('userInfo', {
 							realName: d.realName,
 							phone: d.phone,
 							idCardNum: d.idCardNum,
-							email: d.Email,
+							email: d.email,
 							accountType: d.accountType,
 							avatar: d.avatar ? '/' + d.avatar : '/favicon.ico',
 							address: d.address,

Web/src/views/system/codeGen/index.vue

@@ -2,10 +2,10 @@
 	<div class="sys-codeGen-container">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-				<el-form-item label="业务名" prop="busName">
+				<el-form-item label="业务名">
 					<el-input placeholder="业务名" clearable @keyup.enter="handleQuery" v-model="state.queryParams.busName" />
 				</el-form-item>
-				<el-form-item label="数据库表名" prop="tableName">
+				<el-form-item label="数据库表名">
 					<el-input placeholder="数据库表名" clearable @keyup.enter="handleQuery" v-model="state.queryParams.tableName" />
 				</el-form-item>
 				<el-form-item>
@@ -183,12 +183,3 @@ const handleGenerate = (row: any) => {
 		.catch(() => {});
 };
 </script>
-
-<style lang="scss" scoped>
-//搜索区域Label固定宽度
-.sys-codeGen-container {
-	::v-deep(.el-form-item__label) {
-		width: 90px;
-	}
-}
-</style>

Web/src/views/system/dict/index.vue

@@ -26,8 +26,8 @@
 
 					<el-table :data="state.dictTypeData" style="width: 100%" v-loading="state.loading" @row-click="handleDictType" highlight-current-row border>
 						<el-table-column type="index" label="序号" width="55" align="center" />
-						<el-table-column prop="name" label="字典名称" header-align="center" show-overflow-tooltip />
-						<el-table-column prop="code" label="字典编码" header-align="center" show-overflow-tooltip />
+						<el-table-column prop="name" label="字典名称" min-width="120" header-align="center" show-overflow-tooltip />
+						<el-table-column prop="code" label="字典编码" min-width="140" header-align="center" show-overflow-tooltip />
 						<el-table-column prop="status" label="状态" width="70" align="center" show-overflow-tooltip>
 							<template #default="scope">
 								<el-tag type="success" v-if="scope.row.status === 1">启用</el-tag>
@@ -141,7 +141,7 @@
 
 					<el-table :data="state.dictDataData" style="width: 100%" v-loading="state.loading" border>
 						<el-table-column type="index" label="序号" width="55" align="center" />
-						<el-table-column prop="value" label="字典值" header-align="center" min-width="100" show-overflow-tooltip>
+						<el-table-column prop="value" label="字典值" header-align="center" min-width="140" show-overflow-tooltip>
 							<template #default="scope">
 								<el-tag :type="scope.row.tagType" :style="scope.row.styleSetting" :class="scope.row.classSetting">{{ scope.row.value }}</el-tag>
 							</template>

Web/src/views/system/log/oplog/index.vue

@@ -24,7 +24,7 @@
 		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
 			<el-table :data="state.logData" @sort-change="sortChange" style="width: 100%" border :row-class-name="tableRowClassName">
 				<el-table-column type="index" label="序号" width="55" align="center" />
-				<el-table-column prop="controllerName" label="模块名称" width="100" header-align="center" show-overflow-tooltip />
+				<el-table-column prop="controllerName" label="模块名称" min-width="120" header-align="center" show-overflow-tooltip />
 				<el-table-column prop="displayTitle" label="显示名称" width="170" header-align="center" show-overflow-tooltip />
 				<el-table-column prop="actionName" label="方法名称" width="150" header-align="center" show-overflow-tooltip />
 				<el-table-column prop="httpMethod" label="请求方式" width="90" align="center" show-overflow-tooltip />
@@ -45,9 +45,9 @@
 				<el-table-column prop="traceId" label="请求跟踪Id" width="150" header-align="center" sortable="custom" show-overflow-tooltip />
 				<el-table-column prop="account" label="账号名称" width="100" align="center" show-overflow-tooltip />
 				<el-table-column prop="realName" label="真实姓名" width="100" align="center" show-overflow-tooltip />
-				<el-table-column prop="remoteIp" label="IP地址" width="120" align="center" show-overflow-tooltip />
-				<el-table-column prop="location" label="登录地点" width="120" align="center" show-overflow-tooltip />
-				<el-table-column prop="browser" label="浏览器" width="160" align="center" show-overflow-tooltip />
+				<el-table-column prop="remoteIp" label="IP地址" min-width="120" align="center" show-overflow-tooltip />
+				<el-table-column prop="location" label="登录地点" min-width="120" align="center" show-overflow-tooltip />
+				<el-table-column prop="browser" label="浏览器" min-width="150" align="center" show-overflow-tooltip />
 				<el-table-column prop="os" label="操作系统" width="120" align="center" show-overflow-tooltip />
 				<el-table-column prop="status" label="状态" width="70" align="center" show-overflow-tooltip>
 					<template #default="scope">

Web/src/views/system/log/vislog/index.vue

@@ -27,9 +27,9 @@
 				<el-table-column prop="actionName" label="方法名称" width="150" header-align="center" show-overflow-tooltip />
 				<el-table-column prop="account" label="账号名称" width="100" align="center" show-overflow-tooltip />
 				<el-table-column prop="realName" label="真实姓名" width="100" align="center" show-overflow-tooltip />
-				<el-table-column prop="remoteIp" label="IP地址" align="center" show-overflow-tooltip />
-				<el-table-column prop="location" label="登录地点" align="center" show-overflow-tooltip />
-				<el-table-column prop="browser" label="浏览器" align="center" show-overflow-tooltip />
+				<el-table-column prop="remoteIp" label="IP地址" min-width="120" align="center" show-overflow-tooltip />
+				<el-table-column prop="location" label="登录地点" min-width="120" align="center" show-overflow-tooltip />
+				<el-table-column prop="browser" label="浏览器" min-width="150" align="center" show-overflow-tooltip />
 				<el-table-column prop="os" label="操作系统" width="120" align="center" show-overflow-tooltip />
 				<el-table-column prop="status" label="状态" width="70" align="center" show-overflow-tooltip>
 					<template #default="scope">

Web/src/views/system/org/index.vue

@@ -11,11 +11,11 @@
 						<el-form-item label="机构名称">
 							<el-input v-model="state.queryParams.name" placeholder="机构名称" clearable />
 						</el-form-item>
-						<el-form-item label="机构编码">
+						<!-- <el-form-item label="机构编码">
 							<el-input v-model="state.queryParams.code" placeholder="机构编码" clearable />
-						</el-form-item>
+						</el-form-item> -->
 						<el-form-item label="机构类型">
-							<el-select v-model="state.queryParams.type" filterable clearable class="w100">
+							<el-select v-model="state.queryParams.type" filterable clearable>
 								<el-option v-for="item in state.orgTypeList" :key="item.value" :label="item.value" :value="item.code" />
 							</el-select>
 						</el-form-item>

Web/src/views/system/user/index.vue

@@ -61,7 +61,7 @@
 								<el-tag v-else> 其他 </el-tag>
 							</template>
 						</el-table-column>
-						<el-table-column prop="roleName" label="角色集合" min-width="130" align="center" show-overflow-tooltip />
+						<el-table-column prop="roleName" label="角色集合" min-width="150" align="center" show-overflow-tooltip />
 						<el-table-column prop="orgName" label="所属机构" min-width="120" align="center" show-overflow-tooltip />
 						<el-table-column prop="posName" label="职位名称" min-width="120" align="center" show-overflow-tooltip />
 						<el-table-column label="状态" width="70" align="center" show-overflow-tooltip>
@@ -160,7 +160,7 @@
 <script lang="ts" setup name="sysUser">
 import { onMounted, reactive, ref } from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
-import { formatDate } from '/@/utils/formatTime';
+// import { formatDate } from '/@/utils/formatTime';
 import { auth } from '/@/utils/authFunction';
 import OrgTree from '/@/views/system/org/component/orgTree.vue';
 import EditUser from '/@/views/system/user/component/editUser.vue';