From 5e920e8e6b05ff63817c989fcf49b95ff128c156 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <925258474@qq.com>
Date: Tue, 9 Jul 2024 15:03:14 +0800
Subject: [PATCH] no message

---
 src/views/app-update/index.vue                |  66 +++++-----
 src/views/base-data/area/index.vue            |   2 +-
 src/views/base-data/bigItem/index.vue         |   6 +-
 src/views/base-data/item/index.vue            |   2 +-
 src/views/base-data/point/index.vue           |   2 +-
 src/views/base-data/stock/index.vue           |  12 +-
 src/views/business-data/asnDetail/index.vue   |   8 +-
 .../business-data/businessTask/agvTask.vue    |   6 +-
 .../business-data/businessTask/asnTask.vue    |   2 +-
 src/views/business-data/gd/index.vue          |   7 +-
 src/views/business-data/gdDetail/index.vue    |  14 ++-
 src/views/business-data/inventory/index.vue   |   6 +-
 .../business-data/inventoryLog/index.vue      |   2 +-
 src/views/business-data/pick/index.vue        |   2 +-
 src/views/business-data/pickDetail/index.vue  |   2 +-
 .../business-data/pickDetail/pickTask.vue     |   3 +-
 src/views/monitor/log/index.vue               |  32 +++--
 src/views/system/timing/index.vue             | 113 +++++++++++-------
 18 files changed, 171 insertions(+), 116 deletions(-)

diff --git a/src/views/app-update/index.vue b/src/views/app-update/index.vue
index 3b8bbd7..98cb43a 100644
--- a/src/views/app-update/index.vue
+++ b/src/views/app-update/index.vue
@@ -17,23 +17,24 @@
         </el-button>
       </crudOperation>
       <!--表单组件-->
-      <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.add ? '文件上传' : '编辑文件'" width="500px">
+      <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU"
+                 :visible.sync="crud.status.cu > 0" :title="crud.status.add ? '文件上传' : '编辑文件'" width="500px">
         <el-form ref="form" :model="form" size="small" label-width="80px">
 
           <el-form-item label="项目名称">
-            <el-input v-model="form.appName" style="width: 370px;" />
+            <el-input v-model="form.appName" style="width: 370px;"/>
           </el-form-item>
 
           <el-form-item label="版本代码">
-            <el-input v-model="form.versionCode" style="width: 370px;" />
+            <el-input v-model="form.versionCode" style="width: 370px;"/>
           </el-form-item>
 
           <el-form-item label="版本名称">
-            <el-input v-model="form.versionName" style="width: 370px;" />
+            <el-input v-model="form.versionName" style="width: 370px;"/>
           </el-form-item>
 
           <el-form-item label="更新内容">
-            <el-input v-model="form.modifyContent" style="width: 370px;" type="textarea" />
+            <el-input v-model="form.modifyContent" style="width: 370px;" type="textarea"/>
           </el-form-item>
 
           <!--   上传文件   -->
@@ -48,7 +49,7 @@
               :on-error="handleError"
               :action="appUploadApi + '?versionCode='+form.versionCode+'&appName='+form.appName+'&versionName='+form.versionName+'&modifyContent='+form.modifyContent"
             >
-              <div class="eladmin-upload"><i class="el-icon-upload" /> 添加文件</div>
+              <div class="eladmin-upload"><i class="el-icon-upload"/> 添加文件</div>
               <div slot="tip" class="el-upload__tip">可上传任意格式文件，且不超过200M</div>
             </el-upload>
           </el-form-item>
@@ -61,14 +62,15 @@
       </el-dialog>
 
       <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-        <el-table-column type="selection" width="55" />
-        <el-table-column prop="id" label="id" />
-        <el-table-column prop="appName" label="项目名称" />
-        <el-table-column prop="updateStatus" label="更新状态" />
-        <el-table-column prop="versionCode" label="版本代码" />
-        <el-table-column prop="versionName" label="版本名称" />
-        <el-table-column prop="modifyContent" label="修改内容" />
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" height="70vh" size="small" style="width: 100%;"
+                @selection-change="crud.selectionChangeHandler">
+        <el-table-column type="selection" width="55"/>
+        <el-table-column prop="id" label="id"/>
+        <el-table-column prop="appName" label="项目名称"/>
+        <el-table-column prop="updateStatus" label="更新状态"/>
+        <el-table-column prop="versionCode" label="版本代码"/>
+        <el-table-column prop="versionName" label="版本名称"/>
+        <el-table-column prop="modifyContent" label="修改内容"/>
         <el-table-column prop="downloadUrl" label="下载网站">
           <template slot-scope="scope">
             <el-popover
@@ -93,11 +95,12 @@
         <el-table-column prop="apkSize" label="程序大小">
           <template slot-scope="scope">
             <span v-if="scope.row.apkSize < 1024">{{ Number(scope.row.apkSize).toFixed(2) }}K</span>
-            <span v-if="scope.row.apkSize > 1024">{{ Number(scope.row.apkSize/1024).toFixed(2) }}M</span>
+            <span v-if="scope.row.apkSize > 1024">{{ Number(scope.row.apkSize / 1024).toFixed(2) }}M</span>
           </template>
         </el-table-column>
-        <el-table-column prop="apkMd5" label="APKMD5" />
-        <el-table-column v-if="checkPer(['admin','sysAppUpdate:edit','sysAppUpdate:del'])" label="操作" width="150px" align="center">
+        <el-table-column prop="apkMd5" label="APKMD5"/>
+        <el-table-column v-if="checkPer(['admin','sysAppUpdate:edit','sysAppUpdate:del'])" label="操作" width="150px"
+                         align="center">
           <template slot-scope="scope">
             <udOperation
               :data="scope.row"
@@ -107,39 +110,48 @@
         </el-table-column>
       </el-table>
       <!--分页组件2-->
-      <pagination />
+      <div style="float: right;">
+        <pagination/>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
 import crudSysAppUpdate from '@/api/sysAppUpdate'
-import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import CRUD, {presenter, header, form, crud} from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
-import { mapGetters } from 'vuex'
-import { getToken } from '@/utils/auth'
-const defaultForm = { id: null, name: '', versionCode: '', versionName: '', modifyContent: '' }
+import {mapGetters} from 'vuex'
+import {getToken} from '@/utils/auth'
+
+const defaultForm = {id: null, name: '', versionCode: '', versionName: '', modifyContent: ''}
 export default {
-  components: { pagination, crudOperation, udOperation },
+  components: {pagination, crudOperation, udOperation},
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
-    return CRUD({ title: 'app_update', url: 'api/sysAppUpdate', idField: 'id', sort: 'id,desc', crudMethod: { ...crudSysAppUpdate }})
+    return CRUD({
+      title: 'app_update',
+      url: 'api/sysAppUpdate',
+      idField: 'id',
+      sort: 'id,desc',
+      crudMethod: {...crudSysAppUpdate}
+    })
   },
   data() {
     return {
-      headers: { 'Authorization': getToken() },
+      headers: {'Authorization': getToken()},
       permission: {
         edit: ['admin', 'sysAppUpdate:edit'],
         del: ['admin', 'sysAppUpdate:del']
       },
       rules: {
         updateStatus: [
-          { required: true, message: '更新状态.不能为空', trigger: 'blur' }
+          {required: true, message: '更新状态.不能为空', trigger: 'blur'}
         ],
         versionCode: [
-          { required: true, message: '版本代码.不能为空', trigger: 'blur' }
+          {required: true, message: '版本代码.不能为空', trigger: 'blur'}
         ]
       }
     }
diff --git a/src/views/base-data/area/index.vue b/src/views/base-data/area/index.vue
index 2bbfaef..1ed8c75 100644
--- a/src/views/base-data/area/index.vue
+++ b/src/views/base-data/area/index.vue
@@ -44,7 +44,7 @@
         </div>
       </el-dialog>
       <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" height="67vh" size="small" style="width: 100%;"
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" height="63vh" size="small" style="width: 100%;"
                 @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55"/>
         <el-table-column prop="code" label="库区编号"/>
diff --git a/src/views/base-data/bigItem/index.vue b/src/views/base-data/bigItem/index.vue
index 937423b..4729aee 100644
--- a/src/views/base-data/bigItem/index.vue
+++ b/src/views/base-data/bigItem/index.vue
@@ -35,7 +35,7 @@
         </div>
       </el-dialog>
       <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;"
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" height="63vh" size="small" style="width: 100%;"
                 @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55"/>
         <el-table-column prop="code" label="编码"/>
@@ -51,7 +51,9 @@
         </el-table-column>
       </el-table>
       <!--分页组件-->
-      <pagination/>
+      <div style="float: right;">
+        <pagination/>
+      </div>
     </div>
   </div>
 </template>
diff --git a/src/views/base-data/item/index.vue b/src/views/base-data/item/index.vue
index 4abf1f0..4203f23 100644
--- a/src/views/base-data/item/index.vue
+++ b/src/views/base-data/item/index.vue
@@ -100,7 +100,7 @@
         :data="crud.data"
         size="small"
         style="width: 100%;"
-        height="68vh"
+        height="63vh"
         @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55"/>
         <el-table-column prop="code" label="编码" width="150"/>
diff --git a/src/views/base-data/point/index.vue b/src/views/base-data/point/index.vue
index 06762c0..a936bbc 100644
--- a/src/views/base-data/point/index.vue
+++ b/src/views/base-data/point/index.vue
@@ -180,7 +180,7 @@
         </div>
       </el-dialog>
       <!--表格渲染-->
-      <el-table ref="table" height="66vh" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;"
+      <el-table ref="table" height="63vh" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;"
                 @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55"/>
         <el-table-column prop="code" label="代码"/>
diff --git a/src/views/base-data/stock/index.vue b/src/views/base-data/stock/index.vue
index 4769c2e..f562f7e 100644
--- a/src/views/base-data/stock/index.vue
+++ b/src/views/base-data/stock/index.vue
@@ -5,7 +5,7 @@
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
         <label class="el-form-item-label">代码</label>
-        <el-input v-model="query.code" clearable placeholder="代码" style="width: 150px;" class="filter-item"
+        <el-input v-model="query.code" clearable placeholder="代码" style="width: 130px;" class="filter-item"
                   @keyup.enter.native="crud.toQuery"/>
 
         <label class="el-form-item-label">状态</label>
@@ -15,7 +15,7 @@
           size="small"
           placeholder="状态"
           class="filter-item"
-          style="width: 150px"
+          style="width: 130px"
           @change="crud.toQuery"
         >
           <el-option
@@ -33,7 +33,7 @@
           size="small"
           placeholder="容器类型"
           class="filter-item"
-          style="width: 150px"
+          style="width: 130px"
           @change="crud.toQuery"
         >
           <el-option
@@ -45,7 +45,7 @@
         </el-select>
 
         <label class="el-form-item-label">库区</label>
-        <el-select v-model="query.areaName" style="width: 120px;" clearable placeholder="库区"
+        <el-select v-model="query.areaName" style="width: 130px;" clearable placeholder="库区"
                    @keyup.enter.native="crud.toQuery" class="filter-item" @change="crud.toQuery">
           <el-option
             v-for="area in areas"
@@ -56,7 +56,7 @@
         </el-select>
 
         <label class="el-form-item-label">点位</label>
-        <el-input v-model="query.pointCode" clearable placeholder="点位" style="width: 150px;" class="filter-item"
+        <el-input v-model="query.pointCode" clearable placeholder="点位" style="width: 130px;" class="filter-item"
                   @keyup.enter.native="crud.toQuery"/>
 
         <rrOperation :crud="crud"/>
@@ -146,7 +146,7 @@
       <CallContainer ref="callContainer"/>
 
       <!--表格渲染-->
-      <el-table ref="table" height="66vh" v-loading="crud.loading" :data="crud.data" size="small"
+      <el-table ref="table" height="63vh" v-loading="crud.loading" :data="crud.data" size="small"
                 style="width: 100%;height: 90%" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55"/>
         <el-table-column prop="code" label="代码"/>
diff --git a/src/views/business-data/asnDetail/index.vue b/src/views/business-data/asnDetail/index.vue
index dc95cba..ccb4aad 100644
--- a/src/views/business-data/asnDetail/index.vue
+++ b/src/views/business-data/asnDetail/index.vue
@@ -4,7 +4,7 @@
     <div class="head-container">
       <el-form ref="form4" :inline="true" :model="form4" label-width="70px">
         <el-form-item label="物料编码">
-          <el-select v-model="query.itemCode" filterable placeholder="请输入物料编码" style="width: 160px;"
+          <el-select v-model="query.itemCode" filterable placeholder="请输入物料编码" style="width: 140px;"
                      class="filter-item">
             <el-option
               @keyup.enter.native="crud.toQuery"
@@ -19,13 +19,13 @@
         </el-form-item>
 
         <el-form-item label="物料名称">
-          <el-input v-model="query.itemName" clearable placeholder="请输入物料名称" style="width: 170px;"
+          <el-input v-model="query.itemName" clearable placeholder="请输入物料名称" style="width: 140px;"
                     class="filter-item"
                     @keyup.enter.native="crud.toQuery"/>
         </el-form-item>
 
         <el-form-item label="MO票">
-          <el-input v-model="query.po" clearable placeholder="请输入MO票" style="width: 170px;" class="filter-item"
+          <el-input v-model="query.po" clearable placeholder="请输入MO票" style="width: 140px;" class="filter-item"
                     @keyup.enter.native="crud.toQuery"/>
         </el-form-item>
 
@@ -246,7 +246,7 @@
       </div>
     </el-dialog>
     <!--表格渲染-->
-    <el-table ref="table" height="68vh" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;"
+    <el-table ref="table" height="58vh" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;"
               @selection-change="this.selectionChangeHandler" @row-click="this.clickRow">
       <el-table-column type="selection" width="55"/>
       <el-table-column prop="xh" type="index" :index="indexMethod" label="序号"/>
diff --git a/src/views/business-data/businessTask/agvTask.vue b/src/views/business-data/businessTask/agvTask.vue
index 8125868..b3e0d0a 100644
--- a/src/views/business-data/businessTask/agvTask.vue
+++ b/src/views/business-data/businessTask/agvTask.vue
@@ -6,7 +6,7 @@
         <!-- 搜索 -->
         <div>
           <label class="el-form-item-label">创建日期</label>
-          <date-range-picker v-model="query.createTime" style="width: 365px;" class="filter-item"/>
+          <date-range-picker v-model="query.createTime" style="width: 250px;" class="filter-item"/>
 
           <label class="el-form-item-label">容器编码</label>
           <el-input
@@ -20,7 +20,7 @@
           <el-input v-model="query.startSlotCode" clearable placeholder="起点位置" style="width: 170px;"
                     class="filter-item" @keyup.enter.native="crud.toQuery"/>
           <label class="el-form-item-label">终点位置</label>
-          <el-input v-model="query.endSlotCode" clearable placeholder="终点位置" style="width: 140px;"
+          <el-input v-model="query.endSlotCode" clearable placeholder="终点位置" style="width: 170px;"
                     class="filter-item" @keyup.enter.native="crud.toQuery"/>
 
         </div>
@@ -120,7 +120,7 @@
         v-loading="crud.loading"
         :data="crud.data"
         size="small"
-        height="56vh"
+        height="54vh"
         style="width: 100%;"
         :default-sort="{prop: 'id', order: 'descending'}"
         @selection-change="crud.selectionChangeHandler">
diff --git a/src/views/business-data/businessTask/asnTask.vue b/src/views/business-data/businessTask/asnTask.vue
index e4289d6..f4d79c7 100644
--- a/src/views/business-data/businessTask/asnTask.vue
+++ b/src/views/business-data/businessTask/asnTask.vue
@@ -55,7 +55,7 @@
       <!--表单组件-->
 
       <!--表格渲染-->
-      <el-table ref="table" height="66vh" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;"
+      <el-table ref="table" height="60vh" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;"
                 @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55"/>
         <el-table-column prop="xh" type="index" :index="indexMethod" label="序号"/>
diff --git a/src/views/business-data/gd/index.vue b/src/views/business-data/gd/index.vue
index 5dd5c5c..63cf6cc 100644
--- a/src/views/business-data/gd/index.vue
+++ b/src/views/business-data/gd/index.vue
@@ -54,7 +54,7 @@
         </div>
       </el-dialog>
       <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;"
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" height="63vh" size="small" style="width: 100%;"
                 @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55"/>
         <el-table-column prop="xh" label="序号" type="index" width="50"/>
@@ -79,7 +79,10 @@
         </el-table-column>
       </el-table>
       <!--分页组件-->
-      <pagination/>
+      <div style="float: right;">
+        <pagination/>
+      </div>
+
     </div>
   </div>
 </template>
diff --git a/src/views/business-data/gdDetail/index.vue b/src/views/business-data/gdDetail/index.vue
index 355d046..8758b8d 100644
--- a/src/views/business-data/gdDetail/index.vue
+++ b/src/views/business-data/gdDetail/index.vue
@@ -5,15 +5,15 @@
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
         <label class="el-form-item-label">单品物料</label>
-        <el-input v-model="query.itemCode" clearable placeholder="单品物料" style="width: 185px;" class="filter-item"
+        <el-input v-model="query.itemCode" clearable placeholder="单品物料" style="width: 140px;" class="filter-item"
                   @keyup.enter.native="crud.toQuery"/>
 
         <label class="el-form-item-label">成品物料</label>
-        <el-input v-model="query.bigItemCode" clearable placeholder="成品物料" style="width: 185px;" class="filter-item"
+        <el-input v-model="query.bigItemCode" clearable placeholder="成品物料" style="width: 140px;" class="filter-item"
                   @keyup.enter.native="crud.toQuery"/>
 
         <label class="el-form-item-label">单据类型</label>
-        <el-select v-model="query.orderType" filterable clearable placeholder="请选择" style="width: 185px;"
+        <el-select v-model="query.orderType" filterable clearable placeholder="请选择" style="width: 140px;"
                    class="filter-item">
           <el-option
             v-for="item in dict.gd_type"
@@ -23,7 +23,7 @@
         </el-select>
 
         <label class="el-form-item-label">需求工位</label>
-        <el-input v-model="query.station" clearable placeholder="需求工位" style="width: 185px;" class="filter-item"
+        <el-input v-model="query.station" clearable placeholder="需求工位" style="width: 140px;" class="filter-item"
                   @keyup.enter.native="crud.toQuery"/>
 
         <rrOperation :crud="crud"/>
@@ -104,7 +104,7 @@
         </div>
       </el-dialog>
       <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;"
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" height="63vh" size="small" style="width: 100%;"
                 @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55"/>
         <el-table-column prop="xh" label="序号" type="index" width="50"/>
@@ -128,7 +128,9 @@
         </el-table-column>
       </el-table>
       <!--分页组件-->
-      <pagination/>
+      <div style="float: right;">
+        <pagination/>
+      </div>
     </div>
   </div>
 </template>
diff --git a/src/views/business-data/inventory/index.vue b/src/views/business-data/inventory/index.vue
index ff4c981..e32befa 100644
--- a/src/views/business-data/inventory/index.vue
+++ b/src/views/business-data/inventory/index.vue
@@ -91,7 +91,7 @@
         size="small"
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
-        height="70vh"
+        height="63vh"
       >
         <el-table-column type="selection" width="55"/>
         <el-table-column :show-overflow-tooltip="true" prop="itemCode" label="物料编码">
@@ -127,10 +127,10 @@
         <el-table-column v-if="checkPer(['admin','fileManagement:edit','fileManagement:del'])" label="操作"
                          width="150px" align="center" fixed="right">
           <template slot-scope="scope">
-            <el-popconfirm title="确定删除吗？"
+<!--            <el-popconfirm title="确定删除吗？"
                            @confirm="deleteDataM(scope.row.id)">
               <el-button slot="reference" type="danger">删除</el-button>
-            </el-popconfirm>
+            </el-popconfirm>-->
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/business-data/inventoryLog/index.vue b/src/views/business-data/inventoryLog/index.vue
index a4e0aab..b1d009e 100644
--- a/src/views/business-data/inventoryLog/index.vue
+++ b/src/views/business-data/inventoryLog/index.vue
@@ -52,7 +52,7 @@
         size="small"
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
-        height="70vh"
+        height="58vh"
       >
         <el-table-column type="selection" width="55"/>
         <el-table-column :show-overflow-tooltip="true" prop="itemCode" label="物料编码">
diff --git a/src/views/business-data/pick/index.vue b/src/views/business-data/pick/index.vue
index 136153a..ab14845 100644
--- a/src/views/business-data/pick/index.vue
+++ b/src/views/business-data/pick/index.vue
@@ -77,7 +77,7 @@
         </div>
       </el-dialog>
       <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;"
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" height="63vh" size="small" style="width: 100%;"
                 @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55"/>
         <el-table-column prop="xh" label="序号" type="index" width="50"/>
diff --git a/src/views/business-data/pickDetail/index.vue b/src/views/business-data/pickDetail/index.vue
index 9942590..c9c047f 100644
--- a/src/views/business-data/pickDetail/index.vue
+++ b/src/views/business-data/pickDetail/index.vue
@@ -101,7 +101,7 @@
 
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small"
                 style="width: 100%;"
-                height="58vh"
+                height="63vh"
                 @selection-change="selectionChangeHandlerTwo">
         <el-table-column type="selection" width="50"/>
         <el-table-column prop="xh" label="序号" type="index" width="50"/>
diff --git a/src/views/business-data/pickDetail/pickTask.vue b/src/views/business-data/pickDetail/pickTask.vue
index 6a926f9..02133bc 100644
--- a/src/views/business-data/pickDetail/pickTask.vue
+++ b/src/views/business-data/pickDetail/pickTask.vue
@@ -52,6 +52,7 @@
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" :tableKey="this.$options.name">
         <el-button
+          v-if="false"
             slot="left"
             class="filter-item"
             type="success"
@@ -65,7 +66,7 @@
       <!--表单组件-->
 
       <!--表格渲染-->
-      <el-table ref="table"  height="66vh" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+      <el-table ref="table"  height="58vh" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
         <el-table-column prop="xh" type="index" :index="indexMethod"  label="序号"/>
         <el-table-column :show-overflow-tooltip="true" prop="itemCode" label="物料编码">
diff --git a/src/views/monitor/log/index.vue b/src/views/monitor/log/index.vue
index 4066fa7..25f2a70 100644
--- a/src/views/monitor/log/index.vue
+++ b/src/views/monitor/log/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="head-container">
-      <Search />
+      <Search/>
       <crudOperation>
         <el-button
           slot="left"
@@ -17,7 +17,8 @@
       </crudOperation>
     </div>
     <!--表格渲染-->
-    <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+    <el-table ref="table" v-loading="crud.loading" :data="crud.data" height="64vh" style="width: 100%;"
+              @selection-change="crud.selectionChangeHandler">
       <el-table-column type="expand">
         <template slot-scope="props">
           <el-form label-position="left" inline class="demo-table-expand">
@@ -33,11 +34,11 @@
           </el-form>
         </template>
       </el-table-column>
-      <el-table-column prop="username" label="用户名" />
-      <el-table-column prop="requestIp" label="IP" />
-      <el-table-column :show-overflow-tooltip="true" prop="address" label="IP来源" />
-      <el-table-column prop="description" label="描述" />
-      <el-table-column prop="browser" label="浏览器" />
+      <el-table-column prop="username" label="用户名"/>
+      <el-table-column prop="requestIp" label="IP"/>
+      <el-table-column :show-overflow-tooltip="true" prop="address" label="IP来源"/>
+      <el-table-column prop="description" label="描述"/>
+      <el-table-column prop="browser" label="浏览器"/>
       <el-table-column prop="time" label="请求耗时" align="center">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.time <= 300">{{ scope.row.time }}ms</el-tag>
@@ -45,25 +46,27 @@
           <el-tag v-else type="danger">{{ scope.row.time }}ms</el-tag>
         </template>
       </el-table-column>
-      <el-table-column prop="createTime" label="创建日期" width="180px" />
+      <el-table-column prop="createTime" label="创建日期" width="180px"/>
     </el-table>
     <!--分页组件-->
-    <pagination />
+    <div style="float: right;">
+      <pagination/>
+    </div>
   </div>
 </template>
 
 <script>
 import Search from './search'
-import { delAllInfo } from '@/api/monitor/log'
-import CRUD, { presenter } from '@crud/crud'
+import {delAllInfo} from '@/api/monitor/log'
+import CRUD, {presenter} from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
 
 export default {
   name: 'Log',
-  components: { Search, crudOperation, pagination },
+  components: {Search, crudOperation, pagination},
   cruds() {
-    return CRUD({ title: '日志', url: 'api/logs' })
+    return CRUD({title: '日志', url: 'api/logs'})
   },
   mixins: [presenter()],
   created() {
@@ -102,15 +105,18 @@ export default {
 .demo-table-expand {
   font-size: 0;
 }
+
 .demo-table-expand label {
   width: 70px;
   color: #99a9bf;
 }
+
 .demo-table-expand .el-form-item {
   margin-right: 0;
   margin-bottom: 0;
   width: 100%;
 }
+
 .demo-table-expand .el-form-item__content {
   font-size: 12px;
 }
diff --git a/src/views/system/timing/index.vue b/src/views/system/timing/index.vue
index 70c0825..ca04fa4 100644
--- a/src/views/system/timing/index.vue
+++ b/src/views/system/timing/index.vue
@@ -4,9 +4,10 @@
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
-        <el-input v-model="query.jobName" clearable size="small" placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
-        <date-range-picker v-model="query.createTime" class="date-item" />
-        <rrOperation />
+        <el-input v-model="query.jobName" clearable size="small" placeholder="输入任务名称搜索" style="width: 200px;"
+                  class="filter-item" @keyup.enter.native="toQuery"/>
+        <date-range-picker v-model="query.createTime" class="date-item"/>
+        <rrOperation/>
       </div>
       <crudOperation :permission="permission" :tableKey="this.$options.name">
         <!-- 任务日志 -->
@@ -17,33 +18,35 @@
           type="info"
           icon="el-icon-tickets"
           @click="doLog"
-        >日志</el-button>
+        >日志
+        </el-button>
       </crudOperation>
-      <Log ref="log" />
+      <Log ref="log"/>
     </div>
     <!--Form表单-->
-    <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" append-to-body width="730px">
+    <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
+               :title="crud.status.title" append-to-body width="730px">
       <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="100px">
         <el-form-item label="任务名称" prop="jobName">
-          <el-input v-model="form.jobName" style="width: 220px;" />
+          <el-input v-model="form.jobName" style="width: 220px;"/>
         </el-form-item>
         <el-form-item label="Bean名称" prop="beanName">
-          <el-input v-model="form.beanName" style="width: 220px;" />
+          <el-input v-model="form.beanName" style="width: 220px;"/>
         </el-form-item>
         <el-form-item label="执行方法" prop="methodName">
-          <el-input v-model="form.methodName" style="width: 220px;" />
+          <el-input v-model="form.methodName" style="width: 220px;"/>
         </el-form-item>
         <el-form-item label="Cron表达式" prop="cronExpression">
-          <el-input v-model="form.cronExpression" style="width: 220px;" />
+          <el-input v-model="form.cronExpression" style="width: 220px;"/>
         </el-form-item>
         <el-form-item label="子任务ID">
-          <el-input v-model="form.subTask" placeholder="多个用逗号隔开，按顺序执行" style="width: 220px;" />
+          <el-input v-model="form.subTask" placeholder="多个用逗号隔开，按顺序执行" style="width: 220px;"/>
         </el-form-item>
         <el-form-item label="任务负责人" prop="personInCharge">
-          <el-input v-model="form.personInCharge" style="width: 220px;" />
+          <el-input v-model="form.personInCharge" style="width: 220px;"/>
         </el-form-item>
         <el-form-item label="告警邮箱" prop="email">
-          <el-input v-model="form.email" placeholder="多个邮箱用逗号隔开" style="width: 220px;" />
+          <el-input v-model="form.email" placeholder="多个邮箱用逗号隔开" style="width: 220px;"/>
         </el-form-item>
         <el-form-item label="失败后暂停">
           <el-radio-group v-model="form.pauseAfterFailure" style="width: 220px">
@@ -58,10 +61,10 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="任务描述" prop="description">
-          <el-input v-model="form.description" style="width: 556px;" rows="4" type="textarea" />
+          <el-input v-model="form.description" style="width: 556px;" rows="4" type="textarea"/>
         </el-form-item>
         <el-form-item label="参数内容">
-          <el-input v-model="form.params" style="width: 556px;" rows="4" type="textarea" />
+          <el-input v-model="form.params" style="width: 556px;" rows="4" type="textarea"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -70,26 +73,36 @@
       </div>
     </el-dialog>
     <!--表格渲染-->
-    <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-      <el-table-column :selectable="checkboxT" type="selection" width="55" />
-      <el-table-column :show-overflow-tooltip="true" prop="id" label="任务ID" />
-      <el-table-column :show-overflow-tooltip="true" prop="jobName" label="任务名称" />
-      <el-table-column :show-overflow-tooltip="true" prop="beanName" label="Bean名称" />
-      <el-table-column :show-overflow-tooltip="true" prop="methodName" label="执行方法" />
-      <el-table-column :show-overflow-tooltip="true" prop="params" label="参数" />
-      <el-table-column :show-overflow-tooltip="true" prop="cronExpression" label="cron表达式" />
+    <el-table ref="table" v-loading="crud.loading" :data="crud.data" height="63vh" style="width: 100%;"
+              @selection-change="crud.selectionChangeHandler">
+      <el-table-column :selectable="checkboxT" type="selection" width="55"/>
+      <el-table-column :show-overflow-tooltip="true" prop="id" label="任务ID"/>
+      <el-table-column :show-overflow-tooltip="true" prop="jobName" label="任务名称"/>
+      <el-table-column :show-overflow-tooltip="true" prop="beanName" label="Bean名称"/>
+      <el-table-column :show-overflow-tooltip="true" prop="methodName" label="执行方法"/>
+      <el-table-column :show-overflow-tooltip="true" prop="params" label="参数"/>
+      <el-table-column :show-overflow-tooltip="true" prop="cronExpression" label="cron表达式"/>
       <el-table-column :show-overflow-tooltip="true" prop="isPause" width="90px" label="状态">
         <template slot-scope="scope">
-          <el-tag :type="scope.row.isPause ? 'warning' : 'success'">{{ scope.row.isPause ? '已暂停' : '运行中' }}</el-tag>
+          <el-tag :type="scope.row.isPause ? 'warning' : 'success'">{{
+              scope.row.isPause ? '已暂停' : '运行中'
+            }}
+          </el-tag>
         </template>
       </el-table-column>
-      <el-table-column :show-overflow-tooltip="true" prop="description" width="150px" label="描述" />
-      <el-table-column :show-overflow-tooltip="true" prop="createTime" width="136px" label="创建日期" />
-      <el-table-column v-if="checkPer(['admin','timing:edit','timing:del'])" label="操作" width="170px" align="center" fixed="right">
+      <el-table-column :show-overflow-tooltip="true" prop="description" width="150px" label="描述"/>
+      <el-table-column :show-overflow-tooltip="true" prop="createTime" width="136px" label="创建日期"/>
+      <el-table-column v-if="checkPer(['admin','timing:edit','timing:del'])" label="操作" width="170px" align="center"
+                       fixed="right">
         <template slot-scope="scope">
-          <el-button v-permission="['admin','timing:edit']" size="mini" style="margin-right: 3px;" type="text" @click="crud.toEdit(scope.row)">编辑</el-button>
-          <el-button v-permission="['admin','timing:edit']" style="margin-left: -2px" type="text" size="mini" @click="execute(scope.row.id)">执行</el-button>
-          <el-button v-permission="['admin','timing:edit']" style="margin-left: 3px" type="text" size="mini" @click="updateStatus(scope.row.id,scope.row.isPause ? '恢复' : '暂停')">
+          <el-button v-permission="['admin','timing:edit']" size="mini" style="margin-right: 3px;" type="text"
+                     @click="crud.toEdit(scope.row)">编辑
+          </el-button>
+          <el-button v-permission="['admin','timing:edit']" style="margin-left: -2px" type="text" size="mini"
+                     @click="execute(scope.row.id)">执行
+          </el-button>
+          <el-button v-permission="['admin','timing:edit']" style="margin-left: 3px" type="text" size="mini"
+                     @click="updateStatus(scope.row.id,scope.row.isPause ? '恢复' : '暂停')">
             {{ scope.row.isPause ? '恢复' : '暂停' }}
           </el-button>
           <el-popover
@@ -101,7 +114,8 @@
             <p>确定停止并删除该任务吗？</p>
             <div style="text-align: right; margin: 0">
               <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.id)">确定
+              </el-button>
             </div>
             <el-button slot="reference" type="text" size="mini">删除</el-button>
           </el-popover>
@@ -109,25 +123,40 @@
       </el-table-column>
     </el-table>
     <!--分页组件-->
-    <pagination />
+    <div style="float: right;">
+      <pagination/>
+    </div>
   </div>
 </template>
 
 <script>
 import crudJob from '@/api/system/timing'
 import Log from './log'
-import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import CRUD, {presenter, header, form, crud} from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
 import DateRangePicker from '@/components/DateRangePicker'
 
-const defaultForm = { id: null, jobName: null, subTask: null, beanName: null, methodName: null, params: null, cronExpression: null, pauseAfterFailure: true, isPause: false, personInCharge: null, email: null, description: null }
+const defaultForm = {
+  id: null,
+  jobName: null,
+  subTask: null,
+  beanName: null,
+  methodName: null,
+  params: null,
+  cronExpression: null,
+  pauseAfterFailure: true,
+  isPause: false,
+  personInCharge: null,
+  email: null,
+  description: null
+}
 export default {
   name: 'Timing',
-  components: { Log, pagination, crudOperation, rrOperation, DateRangePicker },
+  components: {Log, pagination, crudOperation, rrOperation, DateRangePicker},
   cruds() {
-    return CRUD({ title: '定时任务', url: 'api/jobs', crudMethod: { ...crudJob }})
+    return CRUD({title: '定时任务', url: 'api/jobs', crudMethod: {...crudJob}})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   data() {
@@ -140,22 +169,22 @@ export default {
       },
       rules: {
         jobName: [
-          { required: true, message: '请输入任务名称', trigger: 'blur' }
+          {required: true, message: '请输入任务名称', trigger: 'blur'}
         ],
         description: [
-          { required: true, message: '请输入任务描述', trigger: 'blur' }
+          {required: true, message: '请输入任务描述', trigger: 'blur'}
         ],
         beanName: [
-          { required: true, message: '请输入Bean名称', trigger: 'blur' }
+          {required: true, message: '请输入Bean名称', trigger: 'blur'}
         ],
         methodName: [
-          { required: true, message: '请输入方法名称', trigger: 'blur' }
+          {required: true, message: '请输入方法名称', trigger: 'blur'}
         ],
         cronExpression: [
-          { required: true, message: '请输入Cron表达式', trigger: 'blur' }
+          {required: true, message: '请输入Cron表达式', trigger: 'blur'}
         ],
         personInCharge: [
-          { required: true, message: '请输入负责人名称', trigger: 'blur' }
+          {required: true, message: '请输入负责人名称', trigger: 'blur'}
         ]
       }
     }