feature:vab组件更改

src/vab/components/VabQueryForm/components/VabQueryFormLeftPanel.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-col :lg="span" :md="24" :sm="24" :xl="span" :xs="24">
+  <el-col :lg="span" :md="md" :sm="sm" :xl="xl" :xs="xs">
     <div class="left-panel">
       <slot />
     </div>
@@ -12,7 +12,23 @@
     props: {
       span: {
         type: Number,
-        default: 14,
+        default: 12,
+      },
+      md: {
+        type: Number,
+        default: 12,
+      },
+      sm: {
+        type: Number,
+        default: 12,
+      },
+      xl: {
+        type: Number,
+        default: 12,
+      },
+      xs: {
+        type: Number,
+        default: 12,
       },
     },
   }

src/vab/components/VabQueryForm/components/VabQueryFormRightPanel.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-col :lg="span" :md="24" :sm="24" :xl="span" :xs="24">
+  <el-col :lg="span" :md="md" :sm="sm" :xl="xl" :xs="xs">
     <div class="right-panel">
       <slot />
     </div>
@@ -12,7 +12,23 @@
     props: {
       span: {
         type: Number,
-        default: 10,
+        default: 12,
+      },
+      md: {
+        type: Number,
+        default: 12,
+      },
+      sm: {
+        type: Number,
+        default: 12,
+      },
+      xl: {
+        type: Number,
+        default: 12,
+      },
+      xs: {
+        type: Number,
+        default: 12,
       },
     },
   }

src/vab/components/VabQueryForm/index.vue

@@ -27,11 +27,11 @@
   .vab-query-form {
     ::v-deep {
       .el-form-item:first-child {
-        margin: 0 0 $base-margin/2 0 !important;
+        margin: 0 $base-margin/2 $base-margin/2 0 !important;
       }
 
       .el-form-item + .el-form-item {
-        margin: 0 0 $base-margin/2 0 !important;
+        margin: 0 $base-margin/2 $base-margin/2 0 !important;
 
         .el-button {
           margin: 0 0 0 10px !important;

src/views/system/loginLog/index.vue

@@ -3,7 +3,7 @@
     <vab-query-form>
       <vab-query-form-top-panel>
         <el-form :inline="true" :model="queryForm" @submit.native.prevent>
-          <el-form-item label="登录IP" prop="ipaddr">
+          <el-form-item prop="ipaddr">
             <el-input
               v-model="queryForm.ipaddr"
               clearable
@@ -11,7 +11,7 @@
               @keyup.enter.native="queryData" />
           </el-form-item>
 
-          <el-form-item label="登录地点" prop="loginLocation">
+          <el-form-item prop="loginLocation">
             <el-input
               v-model="queryForm.loginLocation"
               clearable
@@ -20,7 +20,7 @@
               @keyup.enter.native="queryData" />
           </el-form-item>
 
-          <el-form-item label="用户名称" prop="userName">
+          <el-form-item prop="userName">
             <el-input
               v-model="queryForm.userName"
               clearable
@@ -28,20 +28,15 @@
               @keyup.enter.native="queryData" />
           </el-form-item>
 
-          <el-form-item label="状态" prop="status">
-            <el-select
-              v-model="queryForm.status"
-              clearable
-              placeholder="登录状态">
+          <el-form-item prop="status">
+            <el-select v-model="queryForm.status" clearable placeholder="登录状态">
               <el-option label="成功" value="10" />
               <el-option label="失败" value="20" />
             </el-select>
           </el-form-item>
 
           <el-form-item>
-            <el-button icon="el-icon-search" type="primary" @click="queryData">
-              查询
-            </el-button>
+            <el-button icon="el-icon-search" type="primary" @click="queryData">查询</el-button>
             <!--            <el-button type="text" @click="handleFold">-->
             <!--              <span v-if="fold">展开</span>-->
             <!--              <span v-else>合并</span>-->
@@ -53,25 +48,15 @@
           </el-form-item>
         </el-form>
       </vab-query-form-top-panel>
-      <vab-query-form-left-panel :span="12">
-        <el-button
-          icon="el-icon-delete"
-          size="mini"
-          type="danger"
-          @click="handleDelete">
-          删除
-        </el-button>
+      <vab-query-form-left-panel>
+        <el-button icon="el-icon-delete" size="mini" type="danger" @click="handleDelete">删除</el-button>
       </vab-query-form-left-panel>
-      <vab-query-form-right-panel :span="12">
+      <vab-query-form-right-panel>
         <table-tool :check-list.sync="checkList" :columns="columns" />
       </vab-query-form-right-panel>
     </vab-query-form>
 
-    <el-table
-      v-loading="listLoading"
-      :data="list"
-      :height="height"
-      @selection-change="setSelectRows">
+    <el-table v-loading="listLoading" :data="list" :height="height" @selection-change="setSelectRows">
       <el-table-column align="center" type="selection" />
       <el-table-column
         v-for="(item, index) in finallyColumns"
@@ -174,9 +159,7 @@
     },
     computed: {
       finallyColumns() {
-        return this.columns.filter((item) =>
-          this.checkList.includes(item.label)
-        )
+        return this.columns.filter((item) => this.checkList.includes(item.label))
       },
     },
     created() {