界面整改

src/views/core/outIn/approve/index.vue

@@ -1,137 +1,141 @@
 <template>
   <div class="app-container">
     <div class="main-right-box">
-          <div class="main-search-box">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px" >
+      <div class="main-search-box">
+        <el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" size="small">
 
-      <el-form-item label="来访事由" prop="reasons">
-        <el-input
-          v-model="queryParams.reasons"
-          placeholder="请输入关键字"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="介绍信类型" prop="type">
-        <el-select v-model="queryParams.type" placeholder="请选择介绍信类型" clearable>
-          <el-option
-            v-for="dict in dict.type.out_in_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="审批状态" prop="approveStatus">
-        <el-select v-model="queryParams.approveStatus" placeholder="请选择审批状态" clearable>
-          <el-option
-            v-for="dict in dict.type.out_in_approve_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-    </el-form>
+          <el-form-item label="来访事由" prop="reasons">
+            <el-input
+              v-model="queryParams.reasons"
+              clearable
+              placeholder="请输入关键字"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="介绍信类型" prop="type">
+            <el-select v-model="queryParams.type" clearable placeholder="请选择介绍信类型">
+              <el-option
+                v-for="dict in dict.type.out_in_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="审批状态" prop="approveStatus">
+            <el-select v-model="queryParams.approveStatus" clearable placeholder="请选择审批状态">
+              <el-option
+                v-for="dict in dict.type.out_in_approve_status"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-form>
 
-    <el-row :gutter="10" >
-      <el-col :span="1.5">
+        <el-row :gutter="10">
+          <el-col :span="1.5">
 
-      <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-    </el-col>
-    <el-col :span="1.5">
-        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-col>
-      <!-- <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['core:letter:add']"
-        >录入介绍信</el-button>
-      </el-col> -->
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-          </div>
-    <el-table v-loading="loading" height="650" border :data="letterList">
-      <el-table-column label="介绍信编号" align="center" prop="letterNo" width="120">
-      </el-table-column>
-      <!-- <el-table-column label="序号"  align="center"  type="index" width="70" /> -->
-      <el-table-column label="介绍信类型" header-align="center" align="center" prop="type"  width="150">
-        <template slot-scope="scope">
-              <dict-tag :options="dict.type.out_in_type" :value="scope.row.type"/>
-            </template>
-      </el-table-column>
-      <el-table-column label="来访事由" header-align="center" align="left" prop="reasons"/>
+            <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery">搜索</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button icon="el-icon-refresh" size="mini" type="primary" @click="resetQuery">重置</el-button>
+          </el-col>
+          <!-- <el-col :span="1.5">
+            <el-button
+              type="primary"
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="['core:letter:add']"
+            >录入介绍信</el-button>
+          </el-col> -->
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </div>
+      <el-table v-loading="loading" :data="letterList" border height="646">
+        <el-table-column align="center" label="介绍信编号" prop="letterNo" width="120">
+        </el-table-column>
+        <!-- <el-table-column label="序号"  align="center"  type="index" width="70" /> -->
+        <el-table-column align="center" header-align="center" label="介绍信类型" prop="type" width="150">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.out_in_type" :value="scope.row.type"/>
+          </template>
+        </el-table-column>
+        <el-table-column align="left"  :show-overflow-tooltip="true" header-align="center" label="来访事由" prop="reasons"/>
 
-      <!-- <el-table-column label="介绍信" header-align="center" align="left" prop="letterNo" width="250">
-        <template slot-scope="scope">
-        <template v-if="scope.row.letterFile">
-          <K-file-upload ref="upload" :isShowUploadBtn="false"
-                                         :defaultValue="scope.row.letterFile"
-                                         />
-            </template>
-       </template>
-      </el-table-column> -->
-      <el-table-column label="开具日期" align="center" width="150">
-        <template slot-scope="scope">
-          <span>{{ scope.row.startTime}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="有效天数" width="120" header-align="center" align="center"  prop="effectiveDays" />
-      <!-- <el-table-column label="审批时间" width="150" header-align="center" align="left"  prop="approveTime" /> -->
+        <!-- <el-table-column label="介绍信" header-align="center" align="left" prop="letterNo" width="250">
+          <template slot-scope="scope">
+          <template v-if="scope.row.letterFile">
+            <K-file-upload ref="upload" :isShowUploadBtn="false"
+                                           :defaultValue="scope.row.letterFile"
+                                           />
+              </template>
+         </template>
+        </el-table-column> -->
+        <el-table-column align="center" label="开具日期" width="150">
+          <template slot-scope="scope">
+            <span>{{ scope.row.startTime }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" header-align="center" label="有效天数" prop="effectiveDays" width="120"/>
+        <!-- <el-table-column label="审批时间" width="150" header-align="center" align="left"  prop="approveTime" /> -->
 
-      <el-table-column label="审批状态" align="center" width="100" prop="approveStatus" >
-        <template slot-scope="scope">
-              <dict-tag :options="dict.type.out_in_approve_status" :value="scope.row.approveStatus"/>
-            </template>
-      </el-table-column>
-      <!-- <el-table-column label="备注" header-align="center" align="left" width="150" prop="description" /> -->
-      <el-table-column label="操作" header-align="center" align="left" width="180" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            @click="handleDetailInfo(scope.row)"
-            v-hasPermi="['core:letter:query']"
-          >详情</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-check"
-            v-if="canApprove(scope.row)"
-            @click="handleApproveLetter(scope.row)"
-            v-hasPermi="['core:letter:approve']"
-          >审批</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column align="center" label="审批状态" prop="approveStatus" width="100">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.out_in_approve_status" :value="scope.row.approveStatus"/>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="备注" header-align="center" align="left" width="150" prop="description" /> -->
+        <el-table-column align="left" class-name="small-padding fixed-width" header-align="center" label="操作"
+                         width="180">
+          <template slot-scope="scope">
+            <el-button
+              v-hasPermi="['core:letter:query']"
+              icon="el-icon-view"
+              size="mini"
+              type="text"
+              @click="handleDetailInfo(scope.row)"
+            >详情
+            </el-button>
+            <el-button
+              v-if="canApprove(scope.row)"
+              v-hasPermi="['core:letter:approve']"
+              icon="el-icon-check"
+              size="mini"
+              type="text"
+              @click="handleApproveLetter(scope.row)"
+            >审批
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-    <dialog-approve-letter ref="dialogApproveLetter" @success="handleQuery(true)"></dialog-approve-letter>
-    <dialog-approve-letter-detail ref="dialogApproveLetterDetail" @success="handleQuery(true)"></dialog-approve-letter-detail>
-  </div>
+      <pagination
+        v-show="total>0"
+        :limit.sync="queryParams.pageSize"
+        :page.sync="queryParams.pageNum"
+        :total="total"
+        @pagination="getList"
+      />
+      <dialog-approve-letter ref="dialogApproveLetter" @success="handleQuery(true)"></dialog-approve-letter>
+      <dialog-approve-letter-detail ref="dialogApproveLetterDetail"
+                                    @success="handleQuery(true)"></dialog-approve-letter-detail>
+    </div>
   </div>
 </template>
 
 <script>
-import {getLetterApproveList  } from "@/api/core/letter";
+import {getLetterApproveList} from "@/api/core/letter";
 import dialogApproveLetter from "./dialog.approve.letter";
 import DialogApproveLetterDetail from './dialog.approve.letter.detail.vue';
 import dayjs from 'dayjs';
 import KFileUpload from "@/components/K-FileUpload/index.vue";
 
 export default {
-  components: {dialogApproveLetter,DialogApproveLetterDetail,KFileUpload},
-  dicts: ['letter_status','out_in_type','out_in_approve_status'],
+  components: {dialogApproveLetter, DialogApproveLetterDetail, KFileUpload},
+  dicts: ['letter_status', 'out_in_type', 'out_in_approve_status'],
   name: "Letter",
   data() {
     return {
@@ -158,15 +162,14 @@ export default {
         pageNum: 1,
         pageSize: 10,
         reasons: null,
-        type:null,
+        type: null,
         approveStatus: null,
-        orgId:this.$store.getters.orgId,
+        orgId: this.$store.getters.orgId,
       },
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      }
+      rules: {}
     };
   },
   created() {
@@ -198,17 +201,14 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    handleApproveLetter(row)
-    {
-      this.$refs["dialogApproveLetter"].show(row.id ,{});
+    handleApproveLetter(row) {
+      this.$refs["dialogApproveLetter"].show(row.id, {});
     },
-    canApprove(row)
-    {
+    canApprove(row) {
       //  console.log("canApprove",row.status ==1,row.approveStatus ==0,dayjs(dayjs(row.endTime).add(1, 'day')).isAfter(dayjs(new Date())))
-      return row.status ==1 && row.approveStatus ==0
+      return row.status == 1 && row.approveStatus == 0
     },
-    handleDetailInfo(row)
-    {
+    handleDetailInfo(row) {
       this.$refs["dialogApproveLetterDetail"].show(row.id);
     },
   }

src/views/core/outIn/letter/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <div class="main-right-box">
           <div class="main-search-box">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item label="介绍信编号" prop="letterNo">
         <el-input
           v-model="queryParams.letterNo"
@@ -52,13 +52,13 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
           </div>
-    <el-table v-loading="loading" height="650" border :data="letterList">
+    <el-table v-loading="loading" height="646" border :data="letterList">
       <el-table-column label="介绍信编号" align="center" prop="letterNo" width="170">
       </el-table-column>
 
-      <el-table-column label="接待机构" header-align="center" align="left"  prop="receptionOrgNames" />
+      <el-table-column label="接待机构"  :show-overflow-tooltip="true" header-align="center" align="left"  prop="receptionOrgNames" />
 
-      <el-table-column label="来访事由" header-align="center" align="left" prop="reasons"  width="300"/>
+      <el-table-column label="来访事由"  :show-overflow-tooltip="true" header-align="center" align="left" prop="reasons" />
       <el-table-column label="开具日期" header-align="center" align="center" prop="startTime"  width="150"/>
       <el-table-column label="有效天数" header-align="center" align="center" prop="effectiveDays" width="100"/>
       <!-- <el-table-column label="介绍信有效期" align="center" width="250">

src/views/core/outIn/outInLog/index.vue

@@ -97,7 +97,7 @@
           </div>
           <el-table
             v-loading="loading"
-            height="650"
+            height="646"
             border
             :data="outInRecrodList"
           >
@@ -105,13 +105,15 @@
               label="来访单位"
               prop="companyName"
               align="center"
-              width="150"
+              width="180"
+              :show-overflow-tooltip="true"
             />
             <el-table-column
               label="来访人员"
               prop="userName"
               align="center"
-              width="100"
+              width="180"
+              :show-overflow-tooltip="true"
             />
 
             <!-- <el-table-column label="证件类型" prop="idType"  align="center"  width="180" >
@@ -123,7 +125,7 @@
               label="证件号码"
               prop="idCard"
               align="center"
-              width="160"
+              width="180"
             />
 
             <el-table-column
@@ -144,6 +146,7 @@
               label="来访事由"
               header-align="center"
               align="left"
+              :show-overflow-tooltip="true"
               prop="reasons"
             />
             <el-table-column
@@ -151,7 +154,7 @@
               header-align="center"
               align="center"
               prop="orgName"
-              width="120"
+              width="180"
             >
             </el-table-column>
             <el-table-column

src/views/monitor/job/index.vue

@@ -1,96 +1,97 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-      <el-form-item label="任务名称" prop="jobName">
-        <el-input
-          v-model="queryParams.jobName"
-          placeholder="请输入任务名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="任务组名" prop="jobGroup">
-        <el-select v-model="queryParams.jobGroup" placeholder="请选择任务组名" clearable>
-          <el-option
-            v-for="dict in dict.type.sys_job_group"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
+    <div class="main-search-box">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+        <el-form-item label="任务名称" prop="jobName">
+          <el-input
+            v-model="queryParams.jobName"
+            placeholder="请输入任务名称"
+            clearable
+            @keyup.enter.native="handleQuery"
           />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="任务状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
-          <el-option
-            v-for="dict in dict.type.sys_job_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" >
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['monitor:job:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit-outline"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['monitor:job:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['monitor:job:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['monitor:job:export']"
-        >导出</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          plain
-          icon="el-icon-s-operation"
-          size="mini"
-          @click="handleJobLog"
-          v-hasPermi="['monitor:job:query']"
-        >日志</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+        </el-form-item>
+        <el-form-item label="任务组名" prop="jobGroup">
+          <el-select v-model="queryParams.jobGroup" placeholder="请选择任务组名" clearable>
+            <el-option
+              v-for="dict in dict.type.sys_job_group"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="任务状态" prop="status">
+          <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
+            <el-option
+              v-for="dict in dict.type.sys_job_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
 
-    <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange">
+      <el-row :gutter="10" >
+        <el-col :span="1.5">
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+            v-hasPermi="['monitor:job:add']"
+          >新增</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-edit-outline"
+            size="mini"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['monitor:job:edit']"
+          >修改</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-delete"
+            size="mini"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['monitor:job:remove']"
+          >删除</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['monitor:job:export']"
+          >导出</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            icon="el-icon-s-operation"
+            size="mini"
+            @click="handleJobLog"
+            v-hasPermi="['monitor:job:query']"
+          >日志</el-button>
+        </el-col>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
+    </div>
+    <el-table v-loading="loading" border height="646" :data="jobList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="任务编号" width="100" align="center" prop="jobId" />
       <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />

src/views/system/logininfor/index.vue

@@ -47,17 +47,18 @@
             :default-time="['00:00:00', '23:59:59']"
           ></el-date-picker>
         </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        </el-form-item>
       </el-form>
 
       <el-row :gutter="10" >
         <el-col :span="1.5">
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button  type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-col>
+        <el-col :span="1.5">
           <el-button
-            type="danger"
-            plain
+            type="primary"
             icon="el-icon-delete"
             size="mini"
             :disabled="multiple"
@@ -67,8 +68,7 @@
         </el-col>
         <el-col :span="1.5">
           <el-button
-            type="danger"
-            plain
+            type="primary"
             icon="el-icon-delete"
             size="mini"
             @click="handleClean"
@@ -78,7 +78,6 @@
         <el-col :span="1.5">
           <el-button
             type="primary"
-            plain
             icon="el-icon-unlock"
             size="mini"
             :disabled="single"
@@ -88,8 +87,7 @@
         </el-col>
         <el-col :span="1.5">
           <el-button
-            type="warning"
-            plain
+            type="primary"
             icon="el-icon-download"
             size="mini"
             @click="handleExport"
@@ -101,9 +99,9 @@
     </div>
     <el-table ref="tables" height="646" border v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="访问编号" width="80" align="center" prop="infoId" />
+      <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" width="130" :show-overflow-tooltip="true" />
+      <el-table-column label="地址" align="center" prop="ipaddr" :show-overflow-tooltip="true" />
       <el-table-column label="登录状态" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_common_status" :value="scope.row.status"/>

src/views/system/operlog/index.vue

@@ -1,108 +1,111 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="系统模块" prop="title">
-        <el-input
-          v-model="queryParams.title"
-          placeholder="请输入系统模块"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="操作人员" prop="operName">
-        <el-input
-          v-model="queryParams.operName"
-          placeholder="请输入操作人员"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="类型" prop="businessType">
-        <el-select
-          v-model="queryParams.businessType"
-          placeholder="操作类型"
-          clearable
-          style="width: 240px"
-        >
-          <el-option
-            v-for="dict in dict.type.sys_oper_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
+    <div class="main-search-box">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+        <el-form-item label="系统模块" prop="title">
+          <el-input
+            v-model="queryParams.title"
+            placeholder="请输入系统模块"
+            clearable
+            style="width: 240px;"
+            @keyup.enter.native="handleQuery"
           />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="操作状态"
-          clearable
-          style="width: 240px"
-        >
-          <el-option
-            v-for="dict in dict.type.sys_common_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
+        </el-form-item>
+        <el-form-item label="操作人员" prop="operName">
+          <el-input
+            v-model="queryParams.operName"
+            placeholder="请输入操作人员"
+            clearable
+            style="width: 240px;"
+            @keyup.enter.native="handleQuery"
           />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="操作时间">
-        <el-date-picker
-          v-model="dateRange"
-          style="width: 240px"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="['00:00:00', '23:59:59']"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" >
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:operlog:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          @click="handleClean"
-          v-hasPermi="['system:operlog:remove']"
-        >清空</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:operlog:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+        </el-form-item>
+        <el-form-item label="类型" prop="businessType">
+          <el-select
+            v-model="queryParams.businessType"
+            placeholder="操作类型"
+            clearable
+            style="width: 240px"
+          >
+            <el-option
+              v-for="dict in dict.type.sys_oper_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-select
+            v-model="queryParams.status"
+            placeholder="操作状态"
+            clearable
+            style="width: 240px"
+          >
+            <el-option
+              v-for="dict in dict.type.sys_common_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="操作时间">
+          <el-date-picker
+            v-model="dateRange"
+            style="width: 240px"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            :default-time="['00:00:00', '23:59:59']"
+          ></el-date-picker>
+        </el-form-item>
+      </el-form>
 
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
+      <el-row :gutter="10" >
+        <el-col :span="1.5">
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        </el-col>
+        <el-col  :span="1.5">
+          <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="danger"
+            plain
+            icon="el-icon-delete"
+            size="mini"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['system:operlog:remove']"
+          >删除</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="danger"
+            plain
+            icon="el-icon-delete"
+            size="mini"
+            @click="handleClean"
+            v-hasPermi="['system:operlog:remove']"
+          >清空</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['system:operlog:export']"
+          >导出</el-button>
+        </el-col>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
+    </div>
+    <el-table ref="tables" border height="646" v-loading="loading" :data="list" @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" />