Merge branch 'dev-lhf' into 'dev'

页面样式走查调整

See merge request product-group-fe/sfy-safety-group/sfy-safety!64

src/views/auth/dept/dept.vue

@@ -8,7 +8,7 @@
         <div class="search"
           ><span class="searchLabel"> 搜索：</span><el-input v-model="searchKey" placeholder="请输入关键字进行搜索" />
         </div>
-        <el-table :data="filterData" row-key="id" :tree-props="treeProps" default-expand-all>
+        <el-table :data="filterData" row-key="id" :tree-props="treeProps" default-expand-all style="padding: 0 20px">
           <el-table-column label="组织名称">
             <template #default="{ row }">
               {{ `${row.deptName} (${row.userCount})` }}
@@ -109,6 +109,7 @@
     padding-top: 20px;
     width: 300px;
     display: flex;
+    align-items: center;
     .searchLabel {
       width: 65px;
     }

src/views/exception/404.vue

@@ -1,10 +1,12 @@
 <template>
-  <div class="flex flex-col justify-center page-container">
+  <div class="page-container">
     <div class="text-center">
       <img src="~@/assets/images/exception/404.svg" alt="" />
     </div>
     <div class="text-center">
-      <h1 class="text-base text-gray-500">抱歉，你访问的页面不存在</h1>
+      <h1>抱歉，您访问的页面不存在</h1>
+    </div>
+    <div>
       <el-button type="primary" @click="goHome">回到首页</el-button>
     </div>
   </div>
@@ -23,6 +25,8 @@
     width: 100%;
     border-radius: 4px;
     padding-top: 100px;
+    text-align: center;
+    // flex-direction: column;
 
     .text-center {
       h1 {

src/views/system/log/components/LoginLog.vue

@@ -125,10 +125,11 @@
     ClientTypeEnum,
   } from '@/types/log/constants';
   import useLoginLogQuery from '../hooks/useLoginLogQuery';
-  import { ElMessage, ElMessageBox } from 'element-plus';
+  import { ElMessage } from 'element-plus';
   import { exportLoginLog } from '@/api/system/log';
   import { downloadByData } from '@/utils/file/download';
   import { calculateTreeData } from '@/utils';
+  import { msgConfirm } from '@/utils/element-plus/messageBox';
 
   const { requestParams, total, loginLogList, queryLoginLogPage, loading, resetRequestParams } = useLoginLogQuery();
 
@@ -143,7 +144,7 @@
 
   /* 导出数据 */
   const handleExport = () => {
-    ElMessageBox.confirm('确定导出所查询数据？', '导出', {
+    msgConfirm('确定导出所查询数据？', '导出', {
       confirmButtonText: '确定',
       showCancelButton: true,
       type: 'warning',

src/views/system/user/component/SearchForm.vue

@@ -119,6 +119,6 @@
     margin-right: 40px;
   }
   .el-form {
-    padding: 20px 0 20px 20px;
+    padding: 20px 0 0 20px;
   }
 </style>

src/views/system/user/user.vue

@@ -12,36 +12,28 @@
         @get-table-data="onSearchCommit"
         @reset-form="onResetForm"
       />
-      <el-card shadow="never">
-        <template #header>
-          <el-space align="center">
-            <el-button type="primary" @click="openAddSingleDrawer" v-permission="PERM_USER.ACCOUNT_MANAGE">
-              <template #icon>
-                <el-icon>
-                  <Plus />
-                </el-icon>
-              </template>
-              添加用户
-            </el-button>
-
-            <el-button
-              color="#1890FF"
-              @click="openAddMultipleDrawer"
-              style="margin-left: 18px"
-              plain
-              v-permission="PERM_USER.ACCOUNT_MANAGE"
-            >
-              <template #icon>
-                <el-icon>
-                  <DocumentAdd />
-                </el-icon>
-              </template>
-              批量导入
-            </el-button>
-          </el-space>
-        </template>
-
-        <el-table :data="userList" row-key="id">
+      <div class="content-wrapper">
+        <div v-permission="PERM_USER.ACCOUNT_MANAGE">
+          <el-button type="primary" @click="openAddSingleDrawer">
+            <template #icon>
+              <el-icon>
+                <Plus />
+              </el-icon>
+            </template>
+            添加用户
+          </el-button>
+
+          <el-button color="#1890FF" @click="openAddMultipleDrawer" style="margin-left: 18px" plain>
+            <template #icon>
+              <el-icon>
+                <DocumentAdd />
+              </el-icon>
+            </template>
+            批量导入
+          </el-button>
+        </div>
+
+        <el-table :data="userList" row-key="id" style="margin-top: 10px">
           <el-table-column label="工号" prop="staffNo">
             <template #default="scope">
               <div>
@@ -138,7 +130,8 @@
             @change="loadPageData"
           />
         </section>
-      </el-card>
+      </div>
+
       <CreateDrawer
         ref="createDrawerRef"
         :title="drawerTitle"
@@ -356,6 +349,11 @@
     background-color: #ffffff;
   }
 
+  .content-wrapper {
+    padding: 20px;
+    padding-top: 0;
+  }
+
   .user-list {
     padding: 0 21px;
   }