Quellcode durchsuchen

😁调增页面组件间距默认5px

zuohuaijun vor 2 Jahren
Ursprung
Commit
1430e7b163

+ 11 - 4
Web/src/theme/app.scss

@@ -22,9 +22,9 @@
 	--next-color-seting-main: #e9eef3;
 	--next-color-seting-aside: #d3dce6;
 	--next-color-seting-header: #b3c0d1;
-    // 重写全局样式
+	// 重写全局样式
 	//--el-text-color-primary: rgba(0, 0, 0, .75) !important;
-    --el-text-color-regular: rgba(0, 0, 0, .99) !important;
+	--el-text-color-regular: rgba(0, 0, 0, 0.99) !important;
 	//--el-text-color-secondary: var(--el-text-color-regular) !important;
 }
 
@@ -35,7 +35,14 @@ body,
 	padding: 0;
 	width: 100%;
 	height: 100%;
-	font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun, sans-serif;
+	font-family:
+		Helvetica Neue,
+		Helvetica,
+		PingFang SC,
+		Hiragino Sans GB,
+		Microsoft YaHei,
+		SimSun,
+		sans-serif;
 	font-weight: 400;
 	-webkit-font-smoothing: antialiased;
 	-webkit-tap-highlight-color: transparent;
@@ -88,7 +95,7 @@ body,
 			.layout-parent {
 				@extend .layout-flex;
 				position: relative;
-				padding: 8px; // 四周间隙
+				padding: 5px; // 四周间隙
 			}
 		}
 	}

+ 1 - 1
Web/src/views/home/notice/index.vue

@@ -20,7 +20,7 @@
 			</el-form>
 		</el-card>
 
-		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
+		<el-card class="full-table" shadow="hover" style="margin-top: 5px">
 			<el-table :data="state.noticeData" style="width: 100%" v-loading="state.loading" border :row-class-name="tableRowClassName">
 				<el-table-column type="index" label="序号" width="55" align="center" />
 				<el-table-column prop="sysNotice.title" label="标题" header-align="center" show-overflow-tooltip />

+ 1 - 1
Web/src/views/system/codeGen/index.vue

@@ -20,7 +20,7 @@
 			</el-form>
 		</el-card>
 
-		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
+		<el-card class="full-table" shadow="hover" style="margin-top: 5px">
 			<el-table :data="state.tableData" style="width: 100%" v-loading="state.loading" border>
 				<el-table-column type="index" label="序号" width="55" align="center" />
 				<el-table-column prop="configId" label="库定位器" align="center" show-overflow-tooltip />

+ 1 - 1
Web/src/views/system/config/index.vue

@@ -3,7 +3,7 @@
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<TableSearch :search="tb.tableData.search" @search="onSearch" />
 		</el-card>
-		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
+		<el-card class="full-table" shadow="hover" style="margin-top: 5px">
 			<Table ref="tableRef" v-bind="tb.tableData" :getData="getData" :exportChangeData="exportChangeData" @sortHeader="onSortHeader" @selectionChange="tableSelection" border>
 				<template #command>
 					<el-button type="primary" icon="ele-Plus" @click="openAddConfig" v-auth="'sysConfig:add'"> 新增 </el-button>

+ 1 - 1
Web/src/views/system/database/index.vue

@@ -23,7 +23,7 @@
 			</el-form>
 		</el-card>
 
-		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
+		<el-card class="full-table" shadow="hover" style="margin-top: 5px">
 			<el-table :data="state.columnData" style="width: 100%" v-loading="state.loading1" border>
 				<el-table-column type="index" label="序号" width="55" align="center" />
 				<el-table-column prop="dbColumnName" label="字段名" align="center" show-overflow-tooltip />

+ 1 - 1
Web/src/views/system/file/index.vue

@@ -23,7 +23,7 @@
 			</el-form>
 		</el-card>
 
-		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
+		<el-card class="full-table" shadow="hover" style="margin-top: 5px">
 			<el-table :data="state.fileData" style="width: 100%" v-loading="state.loading" border>
 				<el-table-column type="index" label="序号" width="55" align="center" />
 				<el-table-column prop="fileName" label="名称" min-width="150" header-align="center" show-overflow-tooltip />

+ 1 - 1
Web/src/views/system/job/index.vue

@@ -40,7 +40,7 @@
 			</el-form>
 		</el-card>
 
-		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
+		<el-card class="full-table" shadow="hover" style="margin-top: 5px">
 			<el-table :data="state.jobData" style="width: 100%" v-loading="state.loading" border>
 				<el-table-column type="expand" fixed>
 					<template #default="scope">

+ 1 - 1
Web/src/views/system/log/difflog/index.vue

@@ -20,7 +20,7 @@
 			</el-form>
 		</el-card>
 
-		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
+		<el-card class="full-table" shadow="hover" style="margin-top: 5px">
 			<el-table :data="state.logData" style="width: 100%" v-loading="state.loading" border>
 				<el-table-column type="index" label="序号" width="55" align="center" />
 				<el-table-column prop="diffType" label="差异操作" header-align="center" show-overflow-tooltip />

+ 1 - 1
Web/src/views/system/log/exlog/index.vue

@@ -21,7 +21,7 @@
 			</el-form>
 		</el-card>
 
-		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
+		<el-card class="full-table" shadow="hover" style="margin-top: 5px">
 			<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 />

+ 1 - 1
Web/src/views/system/log/oplog/index.vue

@@ -21,7 +21,7 @@
 			</el-form>
 		</el-card>
 
-		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
+		<el-card class="full-table" shadow="hover" style="margin-top: 5px">
 			<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="模块名称" min-width="120" header-align="center" show-overflow-tooltip />

+ 1 - 1
Web/src/views/system/log/vislog/index.vue

@@ -20,7 +20,7 @@
 			</el-form>
 		</el-card>
 
-		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
+		<el-card class="full-table" shadow="hover" style="margin-top: 5px">
 			<el-table :data="state.logData" style="width: 100%" v-loading="state.loading" border>
 				<el-table-column type="index" label="序号" width="55" align="center" />
 				<el-table-column prop="displayTitle" label="显示名称" width="150" align="center" show-overflow-tooltip />

+ 1 - 1
Web/src/views/system/menu/index.vue

@@ -24,7 +24,7 @@
 			</el-form>
 		</el-card>
 
-		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
+		<el-card class="full-table" shadow="hover" style="margin-top: 5px">
 			<el-table :data="state.menuData" v-loading="state.loading" row-key="id" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" border>
 				<el-table-column label="菜单名称" header-align="center" show-overflow-tooltip>
 					<template #default="scope">

+ 1 - 1
Web/src/views/system/notice/index.vue

@@ -23,7 +23,7 @@
 			</el-form>
 		</el-card>
 
-		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
+		<el-card class="full-table" shadow="hover" style="margin-top: 5px">
 			<el-table :data="state.noticeData" style="width: 100%" v-loading="state.loading" border>
 				<el-table-column type="index" label="序号" width="55" align="center" />
 				<el-table-column prop="title" label="标题" header-align="center" show-overflow-tooltip />

+ 1 - 1
Web/src/views/system/openAccess/index.vue

@@ -18,7 +18,7 @@
 			</el-form>
 		</el-card>
 
-		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
+		<el-card class="full-table" shadow="hover" style="margin-top: 5px">
 			<el-table :data="state.openAccessData" style="width: 100%" v-loading="state.loading" border>
 				<el-table-column type="index" label="序号" width="55" align="center" />
 				<el-table-column prop="accessKey" label="身份标识" header-align="center" show-overflow-tooltip />

+ 2 - 2
Web/src/views/system/org/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="sys-org-container">
-		<el-row :gutter="8" style="width: 100%; flex: 1">
+		<el-row :gutter="5" style="width: 100%; flex: 1">
 			<el-col :span="4" :xs="24">
 				<OrgTree ref="orgTreeRef" @node-click="nodeClick" />
 			</el-col>
@@ -31,7 +31,7 @@
 					</el-form>
 				</el-card>
 
-				<el-card class="full-table" shadow="hover" style="margin-top: 8px">
+				<el-card class="full-table" shadow="hover" style="margin-top: 5px">
 					<el-table :data="state.orgData" style="width: 100%" v-loading="state.loading" row-key="id" default-expand-all :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" border>
 						<el-table-column prop="name" label="机构名称" min-width="160" header-align="center" show-overflow-tooltip />
 						<el-table-column prop="code" label="机构编码" align="center" show-overflow-tooltip />

+ 1 - 1
Web/src/views/system/plugin/index.vue

@@ -17,7 +17,7 @@
 			</el-form>
 		</el-card>
 
-		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
+		<el-card class="full-table" shadow="hover" style="margin-top: 5px">
 			<el-table :data="state.pluginData" style="width: 100%" v-loading="state.loading" border>
 				<el-table-column type="index" label="序号" width="55" align="center" fixed />
 				<el-table-column prop="name" label="功能名称" header-align="center" show-overflow-tooltip />

+ 1 - 1
Web/src/views/system/pos/index.vue

@@ -20,7 +20,7 @@
 			</el-form>
 		</el-card>
 
-		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
+		<el-card class="full-table" shadow="hover" style="margin-top: 5px">
 			<el-table :data="state.posData" style="width: 100%" v-loading="state.loading" border>
 				<el-table-column type="index" label="序号" width="55" align="center" />
 				<el-table-column prop="name" label="职位名称" align="center" show-overflow-tooltip />

+ 1 - 1
Web/src/views/system/print/index.vue

@@ -17,7 +17,7 @@
 			</el-form>
 		</el-card>
 
-		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
+		<el-card class="full-table" shadow="hover" style="margin-top: 5px">
 			<el-table :data="state.printData" style="width: 100%" v-loading="state.loading" border>
 				<el-table-column type="index" label="序号" width="55" align="center" fixed />
 				<el-table-column prop="name" label="名称" header-align="center" show-overflow-tooltip />

+ 1 - 1
Web/src/views/system/region/index.vue

@@ -27,7 +27,7 @@
 					</el-form>
 				</el-card>
 
-				<el-card class="full-table" shadow="hover" style="margin-top: 8px">
+				<el-card class="full-table" shadow="hover" style="margin-top: 5px">
 					<el-table :data="state.regionData" style="width: 100%" v-loading="state.loading" row-key="id" default-expand-all :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" border>
 						<el-table-column prop="name" label="行政名称" align="center" show-overflow-tooltip />
 						<el-table-column prop="code" label="行政代码" align="center" show-overflow-tooltip />

+ 1 - 1
Web/src/views/system/role/index.vue

@@ -20,7 +20,7 @@
 			</el-form>
 		</el-card>
 
-		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
+		<el-card class="full-table" shadow="hover" style="margin-top: 5px">
 			<el-table :data="state.roleData" style="width: 100%" v-loading="state.loading" border>
 				<el-table-column type="index" label="序号" width="55" align="center" fixed />
 				<el-table-column prop="name" label="角色名称" align="center" show-overflow-tooltip />

+ 23 - 13
Web/src/views/system/server/index.vue

@@ -43,9 +43,11 @@
 				<el-card shadow="hover" header="使用信息">
 					<el-row>
 						<el-col :xs="12" :sm="12" :md="12" :lg="12" :xl="12" style="text-align: center">
-							<el-progress type="dashboard"
+							<el-progress
+								type="dashboard"
 								:percentage="parseInt(state.machineUseInfo.ramRate == undefined ? 0 : state.machineUseInfo.ramRate.substr(0, state.machineUseInfo.ramRate.length - 1))"
-								:color="'var(--el-color-primary)'">
+								:color="'var(--el-color-primary)'"
+							>
 								<template #default>
 									<span>{{ state.machineUseInfo.ramRate }}<br /></span>
 									<span style="font-size: 10px">
@@ -57,9 +59,11 @@
 							</el-progress>
 						</el-col>
 						<el-col :xs="12" :sm="12" :md="12" :lg="12" :xl="12" style="text-align: center">
-							<el-progress type="dashboard"
+							<el-progress
+								type="dashboard"
 								:percentage="parseInt(state.machineUseInfo.cpuRate == undefined ? 0 : state.machineUseInfo.cpuRate.substr(0, state.machineUseInfo.cpuRate.length - 1))"
-								:color="'var(--el-color-primary)'">
+								:color="'var(--el-color-primary)'"
+							>
 								<template #default>
 									<span>{{ state.machineUseInfo.cpuRate }}<br /></span>
 									<span style="font-size: 10px"> CPU使用率 </span>
@@ -98,13 +102,12 @@
 
 		<el-row :gutter="8">
 			<el-col :md="24" :sm="24">
-				<el-card shadow="hover" header="程序集信息" style="margin-top: 8px; --el-card-padding: 10px">
-					<div v-for="d in state.assemblyInfo" :key="d.name"
-						style="display: inline-block; margin: 4px;text-align: left;">
+				<el-card shadow="hover" header="程序集信息" style="margin-top: 5px; --el-card-padding: 10px">
+					<div v-for="d in state.assemblyInfo" :key="d.name" style="display: inline-block; margin: 4px; text-align: left">
 						<el-tag round>
 							<div style="display: inline-flex">
 								<div style="">{{ d.name }}</div>
-								<div style="color: black;  font-size: 9px; margin-left: 3px">v{{ d.version }}</div>
+								<div style="color: black; font-size: 9px; margin-left: 3px">v{{ d.version }}</div>
 							</div>
 						</el-tag>
 					</div>
@@ -114,12 +117,19 @@
 
 		<el-row :gutter="8">
 			<el-col :md="24" :sm="24">
-				<el-card shadow="hover" header="磁盘信息" style="margin-top: 8px">
+				<el-card shadow="hover" header="磁盘信息" style="margin-top: 5px">
 					<el-row>
-						<el-col :span="4" :xs="24 / state.machineDiskInfo.length * 2"
-							:sm="24 / state.machineDiskInfo.length" :md="24 / state.machineDiskInfo.length"
-							:lg="24 / state.machineDiskInfo.length" :xl="24 / state.machineDiskInfo.length"
-							v-for="d in state.machineDiskInfo" :key="d.diskName" style="text-align: center">
+						<el-col
+							:span="4"
+							:xs="(24 / state.machineDiskInfo.length) * 2"
+							:sm="24 / state.machineDiskInfo.length"
+							:md="24 / state.machineDiskInfo.length"
+							:lg="24 / state.machineDiskInfo.length"
+							:xl="24 / state.machineDiskInfo.length"
+							v-for="d in state.machineDiskInfo"
+							:key="d.diskName"
+							style="text-align: center"
+						>
 							<el-progress type="circle" :percentage="d.availablePercent" :color="'var(--el-color-primary)'">
 								<template #default>
 									<span>{{ d.availablePercent }}%<br /></span>

+ 1 - 1
Web/src/views/system/tenant/index.vue

@@ -20,7 +20,7 @@
 			</el-form>
 		</el-card>
 
-		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
+		<el-card class="full-table" shadow="hover" style="margin-top: 5px">
 			<el-table :data="state.tenantData" style="width: 100%" v-loading="state.loading" border>
 				<el-table-column type="index" label="序号" width="55" align="center" fixed />
 				<el-table-column prop="name" label="租户名称" width="160" align="center" show-overflow-tooltip />

+ 1 - 1
Web/src/views/system/user/component/userCenter.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="sys-userCenter-container">
-		<el-row :gutter="8" style="width: 100%">
+		<el-row :gutter="5" style="width: 100%">
 			<el-col :span="8" :xs="24">
 				<el-card shadow="hover">
 					<div class="account-center-avatarHolder">

+ 2 - 2
Web/src/views/system/user/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="sys-user-container">
-		<el-row :gutter="8" style="width: 100%; flex: 1">
+		<el-row :gutter="5" style="width: 100%; flex: 1">
 			<el-col :span="4" :xs="24">
 				<OrgTree ref="orgTreeRef" @node-click="nodeClick" />
 			</el-col>
@@ -29,7 +29,7 @@
 					</el-form>
 				</el-card>
 
-				<el-card class="full-table" shadow="hover" style="margin-top: 8px">
+				<el-card class="full-table" shadow="hover" style="margin-top: 5px">
 					<el-table :data="state.userData" style="width: 100%" v-loading="state.loading" border>
 						<el-table-column type="index" label="序号" width="55" align="center" fixed />
 						<el-table-column label="头像" width="80" align="center" show-overflow-tooltip>

+ 1 - 1
Web/src/views/system/weChatUser/index.vue

@@ -17,7 +17,7 @@
 			</el-form>
 		</el-card>
 
-		<el-card class="full-table" shadow="hover" style="margin-top: 8px">
+		<el-card class="full-table" shadow="hover" style="margin-top: 5px">
 			<el-table :data="state.weChatUserData" style="width: 100%" v-loading="state.loading" border>
 				<el-table-column type="index" label="序号" width="55" align="center" />
 				<el-table-column prop="openId" label="OpenId" align="center" show-overflow-tooltip />