Browse Source

框架基础页面搜索区域调整

skywolf627 3 years ago
parent
commit
bb768b6710

+ 32 - 11
Web/src/views/system/codeGen/index.vue

@@ -2,17 +2,29 @@
 	<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-input placeholder="业务名" clearable @keyup.enter="handleQuery" v-model="state.queryParams.busName" />
-				</el-form-item>
-				<el-form-item label="数据库表名" prop="tableName">
-					<el-input placeholder="数据库表名" clearable @keyup.enter="handleQuery" v-model="state.queryParams.tableName" />
-				</el-form-item>
-				<el-form-item>
-					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-					<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysMenu:list'"> 查询 </el-button>
-					<el-button type="primary" icon="ele-Plus" @click="openAddDialog">增加</el-button>
-				</el-form-item>
+        <el-row :gutter="35">
+          <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
+            <el-form-item label="业务名" prop="busName">
+              <el-input placeholder="业务名" clearable @keyup.enter="handleQuery" v-model="state.queryParams.busName" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">  
+            <el-form-item label="数据库表名" prop="tableName">
+              <el-input placeholder="数据库表名" clearable @keyup.enter="handleQuery" v-model="state.queryParams.tableName" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20 search-actions">
+            <div>
+              <el-button type="primary" icon="ele-Plus" @click="openAddDialog"> 增加 </el-button>
+            </div>
+            <div>
+              <el-form-item>
+                <el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
+                <el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysMenu:list'" plain> 查询 </el-button>
+              </el-form-item>
+            </div>
+          </el-col>
+        </el-row>
 			</el-form>
 		</el-card>
 
@@ -198,3 +210,12 @@ const handleGenerate = (row: any) => {
 		.catch(() => {});
 };
 </script>
+
+<style lang="scss" scoped>
+  //搜索区域Label固定宽度
+  .sys-codeGen-container{
+    ::v-deep(.el-form-item__label) {
+      width: 90px;
+    }
+  }
+</style>

+ 28 - 14
Web/src/views/system/config/index.vue

@@ -2,20 +2,34 @@
 	<div class="sys-config-container">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-				<el-form-item label="配置名称" prop="name">
-					<el-input placeholder="配置名称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.name" />
-				</el-form-item>
-				<el-form-item label="配置编码" prop="code">
-					<el-input placeholder="配置编码" clearable @keyup.enter="handleQuery" v-model="state.queryParams.code" />
-				</el-form-item>
-				<el-form-item label="分组编码" prop="groupCode">
-					<el-input placeholder="分组编码" clearable @keyup.enter="handleQuery" v-model="state.queryParams.groupCode" />
-				</el-form-item>
-				<el-form-item>
-					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-					<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysConfig:page'"> 查询 </el-button>
-					<el-button icon="ele-Plus" @click="openAddConfig" v-auth="'sysConfig:add'"> 新增 </el-button>
-				</el-form-item>
+        <el-row :gutter="35">
+          <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
+            <el-form-item label="配置名称" prop="name">
+              <el-input placeholder="配置名称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.name" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">  
+            <el-form-item label="配置编码" prop="code">
+              <el-input placeholder="配置编码" clearable @keyup.enter="handleQuery" v-model="state.queryParams.code" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">  
+            <el-form-item label="分组编码" prop="groupCode">
+              <el-input placeholder="分组编码" clearable @keyup.enter="handleQuery" v-model="state.queryParams.groupCode" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20 search-actions">
+            <div>
+              <el-button type="primary"  icon="ele-Plus" @click="openAddConfig" v-auth="'sysConfig:add'"> 新增 </el-button>
+            </div>
+            <div>
+              <el-form-item>
+                <el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
+                <el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysConfig:page'" plain> 查询 </el-button> 
+              </el-form-item>
+            </div>
+          </el-col>
+        </el-row>
 			</el-form>
 		</el-card>
 

+ 27 - 18
Web/src/views/system/database/index.vue

@@ -2,24 +2,33 @@
 	<div class="sys-database-container">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true" v-loading="state.loading">
-				<el-form-item label="库名" prop="configId">
-					<el-select v-model="state.configId" placeholder="库名" filterable @change="handleQueryTable">
-						<el-option v-for="item in state.dbData" :key="item" :label="item" :value="item" />
-					</el-select>
-				</el-form-item>
-				<el-form-item label="表名" prop="tableName">
-					<el-select v-model="state.tableName" placeholder="表名" filterable clearable @change="handleQueryColumn">
-						<el-option v-for="item in state.tableData" :key="item.name" :label="item.name + '[' + item.description + ']'" :value="item.name" />
-					</el-select>
-				</el-form-item>
-				<el-form-item>
-					<!-- <el-button type="primary" icon="ele-Search" @click="handleQueryTable"> 查看 </el-button> -->
-					<el-button icon="ele-Edit" type="primary" @click="openEditTable"> 编辑表 </el-button>
-					<el-button icon="ele-Delete" type="danger" @click="delTable"> 删除表 </el-button>
-					<el-button icon="ele-Plus" @click="openAddTable"> 增加表 </el-button>
-					<el-button icon="ele-Plus" @click="openAddColumn"> 增加列 </el-button>
-					<el-button icon="ele-Plus" @click="openGenDialog"> 生成实体 </el-button>
-				</el-form-item>
+        <el-row :gutter="35">
+          <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="8">
+            <el-form-item label="库名" prop="configId">
+              <el-select v-model="state.configId" placeholder="库名" filterable @change="handleQueryTable">
+                <el-option v-for="item in state.dbData" :key="item" :label="item" :value="item" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="8">  
+            <el-form-item label="表名" prop="tableName">
+              <el-select v-model="state.tableName" placeholder="表名" filterable clearable @change="handleQueryColumn">
+                <el-option v-for="item in state.tableData" :key="item.name" :label="item.name + '[' + item.description + ']'" :value="item.name" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20 search-actions">
+            <div>
+              <el-button icon="ele-Edit" type="primary" @click="openEditTable"> 编辑表 </el-button>
+              <el-button icon="ele-Delete" type="danger" @click="delTable"> 删除表 </el-button>
+              <el-button icon="ele-Plus" @click="openAddTable"> 增加表 </el-button>
+              <el-button icon="ele-Plus" @click="openAddColumn"> 增加列 </el-button>
+              <el-button icon="ele-Plus" @click="openGenDialog"> 生成实体 </el-button>
+            </div>
+            <div> 
+            </div>
+          </el-col>
+        </el-row>
 			</el-form>
 		</el-card>
 

+ 23 - 11
Web/src/views/system/dict/component/dictDataDialog.vue

@@ -9,17 +9,29 @@
 			</template>
 			<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 				<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-					<el-form-item label="值" prop="value">
-						<el-input placeholder="值" clearable @keyup.enter="handleQuery" v-model="state.queryParams.value" />
-					</el-form-item>
-					<el-form-item label="编码" prop="code">
-						<el-input placeholder="编码" clearable @keyup.enter="handleQuery" v-model="state.queryParams.code" />
-					</el-form-item>
-					<el-form-item>
-						<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-						<el-button type="primary" icon="ele-Search" @click="handleQuery"> 查询 </el-button>
-						<el-button icon="ele-Plus" @click="openAddDictData"> 新增 </el-button>
-					</el-form-item>
+        <el-row :gutter="35">
+          <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="8">
+            <el-form-item label="值" prop="value">
+              <el-input placeholder="值" clearable @keyup.enter="handleQuery" v-model="state.queryParams.value" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="8">
+            <el-form-item label="编码" prop="code">
+              <el-input placeholder="编码" clearable @keyup.enter="handleQuery" v-model="state.queryParams.code" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20 search-actions">
+            <div>
+              <el-button type="primary"  icon="ele-Plus" @click="openAddDictData"> 新增 </el-button>
+            </div>
+            <div>
+              <el-form-item>
+                <el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
+                <el-button type="primary" icon="ele-Search" @click="handleQuery" plain> 查询 </el-button> 
+              </el-form-item>
+            </div>
+          </el-col>
+        </el-row>
 				</el-form>
 			</el-card>
 

+ 23 - 11
Web/src/views/system/dict/index.vue

@@ -2,17 +2,29 @@
 	<div class="sys-dict-container">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-				<el-form-item label="字典名称" prop="name">
-					<el-input placeholder="字典名称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.name" />
-				</el-form-item>
-				<el-form-item label="字典编码" prop="code">
-					<el-input placeholder="字典编码" clearable @keyup.enter="handleQuery" v-model="state.queryParams.code" />
-				</el-form-item>
-				<el-form-item>
-					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-					<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysDictType:page'"> 查询 </el-button>
-					<el-button icon="ele-Plus" @click="openAddDictType" v-auth="'sysDictType:add'"> 新增 </el-button>
-				</el-form-item>
+        <el-row :gutter="35">
+          <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
+            <el-form-item label="字典名称" prop="name">
+              <el-input placeholder="字典名称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.name" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">  
+            <el-form-item label="字典编码" prop="code">
+              <el-input placeholder="字典编码" clearable @keyup.enter="handleQuery" v-model="state.queryParams.code" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20 search-actions">
+            <div>
+              <el-button type="primary"  icon="ele-Plus" @click="openAddDictType" v-auth="'sysDictType:add'"> 新增 </el-button>
+            </div>
+            <div>
+              <el-form-item>
+                <el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
+                <el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysDictType:page'" plain> 查询 </el-button> 
+              </el-form-item>
+            </div>
+          </el-col>
+        </el-row>
 			</el-form>
 		</el-card>
 

+ 30 - 18
Web/src/views/system/file/index.vue

@@ -2,24 +2,36 @@
 	<div class="sys-file-container">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-				<el-form-item label="文件名称" prop="fileName">
-					<el-input placeholder="文件名称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.fileName" />
-				</el-form-item>
-				<el-form-item label="时间范围" prop="timeRange">
-					<el-date-picker
-						v-model="state.queryParams.timeRange"
-						type="datetimerange"
-						start-placeholder="开始时间"
-						end-placeholder="结束时间"
-						format="YYYY-MM-DD HH:mm:ss"
-						value-format="YYYY-MM-DD HH:mm:ss"
-					/>
-				</el-form-item>
-				<el-form-item>
-					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-					<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysFile:page'"> 查询 </el-button>
-					<el-button icon="ele-UploadFilled" @click="openUploadDialog" v-auth="'sysFile:uploadFile'"> 上传 </el-button>
-				</el-form-item>
+        <el-row :gutter="35">
+          <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
+            <el-form-item label="文件名称" prop="fileName">
+              <el-input placeholder="文件名称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.fileName" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">  
+            <el-form-item label="时间范围" prop="timeRange">
+              <el-date-picker
+                v-model="state.queryParams.timeRange"
+                type="datetimerange"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20 search-actions">
+            <div>
+              <el-button type="primary"  icon="ele-Plus" @click="openUploadDialog" v-auth="'sysFile:uploadFile'"> 上传 </el-button>
+            </div>
+            <div>
+              <el-form-item>
+                <el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
+                <el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysFile:page'" plain> 查询 </el-button> 
+              </el-form-item>
+            </div>
+          </el-col>
+        </el-row>
 			</el-form>
 		</el-card>
 

+ 43 - 31
Web/src/views/system/job/index.vue

@@ -2,37 +2,49 @@
 	<div class="sys-job-container">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-				<el-form-item label="作业编号" prop="jobId">
-					<el-input placeholder="作业编号" clearable @keyup.enter="handleQuery" v-model="state.queryParams.jobId" />
-				</el-form-item>
-				<el-form-item label="描述信息" prop="description">
-					<el-input placeholder="描述信息" clearable @keyup.enter="handleQuery" v-model="state.queryParams.description" />
-				</el-form-item>
-				<el-form-item>
-					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-					<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysJob:pageJobDetail'"> 查询 </el-button>
-					<el-button-group style="margin: 0px 12px">
-						<el-tooltip content="增加作业">
-							<el-button icon="ele-CirclePlus" @click="openAddJobDetail" v-auth="'sysJob:addJobDetail'"> </el-button>
-						</el-tooltip>
-						<el-tooltip content="启动所有作业">
-							<el-button icon="ele-VideoPlay" @click="startAllJob" />
-						</el-tooltip>
-						<el-tooltip content="暂停所有作业">
-							<el-button icon="ele-VideoPause" @click="pauseAllJob" />
-						</el-tooltip>
-					</el-button-group>
-					<el-button-group style="margin: 0px 12px 0px 0px">
-						<el-tooltip content="强制唤醒作业调度器">
-							<el-button icon="ele-AlarmClock" @click="cancelSleep" />
-						</el-tooltip>
-						<el-tooltip content="强制触发所有作业持久化">
-							<el-button icon="ele-Connection" @click="persistAll" />
-						</el-tooltip>
-					</el-button-group>
-					<el-button icon="ele-Coin" @click="openJobCluster" plain> 集群控制 </el-button>
-					<el-button icon="ele-Grid" @click="openJobDashboard" plain> 任务看板 </el-button>
-				</el-form-item>
+        <el-row :gutter="35">
+          <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
+            <el-form-item label="作业编号" prop="jobId">
+              <el-input placeholder="作业编号" clearable @keyup.enter="handleQuery" v-model="state.queryParams.jobId" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">  
+            <el-form-item label="描述信息" prop="description">
+              <el-input placeholder="描述信息" clearable @keyup.enter="handleQuery" v-model="state.queryParams.description" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20 search-actions">
+            <div>
+              <el-button-group style="margin: 0px 12px">
+                <el-tooltip content="增加作业">
+                  <el-button icon="ele-CirclePlus" @click="openAddJobDetail" v-auth="'sysJob:addJobDetail'"> </el-button>
+                </el-tooltip>
+                <el-tooltip content="启动所有作业">
+                  <el-button icon="ele-VideoPlay" @click="startAllJob" />
+                </el-tooltip>
+                <el-tooltip content="暂停所有作业">
+                  <el-button icon="ele-VideoPause" @click="pauseAllJob" />
+                </el-tooltip>
+              </el-button-group>
+              <el-button-group style="margin: 0px 12px 0px 0px">
+                <el-tooltip content="强制唤醒作业调度器">
+                  <el-button icon="ele-AlarmClock" @click="cancelSleep" />
+                </el-tooltip>
+                <el-tooltip content="强制触发所有作业持久化">
+                  <el-button icon="ele-Connection" @click="persistAll" />
+                </el-tooltip>
+              </el-button-group>
+              <el-button icon="ele-Coin" @click="openJobCluster" plain> 集群控制 </el-button>
+              <el-button icon="ele-Grid" @click="openJobDashboard" plain> 任务看板 </el-button>
+            </div>
+            <div>
+              <el-form-item>
+                <el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
+                <el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysJob:pageJobDetail'" plain> 查询 </el-button>
+              </el-form-item>
+            </div>
+          </el-col>
+        </el-row>
 			</el-form>
 		</el-card>
 

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

@@ -2,17 +2,29 @@
 	<div class="sys-difflog-container">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-				<el-form-item label="开始时间" prop="name">
-					<el-date-picker v-model="state.queryParams.startTime" type="datetime" placeholder="开始时间" :shortcuts="shortcuts" />
-				</el-form-item>
-				<el-form-item label="结束时间" prop="code">
-					<el-date-picker v-model="state.queryParams.endTime" type="datetime" placeholder="结束时间" :shortcuts="shortcuts" />
-				</el-form-item>
-				<el-form-item>
-					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-					<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysDifflog:page'"> 查询 </el-button>
-					<el-button icon="ele-DeleteFilled" type="danger" @click="clearLog" v-auth="'sysDifflog:clear'"> 清空 </el-button>
-				</el-form-item>
+        <el-row :gutter="35">
+          <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
+            <el-form-item label="开始时间" prop="name">
+              <el-date-picker v-model="state.queryParams.startTime" type="datetime" placeholder="开始时间" :shortcuts="shortcuts" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">  
+            <el-form-item label="结束时间" prop="code">
+              <el-date-picker v-model="state.queryParams.endTime" type="datetime" placeholder="结束时间" :shortcuts="shortcuts" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20 search-actions">
+            <div>
+              <el-button icon="ele-DeleteFilled" type="danger" @click="clearLog" v-auth="'sysDifflog:clear'"> 清空 </el-button>
+            </div>
+            <div>
+              <el-form-item>
+                <el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
+                <el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysDifflog:page'" plain> 查询 </el-button> 
+              </el-form-item>
+            </div>
+          </el-col>
+        </el-row>
 			</el-form>
 		</el-card>
 

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

@@ -2,18 +2,30 @@
 	<div class="sys-oplog-container" v-loading="state.loading">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-				<el-form-item label="开始时间" prop="name">
-					<el-date-picker v-model="state.queryParams.startTime" type="datetime" placeholder="开始时间" :shortcuts="shortcuts" />
-				</el-form-item>
-				<el-form-item label="结束时间" prop="code">
-					<el-date-picker v-model="state.queryParams.endTime" type="datetime" placeholder="结束时间" :shortcuts="shortcuts" />
-				</el-form-item>
-				<el-form-item>
-					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-					<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysOplog:page'"> 查询 </el-button>
-					<el-button icon="ele-DeleteFilled" type="danger" @click="clearLog" v-auth="'sysOplog:clear'"> 清空 </el-button>
-					<el-button icon="ele-FolderOpened" @click="exportLog" v-auth="'sysOplog:export'"> 导出 </el-button>
-				</el-form-item>
+        <el-row :gutter="35">
+          <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
+            <el-form-item label="开始时间" prop="name">
+              <el-date-picker v-model="state.queryParams.startTime" type="datetime" placeholder="开始时间" :shortcuts="shortcuts" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">  
+            <el-form-item label="结束时间" prop="code">
+              <el-date-picker v-model="state.queryParams.endTime" type="datetime" placeholder="结束时间" :shortcuts="shortcuts" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20 search-actions">
+            <div>
+              <el-button icon="ele-DeleteFilled" type="danger" @click="clearLog" v-auth="'sysOplog:clear'"> 清空 </el-button>
+              <el-button icon="ele-FolderOpened" @click="exportLog" v-auth="'sysOplog:export'"> 导出 </el-button>
+            </div>
+            <div>
+              <el-form-item>
+                <el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
+                <el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysOplog:page'" plain> 查询 </el-button> 
+              </el-form-item>
+            </div>
+          </el-col>
+        </el-row>  
 			</el-form>
 		</el-card>
 

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

@@ -2,17 +2,29 @@
 	<div class="sys-vislog-container">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-				<el-form-item label="开始时间" prop="name">
-					<el-date-picker v-model="state.queryParams.startTime" type="datetime" placeholder="开始时间" :shortcuts="shortcuts" />
-				</el-form-item>
-				<el-form-item label="结束时间" prop="code">
-					<el-date-picker v-model="state.queryParams.endTime" type="datetime" placeholder="结束时间" :shortcuts="shortcuts" />
-				</el-form-item>
-				<el-form-item>
-					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-					<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysVislog:page'"> 查询 </el-button>
-					<el-button icon="ele-DeleteFilled" type="danger" @click="clearLog" v-auth="'sysVislog:clear'"> 清空 </el-button>
-				</el-form-item>
+        <el-row :gutter="35">
+          <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
+            <el-form-item label="开始时间" prop="name">
+              <el-date-picker v-model="state.queryParams.startTime" type="datetime" placeholder="开始时间" :shortcuts="shortcuts" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">  
+            <el-form-item label="结束时间" prop="code">
+              <el-date-picker v-model="state.queryParams.endTime" type="datetime" placeholder="结束时间" :shortcuts="shortcuts" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20 search-actions">
+            <div>
+              <el-button icon="ele-DeleteFilled" type="danger" @click="clearLog" v-auth="'sysVislog:clear'"> 清空 </el-button>
+            </div>
+            <div>
+              <el-form-item>
+                <el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
+                <el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysVislog:page'" plain> 查询 </el-button> 
+              </el-form-item>
+            </div>
+          </el-col>
+        </el-row>
 			</el-form>
 		</el-card>
 

+ 27 - 15
Web/src/views/system/menu/index.vue

@@ -2,21 +2,33 @@
 	<div class="sys-menu-container">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-				<el-form-item label="菜单名称" prop="title">
-					<el-input placeholder="菜单名称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.title" />
-				</el-form-item>
-				<el-form-item label="类型" prop="type">
-					<el-select v-model="state.queryParams.type" placeholder="类型" clearable>
-						<el-option label="目录" :value="1" />
-						<el-option label="菜单" :value="2" />
-						<el-option label="按钮" :value="3" />
-					</el-select>
-				</el-form-item>
-				<el-form-item>
-					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-					<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysMenu:list'"> 查询 </el-button>
-					<el-button icon="ele-Plus" @click="openAddMenu" v-auth="'sysMenu:add'"> 新增 </el-button>
-				</el-form-item>
+        <el-row :gutter="35">
+          <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
+            <el-form-item label="菜单名称" prop="title">
+              <el-input placeholder="菜单名称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.title" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">  
+            <el-form-item label="类型" prop="type">
+              <el-select v-model="state.queryParams.type" placeholder="类型" clearable>
+                <el-option label="目录" :value="1" />
+                <el-option label="菜单" :value="2" />
+                <el-option label="按钮" :value="3" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20 search-actions">
+            <div>
+              <el-button type="primary"  icon="ele-Plus" @click="openAddMenu" v-auth="'sysMenu:add'"> 新增 </el-button>
+            </div>
+            <div>
+              <el-form-item>
+                <el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
+                <el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysMenu:list'" plain> 查询 </el-button> 
+              </el-form-item>
+            </div>
+          </el-col>
+        </el-row>
 			</el-form>
 		</el-card>
 

+ 26 - 14
Web/src/views/system/notice/index.vue

@@ -2,20 +2,32 @@
 	<div class="sys-notice-container">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-				<el-form-item label="标题" prop="title">
-					<el-input placeholder="标题" clearable @keyup.enter="handleQuery" v-model="state.queryParams.title" />
-				</el-form-item>
-				<el-form-item label="类型" prop="type">
-					<el-select v-model="state.queryParams.type" placeholder="类型" clearable style="width: 100%">
-						<el-option label="通知" :value="1" />
-						<el-option label="公告" :value="2" />
-					</el-select>
-				</el-form-item>
-				<el-form-item>
-					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-					<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysNotice:page'"> 查询 </el-button>
-					<el-button icon="ele-Plus" @click="openAddNotice" v-auth="'sysNotice:add'"> 新增 </el-button>
-				</el-form-item>
+        <el-row :gutter="35">
+          <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">   
+            <el-form-item label="标题" prop="title">
+              <el-input placeholder="标题" clearable @keyup.enter="handleQuery" v-model="state.queryParams.title" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">  
+            <el-form-item label="类型" prop="type">
+              <el-select v-model="state.queryParams.type" placeholder="类型" clearable style="width: 100%">
+                <el-option label="通知" :value="1" />
+                <el-option label="公告" :value="2" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20 search-actions">
+            <div>
+              <el-button type="primary"  icon="ele-Plus" @click="openAddNotice" v-auth="'sysNotice:add'"> 新增 </el-button>
+            </div>
+            <div>
+              <el-form-item>
+                <el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
+                <el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysNotice:page'"> 查询 </el-button> 
+              </el-form-item>
+            </div>
+          </el-col>
+        </el-row>  
 			</el-form>
 		</el-card>
 

+ 23 - 11
Web/src/views/system/org/index.vue

@@ -8,17 +8,29 @@
 			<el-col :span="20" :xs="24">
 				<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 					<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-						<el-form-item label="机构名称" prop="name">
-							<el-input placeholder="机构名称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.name" />
-						</el-form-item>
-						<el-form-item label="机构编码" prop="code">
-							<el-input placeholder="机构编码" clearable @keyup.enter="handleQuery" v-model="state.queryParams.code" />
-						</el-form-item>
-						<el-form-item>
-							<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-							<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysOrg:list'"> 查询 </el-button>
-							<el-button icon="ele-Plus" @click="openAddOrg" v-auth="'sysOrg:add'"> 新增 </el-button>
-						</el-form-item>
+            <el-row :gutter="35">
+              <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">   
+                <el-form-item label="机构名称" prop="name">
+                  <el-input placeholder="机构名称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.name" />
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">  
+                <el-form-item label="机构编码" prop="code">
+                  <el-input placeholder="机构编码" clearable @keyup.enter="handleQuery" v-model="state.queryParams.code" />
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20 search-actions">
+                <div>
+                  <el-button type="primary"  icon="ele-Plus" @click="openAddOrg" v-auth="'sysOrg:add'"> 新增 </el-button>
+                </div>
+                <div>
+                  <el-form-item>
+                    <el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
+                    <el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysOrg:list'" plain> 查询 </el-button> 
+                  </el-form-item>
+                </div>
+              </el-col>
+            </el-row>
 					</el-form>
 				</el-card>
 

+ 23 - 11
Web/src/views/system/pos/index.vue

@@ -2,17 +2,29 @@
 	<div class="sys-pos-container">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-				<el-form-item label="职位名称" prop="name">
-					<el-input placeholder="职位名称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.name" />
-				</el-form-item>
-				<el-form-item label="职位编码" prop="code">
-					<el-input placeholder="职位编码" clearable @keyup.enter="handleQuery" v-model="state.queryParams.code" />
-				</el-form-item>
-				<el-form-item>
-					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-					<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysPos:list'"> 查询 </el-button>
-					<el-button icon="ele-Plus" @click="openAddPos" v-auth="'sysPos:add'"> 新增 </el-button>
-				</el-form-item>
+        <el-row :gutter="35">
+          <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">   
+            <el-form-item label="职位名称" prop="name">
+              <el-input placeholder="职位名称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.name" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">  
+            <el-form-item label="职位编码" prop="code">
+              <el-input placeholder="职位编码" clearable @keyup.enter="handleQuery" v-model="state.queryParams.code" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20 search-actions">
+            <div>
+              <el-button type="primary"  icon="ele-Plus" @click="openAddPos" v-auth="'sysPos:add'"> 新增 </el-button>
+            </div>
+            <div>
+              <el-form-item>
+                <el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
+                <el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysPos:list'" plain> 查询 </el-button> 
+              </el-form-item>
+            </div>
+          </el-col>       
+        </el-row>
 			</el-form>
 		</el-card>
 

+ 24 - 12
Web/src/views/system/region/index.vue

@@ -8,18 +8,30 @@
 			<el-col :span="18" :xs="24">
 				<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 					<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-						<el-form-item label="行政名称" prop="name">
-							<el-input placeholder="行政名称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.name" />
-						</el-form-item>
-						<el-form-item label="行政代码" prop="code">
-							<el-input placeholder="行政代码" clearable @keyup.enter="handleQuery" v-model="state.queryParams.code" />
-						</el-form-item>
-						<el-form-item>
-							<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-							<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysRegion:page'"> 查询 </el-button>
-							<el-button icon="ele-Plus" @click="openAddRegion" v-auth="'sysRegion:add'"> 新增 </el-button>
-							<el-button type="danger" icon="ele-Lightning" @click="handlSync" v-auth="'sysRegion:sync'"> 同步国家统计局 </el-button>
-						</el-form-item>
+            <el-row :gutter="35">
+              <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
+                <el-form-item label="行政名称" prop="name">
+                  <el-input placeholder="行政名称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.name" />
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
+                <el-form-item label="行政代码" prop="code">
+                  <el-input placeholder="行政代码" clearable @keyup.enter="handleQuery" v-model="state.queryParams.code" />
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20 search-actions">
+                <div>
+                  <el-button type="primary"  icon="ele-Plus" @click="openAddRegion" v-auth="'sysRegion:add'"> 新增 </el-button>
+                    <el-button type="danger" icon="ele-Lightning" @click="handlSync" v-auth="'sysRegion:sync'"> 同步国家统计局 </el-button>
+                </div>
+                <div>
+                  <el-form-item>
+                    <el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
+                    <el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysRegion:page'" plain> 查询 </el-button> 
+                  </el-form-item>
+                </div>
+              </el-col>
+            </el-row>
 					</el-form>
 				</el-card>
 

+ 23 - 11
Web/src/views/system/role/index.vue

@@ -2,17 +2,29 @@
 	<div class="sys-role-container">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-				<el-form-item label="角色名称" prop="name">
-					<el-input placeholder="角色名称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.name" />
-				</el-form-item>
-				<el-form-item label="角色编码" prop="code">
-					<el-input placeholder="角色编码" clearable @keyup.enter="handleQuery" v-model="state.queryParams.code" />
-				</el-form-item>
-				<el-form-item>
-					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-					<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysRole:page'"> 查询 </el-button>
-					<el-button icon="ele-Plus" @click="openAddRole" v-auth="'sysRole:add'"> 新增 </el-button>
-				</el-form-item>
+        <el-row :gutter="35">
+          <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">   
+            <el-form-item label="角色名称" prop="name">
+              <el-input placeholder="角色名称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.name" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">   
+            <el-form-item label="角色编码" prop="code">
+              <el-input placeholder="角色编码" clearable @keyup.enter="handleQuery" v-model="state.queryParams.code" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20 search-actions">
+            <div>
+              <el-button type="primary"  icon="ele-Plus" @click="openAddRole" v-auth="'sysRole:add'"> 新增 </el-button>
+            </div>
+            <div>
+              <el-form-item>
+                <el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
+                <el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysRole:page'" plain> 查询 </el-button>              
+              </el-form-item>
+            </div>
+          </el-col> 
+        </el-row>
 			</el-form>
 		</el-card>
 

+ 23 - 11
Web/src/views/system/tenant/index.vue

@@ -2,17 +2,29 @@
 	<div class="sys-tenant-container">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-				<el-form-item label="租户名称" prop="name">
-					<el-input placeholder="租户名称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.name" />
-				</el-form-item>
-				<el-form-item label="联系电话" prop="phone">
-					<el-input placeholder="联系电话" clearable @keyup.enter="handleQuery" v-model="state.queryParams.phone" />
-				</el-form-item>
-				<el-form-item>
-					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-					<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysTenant:page'"> 查询 </el-button>
-					<el-button icon="ele-Plus" @click="openAddTenant" v-auth="'sysTenant:add'"> 新增 </el-button>
-				</el-form-item>
+        <el-row :gutter="35">
+          <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
+            <el-form-item label="租户名称" prop="name">
+              <el-input placeholder="租户名称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.name" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">  
+            <el-form-item label="联系电话" prop="phone">
+              <el-input placeholder="联系电话" clearable @keyup.enter="handleQuery" v-model="state.queryParams.phone" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20 search-actions">
+            <div>
+              <el-button type="primary"  icon="ele-Plus" @click="openAddTenant" v-auth="'sysTenant:add'"> 新增 </el-button>
+            </div>
+            <div>
+              <el-form-item>
+                <el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
+                <el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysTenant:page'" plain> 查询 </el-button> 
+              </el-form-item>
+            </div>
+          </el-col>
+        </el-row>
 			</el-form>
 		</el-card>
 

+ 293 - 181
Web/src/views/system/user/index.vue

@@ -1,244 +1,356 @@
 <template>
-	<div class="sys-user-container">
-		<el-row :gutter="8" style="width: 100%">
-			<el-col :span="4" :xs="24">
-				<OrgTree ref="orgTreeRef" @node-click="nodeClick" />
-			</el-col>
-
-			<el-col :span="20" :xs="24">
-				<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
-					<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-						<el-form-item label="账号" prop="account">
-							<el-input placeholder="账号" clearable @keyup.enter="handleQuery" v-model="state.queryParams.account" />
-						</el-form-item>
-						<!-- <el-form-item label="姓名" prop="realName">
+  <div class="sys-user-container">
+    <el-row :gutter="8" style="width: 100%">
+      <el-col :span="4" :xs="24">
+        <OrgTree ref="orgTreeRef" @node-click="nodeClick" />
+      </el-col>
+
+      <el-col :span="20" :xs="24">
+        <el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
+          <el-form :model="state.queryParams" ref="queryForm" :inline="true">
+            <el-row :gutter="35">
+              <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
+                <el-form-item label="账号" prop="account">
+                  <el-input
+                    placeholder="账号"
+                    clearable
+                    @keyup.enter="handleQuery"
+                    v-model="state.queryParams.account"
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-form-item label="姓名" prop="realName">
 							<el-input placeholder="姓名" clearable @keyup.enter="handleQuery" v-model="queryParams.realName" />
 						</el-form-item> -->
-						<el-form-item label="手机号码" prop="phone">
-							<el-input placeholder="手机号码" clearable @keyup.enter="handleQuery" v-model="state.queryParams.phone" />
-						</el-form-item>
-						<el-form-item>
-							<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-							<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysUser:page'"> 查询 </el-button>
-							<el-button icon="ele-Plus" @click="openAddUser" v-auth="'sysUser:add'"> 新增 </el-button>
-						</el-form-item>
-					</el-form>
-				</el-card>
-
-				<el-card shadow="hover" style="margin-top: 8px">
-					<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 prop="account" label="账号" width="120" fixed show-overflow-tooltip />
-						<el-table-column prop="nickName" label="昵称" width="120" show-overflow-tooltip />
-						<el-table-column label="头像" width="80" align="center" show-overflow-tooltip>
-							<template #default="scope">
-								<el-avatar src="" size="small">{{ scope.row.nickName?.slice(0, 1) }} </el-avatar>
-							</template>
-						</el-table-column>
-						<el-table-column prop="realName" label="姓名" width="120" show-overflow-tooltip />
-						<el-table-column label="出生日期" width="100" align="center" show-overflow-tooltip>
-							<template #default="scope">
-								{{ formatDate(new Date(scope.row.birthday), 'YYYY-mm-dd') }}
-							</template>
-						</el-table-column>
-						<el-table-column label="性别" width="70" align="center" show-overflow-tooltip>
-							<template #default="scope">
-								<el-tag type="success" v-if="scope.row.sex === 1"> 男 </el-tag>
-								<el-tag type="danger" v-else> 女 </el-tag>
-							</template>
-						</el-table-column>
-						<el-table-column prop="phone" label="手机号码" width="120" align="center" show-overflow-tooltip />
-						<el-table-column label="状态" width="70" align="center" show-overflow-tooltip>
-							<template #default="scope">
-								<el-switch v-model="scope.row.status" :active-value="1" :inactive-value="2" size="small" @change="changeStatus(scope.row)" v-auth="'sysUser:setStatus'" />
-							</template>
-						</el-table-column>
-						<el-table-column prop="orderNo" label="排序" width="70" align="center" show-overflow-tooltip />
-						<el-table-column prop="createTime" label="修改时间" width="160" show-overflow-tooltip />
-						<el-table-column prop="remark" label="备注" show-overflow-tooltip />
-						<el-table-column label="操作" width="110" align="center" fixed="right" show-overflow-tooltip>
-							<template #default="scope">
-								<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditUser(scope.row)" v-auth="'sysUser:update'"> 编辑 </el-button>
-								<el-dropdown>
-									<el-button icon="ele-MoreFilled" size="small" text type="primary" style="padding-left: 12px" />
-									<template #dropdown>
-										<el-dropdown-menu>
-											<el-dropdown-item icon="ele-RefreshLeft" @click="resetUserPwd(scope.row)" :disabled="!auth('sysUser:resetPwd')"> 重置密码 </el-dropdown-item>
-											<el-dropdown-item icon="ele-Delete" @click="delUser(scope.row)" divided :disabled="!auth('sysUser:delete')"> 删除账号 </el-dropdown-item>
-										</el-dropdown-menu>
-									</template>
-								</el-dropdown>
-							</template>
-						</el-table-column>
-					</el-table>
-					<el-pagination
-						v-model:currentPage="state.tableParams.page"
-						v-model:page-size="state.tableParams.pageSize"
-						:total="state.tableParams.total"
-						:page-sizes="[10, 20, 50, 100]"
-						small
-						background
-						@size-change="handleSizeChange"
-						@current-change="handleCurrentChange"
-						layout="total, sizes, prev, pager, next, jumper"
-					/>
-				</el-card>
-			</el-col>
-		</el-row>
-		<EditUser ref="editUserRef" :title="state.editUserTitle" :orgData="state.orgTreeData" />
-	</div>
+              <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
+                <el-form-item label="手机号码" prop="phone">
+                  <el-input
+                    placeholder="手机号码"
+                    clearable
+                    @keyup.enter="handleQuery"
+                    v-model="state.queryParams.phone"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20 search-actions">
+                <div>
+                  <el-button type="primary" icon="ele-Plus" @click="openAddUser" v-auth="'sysUser:add'" > 新增 </el-button>
+                </div>
+                <div>
+                  <el-form-item>
+                    <el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
+                    <el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysUser:page'" plain > 查询 </el-button>
+                  </el-form-item>
+                </div>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-card>
+
+        <el-card shadow="hover" style="margin-top: 8px">
+          <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
+              prop="account"
+              label="账号"
+              width="120"
+              fixed
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="nickName"
+              label="昵称"
+              width="120"
+              show-overflow-tooltip
+            />
+            <el-table-column label="头像" width="80" align="center" show-overflow-tooltip>
+              <template #default="scope">
+                <el-avatar src="" size="small"
+                  >{{ scope.row.nickName?.slice(0, 1) }}
+                </el-avatar>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="realName"
+              label="姓名"
+              width="120"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              label="出生日期"
+              width="100"
+              align="center"
+              show-overflow-tooltip
+            >
+              <template #default="scope">
+                {{ formatDate(new Date(scope.row.birthday), "YYYY-mm-dd") }}
+              </template>
+            </el-table-column>
+            <el-table-column label="性别" width="70" align="center" show-overflow-tooltip>
+              <template #default="scope">
+                <el-tag type="success" v-if="scope.row.sex === 1"> 男 </el-tag>
+                <el-tag type="danger" v-else> 女 </el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="phone"
+              label="手机号码"
+              width="120"
+              align="center"
+              show-overflow-tooltip
+            />
+            <el-table-column label="状态" width="70" align="center" show-overflow-tooltip>
+              <template #default="scope">
+                <el-switch
+                  v-model="scope.row.status"
+                  :active-value="1"
+                  :inactive-value="2"
+                  size="small"
+                  @change="changeStatus(scope.row)"
+                  v-auth="'sysUser:setStatus'"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="orderNo"
+              label="排序"
+              width="70"
+              align="center"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="createTime"
+              label="修改时间"
+              width="160"
+              show-overflow-tooltip
+            />
+            <el-table-column prop="remark" label="备注" show-overflow-tooltip />
+            <el-table-column
+              label="操作"
+              width="110"
+              align="center"
+              fixed="right"
+              show-overflow-tooltip
+            >
+              <template #default="scope">
+                <el-button
+                  icon="ele-Edit"
+                  size="small"
+                  text
+                  type="primary"
+                  @click="openEditUser(scope.row)"
+                  v-auth="'sysUser:update'"
+                >
+                  编辑
+                </el-button>
+                <el-dropdown>
+                  <el-button
+                    icon="ele-MoreFilled"
+                    size="small"
+                    text
+                    type="primary"
+                    style="padding-left: 12px"
+                  />
+                  <template #dropdown>
+                    <el-dropdown-menu>
+                      <el-dropdown-item
+                        icon="ele-RefreshLeft"
+                        @click="resetUserPwd(scope.row)"
+                        :disabled="!auth('sysUser:resetPwd')"
+                      >
+                        重置密码
+                      </el-dropdown-item>
+                      <el-dropdown-item
+                        icon="ele-Delete"
+                        @click="delUser(scope.row)"
+                        divided
+                        :disabled="!auth('sysUser:delete')"
+                      >
+                        删除账号
+                      </el-dropdown-item>
+                    </el-dropdown-menu>
+                  </template>
+                </el-dropdown>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-pagination
+            v-model:currentPage="state.tableParams.page"
+            v-model:page-size="state.tableParams.pageSize"
+            :total="state.tableParams.total"
+            :page-sizes="[10, 20, 50, 100]"
+            small
+            background
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            layout="total, sizes, prev, pager, next, jumper"
+          />
+        </el-card>
+      </el-col>
+    </el-row>
+    <EditUser
+      ref="editUserRef"
+      :title="state.editUserTitle"
+      :orgData="state.orgTreeData"
+    />
+  </div>
 </template>
 
 <script lang="ts" setup name="sysUser">
-import { onMounted, onUnmounted, reactive, ref } from 'vue';
-import { ElMessageBox, ElMessage } from 'element-plus';
-import { formatDate } from '/@/utils/formatTime';
-import { auth } from '/@/utils/authFunction';
-import mittBus from '/@/utils/mitt';
-import OrgTree from '/@/views/system/org/component/orgTree.vue';
-import EditUser from '/@/views/system/user/component/editUser.vue';
-
-import { getAPI } from '/@/utils/axios-utils';
-import { SysUserApi, SysOrgApi } from '/@/api-services/api';
-import { SysUser, SysOrg } from '/@/api-services/models';
+import { onMounted, onUnmounted, reactive, ref } from "vue";
+import { ElMessageBox, ElMessage } from "element-plus";
+import { formatDate } from "/@/utils/formatTime";
+import { auth } from "/@/utils/authFunction";
+import mittBus from "/@/utils/mitt";
+import OrgTree from "/@/views/system/org/component/orgTree.vue";
+import EditUser from "/@/views/system/user/component/editUser.vue";
+
+import { getAPI } from "/@/utils/axios-utils";
+import { SysUserApi, SysOrgApi } from "/@/api-services/api";
+import { SysUser, SysOrg } from "/@/api-services/models";
 
 const orgTreeRef = ref<InstanceType<typeof OrgTree>>();
 const editUserRef = ref<InstanceType<typeof EditUser>>();
 const state = reactive({
-	loading: false,
-	userData: [] as Array<SysUser>,
-	orgTreeData: [] as Array<SysOrg>,
-	queryParams: {
-		orgId: -1,
-		account: undefined,
-		realName: undefined,
-		phone: undefined,
-	},
-	tableParams: {
-		page: 1,
-		pageSize: 10,
-		total: 0 as any,
-	},
-	editUserTitle: '',
+  loading: false,
+  userData: [] as Array<SysUser>,
+  orgTreeData: [] as Array<SysOrg>,
+  queryParams: {
+    orgId: -1,
+    account: undefined,
+    realName: undefined,
+    phone: undefined,
+  },
+  tableParams: {
+    page: 1,
+    pageSize: 10,
+    total: 0 as any,
+  },
+  editUserTitle: "",
 });
 
 onMounted(async () => {
-	loadOrgData();
-	handleQuery();
+  loadOrgData();
+  handleQuery();
 
-	mittBus.on('submitRefresh', () => {
-		handleQuery();
-	});
+  mittBus.on("submitRefresh", () => {
+    handleQuery();
+  });
 });
 
 onUnmounted(() => {
-	mittBus.off('submitRefresh');
+  mittBus.off("submitRefresh");
 });
 
 // 查询机构数据
 const loadOrgData = async () => {
-	state.loading = true;
-	var res = await getAPI(SysOrgApi).apiSysOrgListGet(0);
-	state.orgTreeData = res.data.result ?? [];
-	state.loading = false;
+  state.loading = true;
+  var res = await getAPI(SysOrgApi).apiSysOrgListGet(0);
+  state.orgTreeData = res.data.result ?? [];
+  state.loading = false;
 };
 
 // 查询操作
 const handleQuery = async () => {
-	state.loading = true;
-	var res = await getAPI(SysUserApi).apiSysUserPageGet(
-		state.queryParams.account,
-		state.queryParams.realName,
-		state.queryParams.phone,
-		state.queryParams.orgId,
-		state.tableParams.page,
-		state.tableParams.pageSize
-	);
-	state.userData = res.data.result?.items ?? [];
-	state.tableParams.total = res.data.result?.total;
-	state.loading = false;
+  state.loading = true;
+  var res = await getAPI(SysUserApi).apiSysUserPageGet(
+    state.queryParams.account,
+    state.queryParams.realName,
+    state.queryParams.phone,
+    state.queryParams.orgId,
+    state.tableParams.page,
+    state.tableParams.pageSize
+  );
+  state.userData = res.data.result?.items ?? [];
+  state.tableParams.total = res.data.result?.total;
+  state.loading = false;
 };
 
 // 重置操作
 const resetQuery = () => {
-	state.queryParams.orgId = -1;
-	state.queryParams.account = undefined;
-	state.queryParams.realName = undefined;
-	state.queryParams.phone = undefined;
-	handleQuery();
+  state.queryParams.orgId = -1;
+  state.queryParams.account = undefined;
+  state.queryParams.realName = undefined;
+  state.queryParams.phone = undefined;
+  handleQuery();
 };
 
 // 打开新增页面
 const openAddUser = () => {
-	state.editUserTitle = '添加账号';
-	editUserRef.value?.openDialog({});
+  state.editUserTitle = "添加账号";
+  editUserRef.value?.openDialog({});
 };
 
 // 打开编辑页面
 const openEditUser = (row: any) => {
-	state.editUserTitle = '编辑账号';
-	editUserRef.value?.openDialog(row);
+  state.editUserTitle = "编辑账号";
+  editUserRef.value?.openDialog(row);
 };
 
 // 删除
 const delUser = (row: any) => {
-	ElMessageBox.confirm(`确定删除账号:【${row.account}】?`, '提示', {
-		confirmButtonText: '确定',
-		cancelButtonText: '取消',
-		type: 'warning',
-	})
-		.then(async () => {
-			await getAPI(SysUserApi).apiSysUserDeletePost({ id: row.id });
-			handleQuery();
-			ElMessage.success('删除成功');
-		})
-		.catch(() => {});
+  ElMessageBox.confirm(`确定删除账号:【${row.account}】?`, "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  })
+    .then(async () => {
+      await getAPI(SysUserApi).apiSysUserDeletePost({ id: row.id });
+      handleQuery();
+      ElMessage.success("删除成功");
+    })
+    .catch(() => {});
 };
 
 // 改变页面容量
 const handleSizeChange = (val: number) => {
-	state.tableParams.pageSize = val;
-	handleQuery();
+  state.tableParams.pageSize = val;
+  handleQuery();
 };
 
 // 改变页码序号
 const handleCurrentChange = (val: number) => {
-	state.tableParams.page = val;
-	handleQuery();
+  state.tableParams.page = val;
+  handleQuery();
 };
 
 // 修改状态
 const changeStatus = (row: any) => {
-	getAPI(SysUserApi)
-		.apiSysUserSetStatusPost({ id: row.id, status: row.status })
-		.then(() => {
-			ElMessage.success('账号状态设置成功');
-		})
-		.catch(() => {
-			row.status = row.status == 1 ? 2 : 1;
-		});
+  getAPI(SysUserApi)
+    .apiSysUserSetStatusPost({ id: row.id, status: row.status })
+    .then(() => {
+      ElMessage.success("账号状态设置成功");
+    })
+    .catch(() => {
+      row.status = row.status == 1 ? 2 : 1;
+    });
 };
 
 // 重置密码
 const resetUserPwd = async (row: any) => {
-	ElMessageBox.confirm(`确定重置密码:【${row.account}】?`, '提示', {
-		confirmButtonText: '确定',
-		cancelButtonText: '取消',
-		type: 'warning',
-	})
-		.then(async () => {
-			await getAPI(SysUserApi).apiSysUserResetPwdPost({ id: row.id });
-			ElMessage.success('密码重置成功:123456');
-		})
-		.catch(() => {});
+  ElMessageBox.confirm(`确定重置密码:【${row.account}】?`, "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  })
+    .then(async () => {
+      await getAPI(SysUserApi).apiSysUserResetPwdPost({ id: row.id });
+      ElMessage.success("密码重置成功:123456");
+    })
+    .catch(() => {});
 };
 
 // 树组件点击
 const nodeClick = async (node: any) => {
-	state.queryParams.orgId = node.id;
-	state.queryParams.account = undefined;
-	state.queryParams.realName = undefined;
-	state.queryParams.phone = undefined;
-	handleQuery();
+  state.queryParams.orgId = node.id;
+  state.queryParams.account = undefined;
+  state.queryParams.realName = undefined;
+  state.queryParams.phone = undefined;
+  handleQuery();
 };
 </script>

+ 22 - 10
Web/src/views/system/weChatUser/index.vue

@@ -2,16 +2,28 @@
 	<div class="weChatUser-container">
 		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
 			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-				<el-form-item label="微信昵称" prop="nickName">
-					<el-input placeholder="微信昵称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.nickName" />
-				</el-form-item>
-				<el-form-item label="手机号码" prop="mobile">
-					<el-input placeholder="手机号码" clearable @keyup.enter="handleQuery" v-model="state.queryParams.mobile" />
-				</el-form-item>
-				<el-form-item>
-					<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-					<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysWechatUser:page'"> 查询 </el-button>
-				</el-form-item>
+        <el-row :gutter="35">
+          <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">   
+            <el-form-item label="微信昵称" prop="nickName">
+              <el-input placeholder="微信昵称" clearable @keyup.enter="handleQuery" v-model="state.queryParams.nickName" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6">  
+            <el-form-item label="手机号码" prop="mobile">
+              <el-input placeholder="手机号码" clearable @keyup.enter="handleQuery" v-model="state.queryParams.mobile" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20 search-actions">
+            <div> 
+            </div>
+            <div>
+              <el-form-item>
+                <el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
+                <el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysWechatUser:page'"> 查询 </el-button>
+              </el-form-item>
+            </div>            
+          </el-col>
+        </el-row>  
 			</el-form>
 		</el-card>