fix: 优化页面主区域的padding和border部分样式

.vscode/settings.json

@@ -131,7 +131,7 @@
   },
   "editor.wordWrapColumn": 200,
   "[scss]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": "MikeBovenlander.formate"
   },
   "npm.exclude": "**/{dist_electron,vendor}",
   "files.exclude": {

src/theme/media/scrollbar.scss

@@ -1,7 +1,39 @@
 @import './index.scss';
 
+// 滚动条的宽度
+::-webkit-scrollbar {
+	width : 2px !important;
+	height: 2px !important;
+}
+
+::-webkit-scrollbar-track-piece {
+	background-color: var(--next-bg-main-color);
+}
+
+// 滚动条的设置
+::-webkit-scrollbar-thumb {
+	background-color: rgba(144, 147, 153, 0.3);
+	background-clip : padding-box;
+	min-height      : 28px;
+	border-radius   : 5px;
+	transition      : 0.3s background-color;
+}
+
+::-webkit-scrollbar-thumb:hover {
+	background-color: rgba(144, 147, 153, 0.5);
+}
+
+// element plus scrollbar
+.el-scrollbar__bar.is-vertical {
+	width: 8px !important;
+}
+
+.el-scrollbar__bar.is-horizontal {
+	height: 8px !important;
+}
+
 /* 页面宽度小于768px
-------------------------------- */
+------------------------------- 
 @media screen and (max-width: $sm) {
 	// 滚动条的宽度
 	::-webkit-scrollbar {
@@ -31,8 +63,10 @@
 	}
 }
 
+*/
+
 /* 页面宽度大于768px
-------------------------------- */
+-------------------------------
 @media screen and (min-width: 769px) {
 	// 滚动条的宽度
 	::-webkit-scrollbar {
@@ -54,3 +88,4 @@
 		background-color: rgba(144, 147, 153, 0.5);
 	}
 }
+ */

src/views/iot/iotmanager/dashboard.vue

@@ -2,7 +2,6 @@
 	<div class="home-container">
 		<el-row :gutter="15" class="home-card-one mb15">
 			<el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" v-for="(v, k) in homeOne" :key="k" :class="{ 'home-media home-media-lg': k > 1, 'home-media-sm': k === 1 }">
-
 				<div class="home-card-item ">
 					<div class="">{{ v.num3 }}</div>
 					<div class="flex-margin flex w100" :class="` home-one-animation${k}`">
@@ -548,7 +547,7 @@ $homeNavLengh: 8;
 			border: 1px solid var(--next-border-color-light);
 
 			&:hover {
-				box-shadow: 0 2px 12px var(--next-color-dark-hover);
+				// box-shadow: 0 2px 12px var(--next-color-dark-hover);
 				transition: all ease 0.3s;
 			}
 

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

@@ -1,5 +1,5 @@
 <template>
-	<div class="page flex-row gap-5">
+	<div class="page padding flex-row gap-5">
 		<el-card shadow="nover">
 			<el-scrollbar>
 				<el-input :prefix-icon="search" v-model="filterText" placeholder="请输入组织名称" clearable size="default" style="width: 100%;" />
@@ -83,9 +83,10 @@
 				</el-table-column>
 			</el-table>
 			<pagination v-show="tableData.total > 0" :total="tableData.total" v-model:page="tableData.param.pageNum" v-model:limit="tableData.param.pageSize" @pagination="userList" />
+
+			<EditUser ref="editUserRef" :dept-data="deptData" :post-data="postData" :role-data="roleData" @getUserList="userList" />
+			<EditPer ref="editPerRef" @getUserList="userList" />
 		</el-card>
-		<EditUser ref="editUserRef" :dept-data="deptData" :post-data="postData" :role-data="roleData" @getUserList="userList" />
-		<EditPer ref="editPerRef" @getUserList="userList" />
 	</div>
 </template>