Переглянути джерело

feat: 页面基础样式调整

zhangjie 10 місяців тому
батько
коміт
de5dc1e012

+ 9 - 12
src/assets/styles/base.scss

@@ -148,18 +148,6 @@ body {
     background-color: $--color-text-gray-7;
     background-color: $--color-text-gray-7;
   }
   }
 
 
-  &-flex {
-    display: flex;
-    align-items: stretch;
-    justify-content: space-between;
-  }
-
-  &-action {
-    padding-bottom: 15px;
-    white-space: nowrap;
-    display: flex;
-    align-items: flex-end;
-  }
   &-tips {
   &-tips {
     font-size: 16px;
     font-size: 16px;
     line-height: 25px;
     line-height: 25px;
@@ -217,6 +205,15 @@ body {
   color: $--color-text-gray-3;
   color: $--color-text-gray-3;
   text-align: center;
   text-align: center;
 }
 }
+.filter-form {
+  display: flex;
+  flex-wrap: wrap;
+
+  .el-form-item:last-child {
+    margin-left: auto;
+  }
+}
+
 // box-justify
 // box-justify
 .box-justify {
 .box-justify {
   display: flex;
   display: flex;

+ 16 - 10
src/modules/admin/views/AdminUserManage.vue

@@ -1,7 +1,13 @@
 <template>
 <template>
   <div class="user-manage">
   <div class="user-manage">
-    <div class="part-box part-box-filter part-box-flex">
-      <el-form ref="FilterForm" label-position="left" label-width="85px" inline>
+    <div class="part-box part-box-filter">
+      <el-form
+        ref="FilterForm"
+        class="filter-form"
+        label-position="left"
+        label-width="85px"
+        inline
+      >
         <el-form-item label="姓名:" label-width="75px">
         <el-form-item label="姓名:" label-width="75px">
           <el-input
           <el-input
             style="width: 142px"
             style="width: 142px"
@@ -29,15 +35,15 @@
         <el-form-item label-width="0px">
         <el-form-item label-width="0px">
           <el-button type="primary" @click="toPage(1)">查询</el-button>
           <el-button type="primary" @click="toPage(1)">查询</el-button>
         </el-form-item>
         </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            icon="el-icon-circle-plus-outline"
+            @click="toAdd"
+            >新增用户</el-button
+          >
+        </el-form-item>
       </el-form>
       </el-form>
-      <div class="part-box-action">
-        <el-button
-          type="primary"
-          icon="el-icon-circle-plus-outline"
-          @click="toAdd"
-          >新增用户</el-button
-        >
-      </div>
     </div>
     </div>
 
 
     <div class="part-box part-box-pad">
     <div class="part-box part-box-pad">

+ 16 - 11
src/modules/admin/views/SchoolMenuManage.vue

@@ -1,7 +1,12 @@
 <template>
 <template>
   <div class="school-menu-manage">
   <div class="school-menu-manage">
-    <div class="part-box part-box-filter part-box-flex">
-      <el-form ref="FilterForm" label-position="left" inline>
+    <div class="part-box part-box-filter">
+      <el-form
+        ref="FilterForm"
+        class="filter-form"
+        label-position="left"
+        inline
+      >
         <el-form-item label="学校:">
         <el-form-item label="学校:">
           <school-select
           <school-select
             v-model="schoolId"
             v-model="schoolId"
@@ -11,16 +16,16 @@
             @change="search"
             @change="search"
           ></school-select>
           ></school-select>
         </el-form-item>
         </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            :disabled="fetching"
+            :loading="loading"
+            @click="save"
+            >保存</el-button
+          >
+        </el-form-item>
       </el-form>
       </el-form>
-      <div class="part-box-action">
-        <el-button
-          type="primary"
-          :disabled="fetching"
-          :loading="loading"
-          @click="save"
-          >保存</el-button
-        >
-      </div>
     </div>
     </div>
 
 
     <div class="part-box part-box-pad">
     <div class="part-box part-box-pad">

+ 1 - 1
src/modules/admin/views/SystemRoleManage.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
   <div class="role-manage">
   <div class="role-manage">
-    <div class="part-box part-box-pad part-box-flex">
+    <div class="part-box part-box-pad box-justify">
       <div></div>
       <div></div>
       <el-button
       <el-button
         type="primary"
         type="primary"

+ 17 - 11
src/modules/base/views/ExamManage.vue

@@ -1,7 +1,13 @@
 <template>
 <template>
   <div class="record-type-manage">
   <div class="record-type-manage">
-    <div class="part-box part-box-filter part-box-flex">
-      <el-form ref="FilterForm" label-position="left" label-width="90px" inline>
+    <div class="part-box part-box-filter">
+      <el-form
+        ref="FilterForm"
+        class="filter-form"
+        label-position="left"
+        label-width="90px"
+        inline
+      >
         <template v-if="checkPrivilege('condition', 'condition')">
         <template v-if="checkPrivilege('condition', 'condition')">
           <el-form-item>
           <el-form-item>
             <semester-select
             <semester-select
@@ -18,16 +24,16 @@
             >查询</el-button
             >查询</el-button
           >
           >
         </el-form-item>
         </el-form-item>
+        <el-form-item>
+          <el-button
+            v-if="checkPrivilege('button', 'add')"
+            type="primary"
+            icon="el-icon-circle-plus-outline"
+            @click="toAdd"
+            >新增考试</el-button
+          >
+        </el-form-item>
       </el-form>
       </el-form>
-      <div class="part-box-action">
-        <el-button
-          v-if="checkPrivilege('button', 'add')"
-          type="primary"
-          icon="el-icon-circle-plus-outline"
-          @click="toAdd"
-          >新增考试</el-button
-        >
-      </div>
     </div>
     </div>
     <div class="part-box part-box-pad">
     <div class="part-box part-box-pad">
       <el-table ref="TableList" :data="dataList">
       <el-table ref="TableList" :data="dataList">

+ 11 - 10
src/modules/base/views/RoleManage.vue

@@ -1,8 +1,9 @@
 <template>
 <template>
   <div class="role-manage">
   <div class="role-manage">
-    <div class="part-box part-box-filter part-box-flex">
+    <div class="part-box part-box-filter">
       <el-form
       <el-form
         ref="FilterForm"
         ref="FilterForm"
+        class="filter-form"
         label-position="left"
         label-position="left"
         label-width="85px"
         label-width="85px"
         inline
         inline
@@ -26,16 +27,16 @@
             >查询</el-button
             >查询</el-button
           >
           >
         </el-form-item>
         </el-form-item>
+        <el-form-item>
+          <el-button
+            v-if="checkPrivilege('button', 'add')"
+            type="primary"
+            icon="el-icon-circle-plus-outline"
+            @click="toAdd"
+            >添加角色</el-button
+          >
+        </el-form-item>
       </el-form>
       </el-form>
-      <div class="part-box-action">
-        <el-button
-          v-if="checkPrivilege('button', 'add')"
-          type="primary"
-          icon="el-icon-circle-plus-outline"
-          @click="toAdd"
-          >添加角色</el-button
-        >
-      </div>
     </div>
     </div>
     <div class="part-box part-box-pad">
     <div class="part-box part-box-pad">
       <el-table ref="TableList" :data="roles">
       <el-table ref="TableList" :data="roles">

+ 17 - 11
src/modules/base/views/ScanStatistics.vue

@@ -1,7 +1,13 @@
 <template>
 <template>
   <div class="scan-statistics">
   <div class="scan-statistics">
-    <div class="part-box part-box-filter part-box-flex">
-      <el-form ref="FilterForm" label-position="left" label-width="85px" inline>
+    <div class="part-box part-box-filter">
+      <el-form
+        ref="FilterForm"
+        class="filter-form"
+        label-position="left"
+        label-width="85px"
+        inline
+      >
         <template v-if="checkPrivilege('condition', 'condition')">
         <template v-if="checkPrivilege('condition', 'condition')">
           <el-form-item label="日期:">
           <el-form-item label="日期:">
             <el-date-picker
             <el-date-picker
@@ -30,16 +36,16 @@
             >查询</el-button
             >查询</el-button
           >
           >
         </el-form-item>
         </el-form-item>
+        <el-form-item>
+          <el-button
+            v-if="checkPrivilege('button', 'export')"
+            type="primary"
+            :loading="downloading"
+            @click="toExport"
+            >导出</el-button
+          >
+        </el-form-item>
       </el-form>
       </el-form>
-      <div class="part-box-action">
-        <el-button
-          v-if="checkPrivilege('button', 'export')"
-          type="primary"
-          :loading="downloading"
-          @click="toExport"
-          >导出</el-button
-        >
-      </div>
     </div>
     </div>
     <div class="part-box part-box-pad">
     <div class="part-box part-box-pad">
       <el-table ref="TableList" :data="dataList">
       <el-table ref="TableList" :data="dataList">

+ 2 - 2
src/modules/base/views/SemesterManage.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
   <div class="semester-manage">
   <div class="semester-manage">
-    <div class="part-box part-box-filter part-box-flex">
+    <div class="part-box part-box-pad box-justify">
       <div>
       <div>
         <el-button
         <el-button
           v-if="checkPrivilege('button', 'select')"
           v-if="checkPrivilege('button', 'select')"
@@ -9,7 +9,7 @@
           >查询</el-button
           >查询</el-button
         >
         >
       </div>
       </div>
-      <div class="part-box-action">
+      <div>
         <el-button
         <el-button
           v-if="checkPrivilege('button', 'add')"
           v-if="checkPrivilege('button', 'add')"
           type="primary"
           type="primary"

+ 32 - 31
src/modules/base/views/UserManage.vue

@@ -1,8 +1,9 @@
 <template>
 <template>
   <div class="user-manage">
   <div class="user-manage">
-    <div class="part-box part-box-filter part-box-flex">
+    <div class="part-box part-box-filter">
       <el-form
       <el-form
         ref="FilterForm"
         ref="FilterForm"
+        class="filter-form"
         label-position="left"
         label-position="left"
         label-width="85px"
         label-width="85px"
         inline
         inline
@@ -27,37 +28,37 @@
             >查询</el-button
             >查询</el-button
           >
           >
         </el-form-item>
         </el-form-item>
+        <el-form-item>
+          <el-button
+            v-if="checkPrivilege('button', 'batchDelete')"
+            type="danger"
+            icon="el-icon-delete"
+            :loading="loading"
+            @click="batchDelete"
+            >批量删除</el-button
+          >
+          <el-button
+            v-if="checkPrivilege('button', 'export')"
+            type="success"
+            icon="el-icon-upload"
+            @click="toImportUser"
+            >导入用户</el-button
+          >
+          <el-button
+            v-if="checkPrivilege('button', 'export')"
+            type="primary"
+            @click="viewResult"
+            >导入结果</el-button
+          >
+          <el-button
+            v-if="checkPrivilege('button', 'add')"
+            type="primary"
+            icon="el-icon-circle-plus-outline"
+            @click="toAdd"
+            >新增用户</el-button
+          >
+        </el-form-item>
       </el-form>
       </el-form>
-      <div class="part-box-action">
-        <el-button
-          v-if="checkPrivilege('button', 'batchDelete')"
-          type="danger"
-          icon="el-icon-delete"
-          :loading="loading"
-          @click="batchDelete"
-          >批量删除</el-button
-        >
-        <el-button
-          v-if="checkPrivilege('button', 'export')"
-          type="success"
-          icon="el-icon-upload"
-          @click="toImportUser"
-          >导入用户</el-button
-        >
-        <el-button
-          v-if="checkPrivilege('button', 'export')"
-          type="primary"
-          @click="viewResult"
-          >导入结果</el-button
-        >
-        <el-button
-          v-if="checkPrivilege('button', 'add')"
-          type="primary"
-          icon="el-icon-circle-plus-outline"
-          @click="toAdd"
-          >新增用户</el-button
-        >
-      </div>
     </div>
     </div>
 
 
     <div class="part-box part-box-pad">
     <div class="part-box part-box-pad">

+ 12 - 11
src/modules/record/components/DocumentDetailDialog.vue

@@ -10,9 +10,10 @@
       fullscreen
       fullscreen
       @open="visibleChange"
       @open="visibleChange"
     >
     >
-      <div class="part-box part-box-filter part-box-flex">
+      <div class="part-box part-box-filter">
         <el-form
         <el-form
           ref="FilterForm"
           ref="FilterForm"
+          class="filter-form"
           label-position="left"
           label-position="left"
           label-width="90px"
           label-width="90px"
           inline
           inline
@@ -134,17 +135,17 @@
           <el-form-item>
           <el-form-item>
             <el-button type="primary" @click="toPage(1)">查询</el-button>
             <el-button type="primary" @click="toPage(1)">查询</el-button>
           </el-form-item>
           </el-form-item>
+          <el-form-item>
+            <el-button
+              type="success"
+              icon="el-icon-upload"
+              :loading="loading"
+              @click="toDownload"
+              >批量下载</el-button
+            >
+            <el-button type="success" @click="viewResult">下载结果</el-button>
+          </el-form-item>
         </el-form>
         </el-form>
-        <div class="part-box-action">
-          <el-button
-            type="success"
-            icon="el-icon-upload"
-            :loading="loading"
-            @click="toDownload"
-            >批量下载</el-button
-          >
-          <el-button type="success" @click="viewResult">下载结果</el-button>
-        </div>
       </div>
       </div>
 
 
       <div class="part-box part-box-pad mb-0">
       <div class="part-box part-box-pad mb-0">

+ 18 - 11
src/modules/record/views/ArchivesDetail.vue

@@ -1,7 +1,13 @@
 <template>
 <template>
   <div class="archives-detail">
   <div class="archives-detail">
-    <div class="part-box part-box-filter part-box-flex">
-      <el-form ref="FilterForm" label-position="left" label-width="85px" inline>
+    <div class="part-box part-box-filter">
+      <el-form
+        ref="FilterForm"
+        class="filter-form"
+        label-position="left"
+        label-width="85px"
+        inline
+      >
         <el-form-item label="扫描任务:">
         <el-form-item label="扫描任务:">
           <scan-task-select
           <scan-task-select
             v-model="filter.paperScanTaskId"
             v-model="filter.paperScanTaskId"
@@ -95,16 +101,17 @@
           <el-button type="primary" @click="toPage(1)">查询</el-button>
           <el-button type="primary" @click="toPage(1)">查询</el-button>
           <el-button @click="goback">返回</el-button>
           <el-button @click="goback">返回</el-button>
         </el-form-item>
         </el-form-item>
+
+        <el-form-item>
+          <el-button
+            type="primary"
+            icon="el-icon-circle-plus-outline"
+            @click="toBatchDownload"
+            >批量下载</el-button
+          >
+          <el-button type="primary" @click="viewResult">下载结果</el-button>
+        </el-form-item>
       </el-form>
       </el-form>
-      <div class="part-box-action">
-        <el-button
-          type="primary"
-          icon="el-icon-circle-plus-outline"
-          @click="toBatchDownload"
-          >批量下载</el-button
-        >
-        <el-button type="primary" @click="viewResult">下载结果</el-button>
-      </div>
     </div>
     </div>
 
 
     <div class="part-box part-box-pad">
     <div class="part-box part-box-pad">

+ 17 - 11
src/modules/record/views/ArchivesManage.vue

@@ -1,7 +1,13 @@
 <template>
 <template>
   <div class="archives-manage">
   <div class="archives-manage">
-    <div class="part-box part-box-filter part-box-flex">
-      <el-form ref="FilterForm" label-position="left" label-width="85px" inline>
+    <div class="part-box part-box-filter">
+      <el-form
+        ref="FilterForm"
+        class="filter-form"
+        label-position="left"
+        label-width="85px"
+        inline
+      >
         <template v-if="checkPrivilege('condition', 'condition')">
         <template v-if="checkPrivilege('condition', 'condition')">
           <el-form-item label="学期:">
           <el-form-item label="学期:">
             <semester-select
             <semester-select
@@ -34,16 +40,16 @@
             >查询</el-button
             >查询</el-button
           >
           >
         </el-form-item>
         </el-form-item>
+        <el-form-item>
+          <el-button
+            v-if="checkPrivilege('button', 'add')"
+            type="primary"
+            icon="el-icon-circle-plus-outline"
+            @click="toAdd"
+            >新增档案</el-button
+          >
+        </el-form-item>
       </el-form>
       </el-form>
-      <div class="part-box-action">
-        <el-button
-          v-if="checkPrivilege('button', 'add')"
-          type="primary"
-          icon="el-icon-circle-plus-outline"
-          @click="toAdd"
-          >新增档案</el-button
-        >
-      </div>
     </div>
     </div>
 
 
     <div class="part-box part-box-pad">
     <div class="part-box part-box-pad">

+ 1 - 1
src/modules/record/views/DocumentManage.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
   <div class="document-manage">
   <div class="document-manage">
-    <div class="part-box part-box-filter part-box-flex">
+    <div class="part-box part-box-filter">
       <el-form ref="FilterForm" label-position="left" label-width="85px" inline>
       <el-form ref="FilterForm" label-position="left" label-width="85px" inline>
         <template v-if="checkPrivilege('condition', 'condition')">
         <template v-if="checkPrivilege('condition', 'condition')">
           <sec-select
           <sec-select

+ 1 - 2
src/modules/record/views/LibraryManage.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
   <div class="library-manage">
   <div class="library-manage">
-    <div class="part-box part-box-filter part-box-flex">
+    <div class="part-box part-box-filter">
       <el-form ref="FilterForm" label-position="left" label-width="85px" inline>
       <el-form ref="FilterForm" label-position="left" label-width="85px" inline>
         <template v-if="checkPrivilege('condition', 'condition')">
         <template v-if="checkPrivilege('condition', 'condition')">
           <sec-select
           <sec-select
@@ -19,7 +19,6 @@
           >
           >
         </el-form-item>
         </el-form-item>
       </el-form>
       </el-form>
-      <div class="part-box-action"></div>
     </div>
     </div>
 
 
     <div class="mb-4 tab-btns">
     <div class="mb-4 tab-btns">

+ 19 - 12
src/modules/record/views/PictureManage.vue

@@ -1,7 +1,13 @@
 <template>
 <template>
   <div>
   <div>
-    <div class="part-box part-box-filter part-box-flex">
-      <el-form ref="FilterForm" label-position="left" label-width="90px" inline>
+    <div class="part-box part-box-filter">
+      <el-form
+        ref="FilterForm"
+        class="filter-form"
+        label-position="left"
+        label-width="90px"
+        inline
+      >
         <el-form-item label="姓名/学号:">
         <el-form-item label="姓名/学号:">
           <el-input
           <el-input
             v-model.trim="filter.param"
             v-model.trim="filter.param"
@@ -119,17 +125,18 @@
         <el-form-item>
         <el-form-item>
           <el-button type="primary" @click="toPage(1)">查询</el-button>
           <el-button type="primary" @click="toPage(1)">查询</el-button>
         </el-form-item>
         </el-form-item>
+
+        <el-form-item>
+          <el-button
+            type="success"
+            icon="el-icon-upload"
+            :loading="loading"
+            :disabled="!multipleSelection.length"
+            @click="toDownload"
+            >下载图片</el-button
+          >
+        </el-form-item>
       </el-form>
       </el-form>
-      <div class="part-box-action">
-        <el-button
-          type="success"
-          icon="el-icon-upload"
-          :loading="loading"
-          :disabled="!multipleSelection.length"
-          @click="toDownload"
-          >下载图片</el-button
-        >
-      </div>
     </div>
     </div>
 
 
     <div class="part-box part-box-pad mb-0">
     <div class="part-box part-box-pad mb-0">