查询样式调整

ygtx-ui/src/assets/styles/index.scss

@@ -224,3 +224,12 @@ aside {
 // .el-scrollbar__bar.is-vertical {
 //   display: block !important;
 // }
+.el-form--inline.el-form--label-top{
+  display: grid;
+  grid-template-columns: repeat(4, 1fr); /* 创建4列，每列平分空间 */
+  gap: 3px; /* 设置列与列之间的间隔 */
+}
+
+.el-form--inline.el-form--label-top .el-form-item{
+  margin-right: 3px;
+}

ygtx-ui/src/components/RightToolbar/index.vue

@@ -4,7 +4,7 @@
       <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top" v-if="search">
         <el-button circle icon="Search" @click="toggleSearch()" />
       </el-tooltip>
-      <el-tooltip class="item" effect="dark" content="刷新" placement="top">
+      <el-tooltip class="item" effect="dark" content="刷新" placement="top" v-if="false">
         <el-button circle icon="Refresh" @click="refresh()" />
       </el-tooltip>
       <el-tooltip class="item" effect="dark" content="显隐列" placement="top" v-if="Object.keys(columns).length > 0">

ygtx-ui/src/layout/components/Sidebar/Logo.vue

@@ -64,6 +64,7 @@ const getLogoTextColor = computed(() => {
   background: v-bind(getLogoBackground);
   text-align: center;
   overflow: hidden;
+  box-shadow: 0 1px 14px rgba(0, 21, 41, 0.08);
 
   & .sidebar-logo-link {
     height: 100%;

ygtx-ui/src/layout/components/Sidebar/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div :class="{ 'has-logo': showLogo }" class="sidebar-container">
-    <logo v-if="showLogo" :collapse="isCollapse" />
+    <logo v-if="showLogo" :collapse="isCollapse" style="margin-bottom: 2px;"/>
     <el-scrollbar wrap-class="scrollbar-wrapper">
       <el-menu
         :default-active="activeMenu"

ygtx-ui/src/views/monitor/logininfor/index.vue

@@ -1,30 +1,27 @@
 <template>
    <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-         <el-form-item label="登录地址" prop="ipaddr">
+      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-position="top">
+         <el-form-item label="登录地址" prop="ipaddr" label-position="top">
             <el-input
                v-model="queryParams.ipaddr"
                placeholder="请输入登录地址"
                clearable
-               style="width: 240px;"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
-         <el-form-item label="用户名称" prop="userName">
+         <el-form-item label="用户名称" prop="userName" label-position="top">
             <el-input
                v-model="queryParams.userName"
                placeholder="请输入用户名称"
                clearable
-               style="width: 240px;"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
-         <el-form-item label="状态" prop="status">
+         <el-form-item label="状态" prop="status" label-position="top">
             <el-select
                v-model="queryParams.status"
                placeholder="登录状态"
                clearable
-               style="width: 240px"
             >
                <el-option
                   v-for="dict in sys_common_status"
@@ -34,7 +31,7 @@
                />
             </el-select>
          </el-form-item>
-         <el-form-item label="登录时间" style="width: 308px">
+         <el-form-item label="登录时间" label-position="top">
             <el-date-picker
                v-model="dateRange"
                value-format="YYYY-MM-DD HH:mm:ss"
@@ -45,12 +42,11 @@
                :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
             ></el-date-picker>
          </el-form-item>
-         <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-         </el-form-item>
       </el-form>
-
+      <div style="float: right;">
+          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+      </div>
       <el-row :gutter="10" class="mb8">
          <el-col :span="1.5">
             <el-button
@@ -90,20 +86,20 @@
       </el-row>
 
       <el-table ref="logininforRef" v-loading="loading" :data="logininforList" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-         <el-table-column type="selection" width="55" align="center" />
-         <el-table-column label="访问编号" align="center" prop="infoId" />
-         <el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
-         <el-table-column label="地址" align="center" prop="ipaddr" :show-overflow-tooltip="true" />
-         <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
-         <el-table-column label="操作系统" align="center" prop="os" :show-overflow-tooltip="true" />
-         <el-table-column label="浏览器" align="center" prop="browser" :show-overflow-tooltip="true" />
-         <el-table-column label="登录状态" align="center" prop="status">
+         <el-table-column type="selection" width="55" />
+         <el-table-column label="访问编号" prop="infoId" />
+         <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
+         <el-table-column label="地址" prop="ipaddr" :show-overflow-tooltip="true" />
+         <el-table-column label="登录地点" prop="loginLocation" :show-overflow-tooltip="true" />
+         <el-table-column label="操作系统" prop="os" :show-overflow-tooltip="true" />
+         <el-table-column label="浏览器" prop="browser" :show-overflow-tooltip="true" />
+         <el-table-column label="登录状态" prop="status">
             <template #default="scope">
                <dict-tag :options="sys_common_status" :value="scope.row.status" />
             </template>
          </el-table-column>
-         <el-table-column label="描述" align="center" prop="msg" :show-overflow-tooltip="true" />
-         <el-table-column label="访问时间" align="center" prop="loginTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
+         <el-table-column label="描述" prop="msg" :show-overflow-tooltip="true" />
+         <el-table-column label="访问时间" prop="loginTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
             <template #default="scope">
                <span>{{ parseTime(scope.row.loginTime) }}</span>
             </template>

ygtx-ui/src/views/monitor/operlog/index.vue

@@ -1,39 +1,35 @@
 <template>
    <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-         <el-form-item label="操作地址" prop="operIp">
+      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-position="top">
+         <el-form-item label="操作地址" prop="operIp" label-position="top">
             <el-input
                v-model="queryParams.operIp"
                placeholder="请输入操作地址"
                clearable
-               style="width: 240px;"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
-         <el-form-item label="系统模块" prop="title">
+         <el-form-item label="系统模块" prop="title" label-position="top">
             <el-input
                v-model="queryParams.title"
                placeholder="请输入系统模块"
                clearable
-               style="width: 240px;"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
-         <el-form-item label="操作人员" prop="operName">
+         <el-form-item label="操作人员" prop="operName" label-position="top">
             <el-input
                v-model="queryParams.operName"
                placeholder="请输入操作人员"
                clearable
-               style="width: 240px;"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
-         <el-form-item label="类型" prop="businessType">
+         <el-form-item label="类型" prop="businessType" label-position="top">
             <el-select
                v-model="queryParams.businessType"
                placeholder="操作类型"
                clearable
-               style="width: 240px"
             >
                <el-option
                   v-for="dict in sys_oper_type"
@@ -43,12 +39,11 @@
                />
             </el-select>
          </el-form-item>
-         <el-form-item label="状态" prop="status">
+         <el-form-item label="状态" prop="status" label-position="top">
             <el-select
                v-model="queryParams.status"
                placeholder="操作状态"
                clearable
-               style="width: 240px"
             >
                <el-option
                   v-for="dict in sys_common_status"
@@ -58,7 +53,7 @@
                />
             </el-select>
          </el-form-item>
-         <el-form-item label="操作时间" style="width: 308px">
+         <el-form-item label="操作时间" label-position="top">
             <el-date-picker
                v-model="dateRange"
                value-format="YYYY-MM-DD HH:mm:ss"
@@ -69,12 +64,11 @@
                :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
             ></el-date-picker>
          </el-form-item>
-         <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-         </el-form-item>
       </el-form>
-
+      <div style="float: right;">
+          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+      </div>
       <el-row :gutter="10" class="mb8">
          <el-col :span="1.5">
             <el-button
@@ -105,32 +99,32 @@
       </el-row>
 
       <el-table ref="operlogRef" v-loading="loading" :data="operlogList" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-         <el-table-column type="selection" width="50" align="center" />
-         <el-table-column label="日志编号" align="center" prop="operId" />
-         <el-table-column label="系统模块" align="center" prop="title" :show-overflow-tooltip="true" />
-         <el-table-column label="操作类型" align="center" prop="businessType">
+         <el-table-column type="selection" width="50" />
+         <el-table-column label="日志编号" prop="operId" />
+         <el-table-column label="系统模块" prop="title" :show-overflow-tooltip="true" />
+         <el-table-column label="操作类型" prop="businessType">
             <template #default="scope">
                <dict-tag :options="sys_oper_type" :value="scope.row.businessType" />
             </template>
          </el-table-column>
-         <el-table-column label="操作人员" align="center" width="110" prop="operName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
-         <el-table-column label="操作地址" align="center" prop="operIp" width="130" :show-overflow-tooltip="true" />
-         <el-table-column label="操作状态" align="center" prop="status">
+         <el-table-column label="操作人员" width="110" prop="operName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
+         <el-table-column label="操作地址" prop="operIp" width="130" :show-overflow-tooltip="true" />
+         <el-table-column label="操作状态" prop="status">
             <template #default="scope">
                <dict-tag :options="sys_common_status" :value="scope.row.status" />
             </template>
          </el-table-column>
-         <el-table-column label="操作日期" align="center" prop="operTime" width="180" sortable="custom" :sort-orders="['descending', 'ascending']">
+         <el-table-column label="操作日期" prop="operTime" width="180" sortable="custom" :sort-orders="['descending', 'ascending']">
             <template #default="scope">
                <span>{{ parseTime(scope.row.operTime) }}</span>
             </template>
          </el-table-column>
-         <el-table-column label="消耗时间" align="center" prop="costTime" width="110" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']">
+         <el-table-column label="消耗时间" prop="costTime" width="110" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']">
             <template #default="scope">
                <span>{{ scope.row.costTime }}毫秒</span>
             </template>
          </el-table-column>
-         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+         <el-table-column label="操作" class-name="small-padding fixed-width">
             <template #default="scope">
                <el-button link type="primary" icon="View" @click="handleView(scope.row, scope.index)" v-hasPermi="['monitor:operlog:query']">详细</el-button>
             </template>
@@ -304,4 +298,4 @@ function handleExport() {
 }
 
 getList()
-</script>
+</script>

ygtx-ui/src/views/system/config/index.vue

@@ -1,26 +1,24 @@
 <template>
    <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-         <el-form-item label="参数名称" prop="configName">
+      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-position="top">
+         <el-form-item label="参数名称" prop="configName" label-position="top">
             <el-input
                v-model="queryParams.configName"
                placeholder="请输入参数名称"
                clearable
-               style="width: 240px"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
-         <el-form-item label="参数键名" prop="configKey">
+         <el-form-item label="参数键名" prop="configKey" label-position="top">
             <el-input
                v-model="queryParams.configKey"
                placeholder="请输入参数键名"
                clearable
-               style="width: 240px"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
-         <el-form-item label="系统内置" prop="configType">
-            <el-select v-model="queryParams.configType" placeholder="系统内置" clearable style="width: 240px">
+         <el-form-item label="系统内置" prop="configType" label-position="top">
+            <el-select v-model="queryParams.configType" placeholder="系统内置" clearable>
                <el-option
                   v-for="dict in sys_yes_no"
                   :key="dict.value"
@@ -29,7 +27,7 @@
                />
             </el-select>
          </el-form-item>
-         <el-form-item label="创建时间" style="width: 308px;">
+         <el-form-item label="创建时间" label-position="top">
             <el-date-picker
                v-model="dateRange"
                value-format="YYYY-MM-DD"
@@ -39,12 +37,11 @@
                end-placeholder="结束日期"
             ></el-date-picker>
          </el-form-item>
-         <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-         </el-form-item>
       </el-form>
-
+      <div style="float: right;">
+          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+      </div>
       <el-row :gutter="10" class="mb8">
          <el-col :span="1.5">
             <el-button
@@ -92,26 +89,26 @@
       </el-row>
 
       <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
-         <el-table-column type="selection" width="55" align="center" />
-         <el-table-column label="参数主键" align="center" prop="configId" />
-         <el-table-column label="参数名称" align="center" prop="configName" :show-overflow-tooltip="true" />
-         <el-table-column label="参数键名" align="center" prop="configKey" :show-overflow-tooltip="true" />
-         <el-table-column label="参数键值" align="center" prop="configValue" :show-overflow-tooltip="true" />
-         <el-table-column label="系统内置" align="center" prop="configType">
+         <el-table-column type="selection" width="55" />
+         <el-table-column label="主键" prop="configId" width="60"/>
+         <el-table-column label="参数名称" prop="configName" />
+         <el-table-column label="参数键名" prop="configKey"/>
+         <el-table-column label="参数键值" prop="configValue" width="100"/>
+         <el-table-column label="系统内置" prop="configType" width="100">
             <template #default="scope">
                <dict-tag :options="sys_yes_no" :value="scope.row.configType" />
             </template>
          </el-table-column>
-         <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+         <el-table-column label="备注" prop="remark" :show-overflow-tooltip="true" />
+         <el-table-column label="创建时间" prop="createTime" width="180">
             <template #default="scope">
                <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
          </el-table-column>
-         <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
+         <el-table-column label="操作" width="150" class-name="small-padding fixed-width">
             <template #default="scope">
-               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:config:edit']" >修改</el-button>
-               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:config:remove']">删除</el-button>
+               <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['system:config:edit']" ><i class="fa fa-edit"></i>编辑</el-button>
+               <el-button link type="danger" @click="handleDelete(scope.row)" v-hasPermi="['system:config:remove']"><i class="fa fa-trash"></i>删除</el-button>
             </template>
          </el-table-column>
       </el-table>
@@ -308,4 +305,4 @@ function handleRefreshCache() {
 }
 
 getList()
-</script>
+</script>

ygtx-ui/src/views/system/dept/index.vue

@@ -40,6 +40,7 @@
                @click="toggleExpandAll"
             >展开/折叠</el-button>
          </el-col>
+         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
 
       <el-table
@@ -275,9 +276,4 @@ function handleDelete(row) {
 }
 
 getList()
-</script>
-<style scoped>
-.el-form--inline.el-form--label-top .el-form-item {
-  width: 21%;
-}
-</style>
+</script>

ygtx-ui/src/views/system/dict/data.vue

@@ -1,8 +1,8 @@
 <template>
    <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-         <el-form-item label="字典名称" prop="dictType">
-            <el-select v-model="queryParams.dictType" style="width: 200px">
+      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-position="top">
+         <el-form-item label="字典名称" prop="dictType" label-position="top">
+            <el-select v-model="queryParams.dictType">
                <el-option
                   v-for="item in typeOptions"
                   :key="item.dictId"
@@ -11,17 +11,16 @@
                />
             </el-select>
          </el-form-item>
-         <el-form-item label="字典标签" prop="dictLabel">
+         <el-form-item label="字典标签" prop="dictLabel" label-position="top">
             <el-input
                v-model="queryParams.dictLabel"
                placeholder="请输入字典标签"
                clearable
-               style="width: 200px"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
-         <el-form-item label="状态" prop="status">
-            <el-select v-model="queryParams.status" placeholder="数据状态" clearable style="width: 200px">
+         <el-form-item label="状态" prop="status" label-position="top">
+            <el-select v-model="queryParams.status" placeholder="数据状态" clearable>
                <el-option
                   v-for="dict in sys_normal_disable"
                   :key="dict.value"
@@ -30,12 +29,11 @@
                />
             </el-select>
          </el-form-item>
-         <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-         </el-form-item>
       </el-form>
-
+      <div style="float: right;">
+          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+      </div>
       <el-row :gutter="10" class="mb8">
          <el-col :span="1.5">
             <el-button
@@ -105,8 +103,8 @@
          </el-table-column>
          <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
             <template #default="scope">
-               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dict:edit']">修改</el-button>
-               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dict:remove']">删除</el-button>
+               <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['system:dict:edit']"><i class="fa fa-edit"></i>编辑</el-button>
+               <el-button link type="danger" @click="handleDelete(scope.row)" v-hasPermi="['system:dict:remove']"><i class="fa fa-trash"></i>删除</el-button>
             </template>
          </el-table-column>
       </el-table>
@@ -354,4 +352,4 @@ function handleExport() {
 
 getTypes(route.params && route.params.dictId)
 getTypeList()
-</script>
+</script>

ygtx-ui/src/views/system/dict/index.vue

@@ -1,30 +1,27 @@
 <template>
    <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-         <el-form-item label="字典名称" prop="dictName">
+      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-position="top">
+         <el-form-item label="字典名称" prop="dictName" label-position="top">
             <el-input
                v-model="queryParams.dictName"
                placeholder="请输入字典名称"
                clearable
-               style="width: 240px"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
-         <el-form-item label="字典类型" prop="dictType">
+         <el-form-item label="字典类型" prop="dictType" label-position="top">
             <el-input
                v-model="queryParams.dictType"
                placeholder="请输入字典类型"
                clearable
-               style="width: 240px"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
-         <el-form-item label="状态" prop="status">
+         <el-form-item label="状态" prop="status" label-position="top">
             <el-select
                v-model="queryParams.status"
                placeholder="字典状态"
                clearable
-               style="width: 240px"
             >
                <el-option
                   v-for="dict in sys_normal_disable"
@@ -34,7 +31,7 @@
                />
             </el-select>
          </el-form-item>
-         <el-form-item label="创建时间" style="width: 308px">
+         <el-form-item label="创建时间" label-position="top">
             <el-date-picker
                v-model="dateRange"
                value-format="YYYY-MM-DD"
@@ -44,12 +41,11 @@
                end-placeholder="结束日期"
             ></el-date-picker>
          </el-form-item>
-         <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-         </el-form-item>
       </el-form>
-
+      <div style="float: right;">
+          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+      </div>
       <el-row :gutter="10" class="mb8">
          <el-col :span="1.5">
             <el-button
@@ -97,31 +93,31 @@
       </el-row>
 
       <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
-         <el-table-column type="selection" width="55" align="center" />
-         <el-table-column label="字典编号" align="center" prop="dictId" />
-         <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true"/>
-         <el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
+         <el-table-column type="selection" width="55" />
+         <el-table-column label="字典编号" prop="dictId" />
+         <el-table-column label="字典名称" prop="dictName" :show-overflow-tooltip="true"/>
+         <el-table-column label="字典类型" :show-overflow-tooltip="true">
             <template #default="scope">
                <router-link :to="'/system/dict-data/index/' + scope.row.dictId" class="link-type">
                   <span>{{ scope.row.dictType }}</span>
                </router-link>
             </template>
          </el-table-column>
-         <el-table-column label="状态" align="center" prop="status">
+         <el-table-column label="状态" prop="status">
             <template #default="scope">
                <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
             </template>
          </el-table-column>
-         <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+         <el-table-column label="备注" prop="remark" :show-overflow-tooltip="true" />
+         <el-table-column label="创建时间" prop="createTime" width="180">
             <template #default="scope">
                <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
          </el-table-column>
-         <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
+         <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
             <template #default="scope">
-               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dict:edit']">修改</el-button>
-               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dict:remove']">删除</el-button>
+               <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['system:dict:edit']"><i class="fa fa-edit"></i>编辑</el-button>
+               <el-button link type="danger" @click="handleDelete(scope.row)" v-hasPermi="['system:dict:remove']"><i class="fa fa-trash"></i>删除</el-button>
             </template>
          </el-table-column>
       </el-table>
@@ -315,4 +311,4 @@ function handleRefreshCache() {
 }
 
 getList()
-</script>
+</script>

ygtx-ui/src/views/system/menu/index.vue

@@ -41,6 +41,7 @@
                @click="toggleExpandAll"
             >展开/折叠</el-button>
          </el-col>
+         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
 
       <el-table
@@ -445,9 +446,4 @@ function handleDelete(row) {
 }
 
 getList()
-</script>
-<style scoped>
-.el-form--inline.el-form--label-top .el-form-item {
-  width: 21%;
-}
-</style>
+</script>

ygtx-ui/src/views/system/notice/index.vue

@@ -1,26 +1,24 @@
 <template>
    <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-         <el-form-item label="公告标题" prop="noticeTitle">
+      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-position="top">
+         <el-form-item label="公告标题" prop="noticeTitle" label-position="top">
             <el-input
                v-model="queryParams.noticeTitle"
                placeholder="请输入公告标题"
                clearable
-               style="width: 200px"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
-         <el-form-item label="操作人员" prop="createBy">
+         <el-form-item label="操作人员" prop="createBy" label-position="top">
             <el-input
                v-model="queryParams.createBy"
                placeholder="请输入操作人员"
                clearable
-               style="width: 200px"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
-         <el-form-item label="类型" prop="noticeType">
-            <el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable style="width: 200px">
+         <el-form-item label="类型" prop="noticeType" label-position="top">
+            <el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable>
                <el-option
                   v-for="dict in sys_notice_type"
                   :key="dict.value"
@@ -29,12 +27,11 @@
                />
             </el-select>
          </el-form-item>
-         <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-         </el-form-item>
       </el-form>
-
+      <div style="float: right;">
+          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+      </div>
       <el-row :gutter="10" class="mb8">
          <el-col :span="1.5">
             <el-button
@@ -66,34 +63,29 @@
       </el-row>
 
       <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
-         <el-table-column type="selection" width="55" align="center" />
-         <el-table-column label="序号" align="center" prop="noticeId" width="100" />
-         <el-table-column
-            label="公告标题"
-            align="center"
-            prop="noticeTitle"
-            :show-overflow-tooltip="true"
-         />
-         <el-table-column label="公告类型" align="center" prop="noticeType" width="100">
+         <el-table-column type="selection" width="55" />
+         <el-table-column label="序号" prop="noticeId" width="100" />
+         <el-table-column label="公告标题" prop="noticeTitle" />
+         <el-table-column label="公告类型" prop="noticeType" width="100">
             <template #default="scope">
                <dict-tag :options="sys_notice_type" :value="scope.row.noticeType" />
             </template>
          </el-table-column>
-         <el-table-column label="状态" align="center" prop="status" width="100">
+         <el-table-column label="状态" prop="status" width="100">
             <template #default="scope">
                <dict-tag :options="sys_notice_status" :value="scope.row.status" />
             </template>
          </el-table-column>
-         <el-table-column label="创建者" align="center" prop="createBy" width="100" />
-         <el-table-column label="创建时间" align="center" prop="createTime" width="100">
+         <el-table-column label="创建者" prop="createBy" width="100" />
+         <el-table-column label="创建时间" prop="createTime" width="100">
             <template #default="scope">
                <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
             </template>
          </el-table-column>
-         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+         <el-table-column label="操作" class-name="small-padding fixed-width" width="160">
             <template #default="scope">
-               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:notice:edit']">修改</el-button>
-               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:notice:remove']" >删除</el-button>
+               <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['system:notice:edit']"><i class="fa fa-edit"></i>编辑</el-button>
+               <el-button link type="danger" @click="handleDelete(scope.row)" v-hasPermi="['system:notice:remove']" ><i class="fa fa-trash"></i>删除</el-button>
             </template>
          </el-table-column>
       </el-table>
@@ -286,4 +278,4 @@ function handleDelete(row) {
 }
 
 getList()
-</script>
+</script>

ygtx-ui/src/views/system/post/index.vue

@@ -277,9 +277,4 @@ function handleExport() {
 }
 
 getList()
-</script>
-<style scoped>
-.el-form--inline.el-form--label-top .el-form-item {
-  width: 21%;
-}
-</style>
+</script>

ygtx-ui/src/views/system/role/authUser.vue

@@ -1,31 +1,28 @@
 
 <template>
    <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true">
-         <el-form-item label="用户名称" prop="userName">
+      <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true" label-position="top">
+         <el-form-item label="用户名称" prop="userName" label-position="top">
             <el-input
                v-model="queryParams.userName"
                placeholder="请输入用户名称"
                clearable
-               style="width: 240px"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
-         <el-form-item label="手机号码" prop="phonenumber">
+         <el-form-item label="手机号码" prop="phonenumber" label-position="top">
             <el-input
                v-model="queryParams.phonenumber"
                placeholder="请输入手机号码"
                clearable
-               style="width: 240px"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
-         <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-         </el-form-item>
       </el-form>
-
+      <div style="float: right;">
+          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+      </div>
       <el-row :gutter="10" class="mb8">
          <el-col :span="1.5">
             <el-button
@@ -55,24 +52,24 @@
       </el-row>
 
       <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
-         <el-table-column type="selection" width="55" align="center" />
-         <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
-         <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
-         <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
-         <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
-         <el-table-column label="状态" align="center" prop="status">
+         <el-table-column type="selection" width="55" />
+         <el-table-column label="用户名称" prop="userName" />
+         <el-table-column label="用户昵称" prop="nickName"/>
+         <el-table-column label="邮箱" prop="email"/>
+         <el-table-column label="手机" prop="phonenumber"/>
+         <el-table-column label="状态" prop="status">
             <template #default="scope">
                <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
             </template>
          </el-table-column>
-         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+         <el-table-column label="创建时间" prop="createTime" width="180">
             <template #default="scope">
                <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
          </el-table-column>
-         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+         <el-table-column label="操作" class-name="small-padding fixed-width">
             <template #default="scope">
-               <el-button link type="primary" icon="CircleClose" @click="cancelAuthUser(scope.row)" v-hasPermi="['system:role:remove']">取消授权</el-button>
+               <el-button link type="primary" @click="cancelAuthUser(scope.row)" v-hasPermi="['system:role:remove']"><i class="fa fa-close"></i>取消授权</el-button>
             </template>
          </el-table-column>
       </el-table>

ygtx-ui/src/views/system/role/index.vue

@@ -83,7 +83,7 @@
                v-hasPermi="['system:role:export']"
             >导出</el-button>
          </el-col>
-         <!-- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> -->
+         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
 
       <!-- 表格数据 -->
@@ -568,14 +568,4 @@ function cancelDataScope() {
 }
 
 getList()
-</script>
-
-<style scoped>
-.el-form--inline.el-form--label-top .el-form-item {
-  width: 21%;
-}
-
-.el-form--inline.el-form--label-top{
-  justify-content:space-between;
-}
-</style>
+</script>

ygtx-ui/src/views/system/user/index.vue

@@ -54,7 +54,7 @@
               <el-col :span="1.5">
                 <el-button type="warning" icon="Download" @click="handleExport" v-hasPermi="['system:user:export']">导出</el-button>
               </el-col>
-              <!-- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar> -->
+              <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
             </el-row>
 
             <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
@@ -549,13 +549,4 @@ onMounted(() => {
     initPassword.value = response.msg
   })
 })
-</script>
-<style scoped>
-.el-form--inline.el-form--label-top .el-form-item {
-  width: 21%;
-}
-
-.el-form--inline.el-form--label-top{
-  justify-content:space-between;
-}
-</style>
+</script>