tongshangming пре 3 година
родитељ
комит
208ea0cdd7

+ 0 - 2
src/assets/base.css

@@ -60,8 +60,6 @@
 *::after {
   box-sizing: border-box;
   margin: 0;
-  position: relative;
-  font-weight: normal;
 }
 
 body {

+ 1 - 0
src/assets/main.css

@@ -10,5 +10,6 @@ a {
 }
 
 .el-card {
+  --el-card-padding: 16px;
   border: none !important;
 }

+ 2 - 2
src/components/GlobalHeader.vue

@@ -6,7 +6,7 @@ import avatar from '@/assets/images/avatar.png'
 import { ElMessageBox } from 'element-plus'
 import router from '@/router'
 
-const iconSize = ref('22')
+const iconSize = ref(20)
 
 const handleLogoClick = () => {
   router.push({ name: config.homeRouteName })
@@ -55,7 +55,7 @@ const settingVisible = ref(false)
       <img :src="config.logo" class="h-36px" />
       <div class="ml-2" :class="{ hidden: value }">{{ config.title }}</div>
     </div>
-    <div class="flex flex-grow items-center justify-between px-4">
+    <div class="flex flex-grow items-center justify-between pr-4">
       <el-space :size="20">
         <el-button link @click="handleToggle">
           <icon-menu-unfold-one :size="iconSize" v-if="!value" />

+ 12 - 6
src/components/ProTable.vue

@@ -164,8 +164,8 @@ defineExpose({
           <form-comp :item="item" v-model="query[item.name]"></form-comp>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleQuery">查询</el-button>
-          <el-button @click="handleReset">重置</el-button>
+          <el-button type="primary" icon="Search" @click="handleQuery">查询</el-button>
+          <el-button icon="Refresh" @click="handleReset">重置</el-button>
         </el-form-item>
       </el-form>
     </el-card>
@@ -174,8 +174,14 @@ defineExpose({
       <div class="flex flex-col h-full">
         <div class="flex justify-between mb-20px">
           <div>
-            <el-button type="primary" @click="handleCreate">新增</el-button>
-            <el-button type="danger" @click="handleBatchDelete" :disabled="!multipleSelection.length" v-if="selection">
+            <el-button type="primary" icon="Plus" @click="handleCreate">新增</el-button>
+            <el-button
+              type="danger"
+              icon="Delete"
+              @click="handleBatchDelete"
+              :disabled="!multipleSelection.length"
+              v-if="selection"
+            >
               删除
             </el-button>
           </div>
@@ -199,11 +205,11 @@ defineExpose({
         <div class="flex justify-end shrink-0">
           <el-pagination
             background
-            layout="prev, pager, next"
+            layout="prev, pager, next, jumper, total"
             :page-size="pageSize"
             :total="total"
             @current-change="pageChange"
-            class="mt-4"
+            class="mt-16px"
           />
         </div>
       </div>

+ 2 - 2
src/components/form/DialogForm.vue

@@ -60,8 +60,8 @@ const submit = async () => {
     />
 
     <template #footer>
-      <el-button @click="closeDialog">取消</el-button>
-      <el-button type="primary" @click="submit">保存</el-button>
+      <el-button icon="Close" @click="closeDialog">取消</el-button>
+      <el-button icon="Check" type="primary" @click="submit">保存</el-button>
     </template>
   </el-dialog>
 </template>