From c6d2ca1f3eb7668364ab8332f744b781210d1fa8 Mon Sep 17 00:00:00 2001
From: x_ying <2438792676@qq.com>
Date: Tue, 5 Jul 2022 16:48:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=A0=B7=E5=BC=8F=20?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=A0=8F=E6=94=BE=E5=9C=A8=E6=A1=86=E6=A1=86?=
 =?UTF-8?q?=E5=A4=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/archivesConfig/dict/dictDetail.vue  |  24 +-
 src/views/archivesConfig/dict/index.vue       |  19 +-
 .../archivesManage/archivesCheck/index.vue    |  71 ++---
 src/views/components/field/index.vue          |  51 ++--
 src/views/storeManage/deviceManage/index.vue  |  13 +-
 src/views/system/dept/index.vue               |  93 +++---
 src/views/system/job/index.vue                |  83 +++---
 src/views/system/log/errorLog.vue             |  82 +++---
 src/views/system/log/index.vue                |  76 ++---
 src/views/system/menu/index.vue               | 127 +++++----
 src/views/system/role/index.vue               |   6 +-
 src/views/system/user/index.vue               | 268 +++++++++---------
 12 files changed, 480 insertions(+), 433 deletions(-)

diff --git a/src/views/archivesConfig/dict/dictDetail.vue b/src/views/archivesConfig/dict/dictDetail.vue
index ae68b2c..1a73868 100644
--- a/src/views/archivesConfig/dict/dictDetail.vue
+++ b/src/views/archivesConfig/dict/dictDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <!--工具栏-->
-    <div class="head-container">
+    <div class="head-container" style="padding:0 0 20px 0">
       <crudOperation :permission="permission">
         <template v-slot:left>
           <el-button v-permission="permission.add" size="mini" type="primary" icon="el-icon-plus" :disabled="!activeAddBtn" @click="crud.toAdd">新增</el-button>
@@ -45,15 +45,19 @@
         </div>
       </div>
     </el-dialog>
-    <!--表格渲染-->
-    <el-table ref="table" v-loading="crud.loading" :data="crud.data" highlight-current-row style="width: 100%;" @selection-change="selectionChangeHandler" @row-click="clickRowHandler">
-      <el-table-column type="selection" width="55" />
-      <el-table-column prop="dicName" label="字典名称" />
-      <el-table-column prop="dicCode" label="字典代码" />
-      <el-table-column prop="dicExplain" label="内容说明" />
-    </el-table>
-    <!--分页组件-->
-    <pagination />
+    <div class="container-right" style="min-height: calc(100vh - 242px);">
+      <span class="right-top-line" />
+      <span class="left-bottom-line" />
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" highlight-current-row style="width: 100%;" @selection-change="selectionChangeHandler" @row-click="clickRowHandler">
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="dicName" label="字典名称" />
+        <el-table-column prop="dicCode" label="字典代码" />
+        <el-table-column prop="dicExplain" label="内容说明" />
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
   </div>
 </template>
 
diff --git a/src/views/archivesConfig/dict/index.vue b/src/views/archivesConfig/dict/index.vue
index f8153ab..1f1442a 100644
--- a/src/views/archivesConfig/dict/index.vue
+++ b/src/views/archivesConfig/dict/index.vue
@@ -37,23 +37,26 @@
     </el-dialog>
     <!-- 字典列表 -->
     <el-row class="container-main" :gutter="20">
-      <el-col class="container-left curd-in-out" style="height: calc(100vh - 190px)" :xs="10" :sm="8" :md="5" :lg="6" :xl="4">
-        <span class="right-top-line" />
-        <span class="left-bottom-line" />
+      <el-col class=" curd-in-out" :xs="10" :sm="8" :md="5" :lg="6" :xl="4">
+
         <crudOperation :permission="permission">
           <template v-slot:right>
             <el-button v-permission="permission.del" icon="el-icon-delete" size="mini" :loading="crud.delAllLoading" :disabled="crud.selections.length === 0" @click="toDelete(crud.selections)">删除</el-button>
           </template>
         </crudOperation>
         <!--字典树状结构-->
-        <div class="tree-scroll">
-          <el-tree ref="tree" v-loading="crud.loading" :data="crud.data" :props="defaultProps" node-key="id" :expand-on-click-node="false" highlight-current @node-click="handleNodeClick" />
+        <div class="container-left" style="min-height: calc(100vh - 242px);margin:20px 0 0 0">
+          <span class="right-top-line" />
+          <span class="left-bottom-line" />
+          <div class="tree-scroll">
+            <el-tree ref="tree" v-loading="crud.loading" :data="crud.data" :props="defaultProps" node-key="id" :expand-on-click-node="false" highlight-current @node-click="handleNodeClick" />
+          </div>
         </div>
       </el-col>
       <!-- 字典详情列表 -->
-      <el-col class="container-right" :xs="14" :sm="16" :md="19" :lg="18" :xl="20">
-        <span class="right-top-line" />
-        <span class="left-bottom-line" />
+      <!-- <el-col class="container-right" :xs="14" :sm="16" :md="19" :lg="18" :xl="20"> -->
+      <el-col :xs="14" :sm="16" :md="19" :lg="18" :xl="20">
+
         <dictDetail ref="dictDetail" :permission="permission" :active-add-btn="activeAddBtn" @treeRefresh="updateKeyChildren" />
       </el-col>
     </el-row>
diff --git a/src/views/archivesManage/archivesCheck/index.vue b/src/views/archivesManage/archivesCheck/index.vue
index 3b59348..1a2d1f8 100644
--- a/src/views/archivesManage/archivesCheck/index.vue
+++ b/src/views/archivesManage/archivesCheck/index.vue
@@ -1,8 +1,6 @@
 <template>
-  <div class="app-container container-wrap">
-    <span class="right-top-line" />
-    <span class="left-bottom-line" />
-    <div class="head-container">
+  <div class="app-container">
+    <div class="head-container" style="padding:0 0 20px 0">
       <el-button size="mini" @click="handleAdd">
         <svg-icon icon-class="xinzengpandian-fanbai" class-name="svg-style" />新增盘点</el-button>
       <el-button
@@ -33,34 +31,40 @@
       <rrOperation />
       <!-- <crudOperation :permission="permission" /> -->
     </div>
-    <!--表格渲染-->
-    <el-table
-      ref="table"
-      :data="tableData"
-      :cell-class-name="cell"
-      style="min-width: 100%"
-      height="calc(100vh - 315px)"
-      @selection-change="selectionChangeHandler"
-      @row-click="clickRowHandler"
-      @row-dblclick="handleDbClick"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column type="index" align="center" label="序号" width="55" />
-      <el-table-column prop="checkNum" align="center" label="盘点单号" min-width="100" />
-      <el-table-column prop="containPath" align="center" label="包含位置" min-width="140" />
-      <el-table-column prop="checkState" align="center" label="盘点状态" min-width="60">
-        <template slot-scope="scope">
-          <!-- 已执行 / 待执行/执行中 -->
-          <span class="clear">{{ scope.row.checkState }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="storeNum" align="center" label="在库档案" min-width="60" />
-      <el-table-column prop="CheckedNum" align="center" label="已盘档案" min-width="60" />
-      <el-table-column prop="noCheckNum" align="center" label="未盘档案" min-width="60" />
-      <el-table-column prop="haveLendNum" align="center" label="已借档案" min-width="60" />
-      <el-table-column prop="misplaceNum" align="center" label="错位档案" min-width="60" />
-      <el-table-column prop="CreateTime" align="center" label="创建时间" min-width="100" />
-    </el-table>
+    <div class="container-wrap" style="min-height: calc(100vh - 242px)">
+      <span class="right-top-line" />
+      <span class="left-bottom-line" />
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        :data="tableData"
+        :cell-class-name="cell"
+        style="min-width: 100%"
+        height="calc(100vh - 315px)"
+        @selection-change="selectionChangeHandler"
+        @row-click="clickRowHandler"
+        @row-dblclick="handleDbClick"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column type="index" align="center" label="序号" width="55" />
+        <el-table-column prop="checkNum" align="center" label="盘点单号" min-width="100" />
+        <el-table-column prop="containPath" align="center" label="包含位置" min-width="140" />
+        <el-table-column prop="checkState" align="center" label="盘点状态" min-width="60">
+          <template slot-scope="scope">
+            <!-- 已执行 / 待执行/执行中 -->
+            <span class="clear">{{ scope.row.checkState }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="storeNum" align="center" label="在库档案" min-width="60" />
+        <el-table-column prop="CheckedNum" align="center" label="已盘档案" min-width="60" />
+        <el-table-column prop="noCheckNum" align="center" label="未盘档案" min-width="60" />
+        <el-table-column prop="haveLendNum" align="center" label="已借档案" min-width="60" />
+        <el-table-column prop="misplaceNum" align="center" label="错位档案" min-width="60" />
+        <el-table-column prop="CreateTime" align="center" label="创建时间" min-width="100" />
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
     <!-- 删除模态框 -->
     <el-dialog title="确认删除" :visible.sync="deleteVisible" :before-close="handleClose">
       <span class="dialog-right-top" />
@@ -79,8 +83,7 @@
     <addCheck ref="addCheckDom" />
     <!-- 盘点详情 -->
     <checkDetail ref="checkDetailDom" />
-    <!--分页组件-->
-    <pagination />
+
   </div>
 </template>
 
diff --git a/src/views/components/field/index.vue b/src/views/components/field/index.vue
index 98fccfb..2cc7493 100644
--- a/src/views/components/field/index.vue
+++ b/src/views/components/field/index.vue
@@ -1,31 +1,34 @@
 <template>
-  <div class="app-container  container-wrap">
-    <span class="right-top-line" />
-    <span class="left-bottom-line" />
+  <div class="app-container">
+
     <!--工具栏-->
-    <div class="head-container">
+    <div class="head-container" style="padding:0 0 20px 0">
       <crudOperation :permission="permission" />
     </div>
-    <!--表格渲染-->
-    <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" height="calc(100vh - 263px)" @selection-change="selectionChangeHandler" @row-click="clickRowHandler">
-      <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" width="55" />
-      <el-table-column prop="fieldCnName" label="中文名称" />
-      <el-table-column prop="fieldName" label="字段标识" />
-      <el-table-column label="数据类型">
-        <template slot-scope="scope">
-          <span v-if="scope.row.isDataType === 1">字符</span>
-          <span v-if="scope.row.isDataType === 2">数字</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="isColumnLength" label="字段长度" />
-      <el-table-column label="默认值">
-        <template slot-scope="scope">
-          <span v-if="scope.row.isDefaultValue === ''">-</span>
-          <span v-else>{{ scope.row.isDefaultValue }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
+    <div class="container-wrap" style="min-height: calc(100vh - 241px);">
+      <span class="right-top-line" />
+      <span class="left-bottom-line" />
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" height="calc(100vh - 263px)" @selection-change="selectionChangeHandler" @row-click="clickRowHandler">
+        <el-table-column type="selection" width="55" />
+        <el-table-column type="index" label="序号" width="55" />
+        <el-table-column prop="fieldCnName" label="中文名称" />
+        <el-table-column prop="fieldName" label="字段标识" />
+        <el-table-column label="数据类型">
+          <template slot-scope="scope">
+            <span v-if="scope.row.isDataType === 1">字符</span>
+            <span v-if="scope.row.isDataType === 2">数字</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="isColumnLength" label="字段长度" />
+        <el-table-column label="默认值">
+          <template slot-scope="scope">
+            <span v-if="scope.row.isDefaultValue === ''">-</span>
+            <span v-else>{{ scope.row.isDefaultValue }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
     <!--表单渲染-->
     <eForm ref="eform" />
     <el-dialog title="关键提示" :visible.sync="verifyDialogVisible" :before-close="handleClose">
diff --git a/src/views/storeManage/deviceManage/index.vue b/src/views/storeManage/deviceManage/index.vue
index 5a44417..1587f57 100644
--- a/src/views/storeManage/deviceManage/index.vue
+++ b/src/views/storeManage/deviceManage/index.vue
@@ -31,17 +31,20 @@
     </el-dialog>
     <!-- 区域列表 -->
     <el-row class="container-main" :gutter="20">
-      <el-col class="container-left curd-in-out" style="height: calc(100vh - 190px)" :xs="10" :sm="8" :md="5" :lg="6" :xl="4">
-        <span class="right-top-line" />
-        <span class="left-bottom-line" />
+      <el-col class="curd-in-out" style="height: calc(100vh - 190px)" :xs="10" :sm="8" :md="5" :lg="6" :xl="4">
+
         <crudOperation :permission="permission">
           <template v-slot:right>
             <el-button v-permission="permission.del" icon="el-icon-delete" size="mini" :loading="crud.delAllLoading" :disabled="crud.selections.length === 0" @click="toDelete(crud.selections)">删除</el-button>
           </template>
         </crudOperation>
         <!--区域树状结构-->
-        <div class="tree-scroll">
-          <el-tree ref="tree" v-loading="crud.loading" :data="crud.data" :props="defaultProps" node-key="id" :expand-on-click-node="false" highlight-current @node-click="handleNodeClick" />
+        <div class="container-left" style="min-height: calc(100vh - 242px);margin:20px 0 0 0">
+          <span class="right-top-line" />
+          <span class="left-bottom-line" />
+          <div class="tree-scroll">
+            <el-tree ref="tree" v-loading="crud.loading" :data="crud.data" :props="defaultProps" node-key="id" :expand-on-click-node="false" highlight-current @node-click="handleNodeClick" />
+          </div>
         </div>
       </el-col>
       <!-- 设备详情列表 -->
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 1271c44..f00a113 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -1,7 +1,6 @@
 <template>
-  <div class="app-container  container-wrap">
-    <span class="right-top-line" />
-    <span class="left-bottom-line" />
+  <div>
+
     <!--工具栏-->
     <div class="head-container">
       <div v-if="crud.props.searchToggle" class="head-search">
@@ -60,48 +59,52 @@
       </div>
     </el-dialog>
     <!--表格渲染-->
-    <el-table
-      ref="table"
-      v-loading="crud.loading"
-      lazy
-      :load="getDeptDatas"
-      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-      :data="crud.data"
-      row-key="id"
-      @select="crud.selectChange"
-      @select-all="crud.selectAllChange"
-      @selection-change="crud.selectionChangeHandler"
-    >
-      <el-table-column :selectable="checkboxT" type="selection" width="55" />
-      <el-table-column label="名称" prop="name" />
-      <el-table-column label="排序" prop="deptSort" />
-      <el-table-column label="状态" align="center" prop="enabled">
-        <template slot-scope="scope">
-          <el-switch
-            v-model="scope.row.enabled"
-            :disabled="scope.row.id === 1"
-            active-color="#409EFF"
-            inactive-color="#F56C6C"
-            @change="changeEnabled(scope.row, scope.row.enabled,)"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column prop="createTime" label="创建日期">
-        <template slot-scope="scope">
-          <div>{{ scope.row.createTime | parseTime }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column v-if="checkPer(['admin','dept:edit','dept:del'])" label="操作" width="130px" align="center" fixed="right">
-        <template slot-scope="scope">
-          <udOperation
-            :data="scope.row"
-            :permission="permission"
-            :disabled-dle="scope.row.id === 1"
-            msg="确定删除吗,如果存在下级节点则一并删除，此操作不能撤销！"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
+    <div class="app-container  container-wrap" style="margin-top:0;min-height: calc(100vh - 292px);">
+      <span class="right-top-line" />
+      <span class="left-bottom-line" />
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        lazy
+        :load="getDeptDatas"
+        :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+        :data="crud.data"
+        row-key="id"
+        @select="crud.selectChange"
+        @select-all="crud.selectAllChange"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column :selectable="checkboxT" type="selection" width="55" />
+        <el-table-column label="名称" prop="name" />
+        <el-table-column label="排序" prop="deptSort" />
+        <el-table-column label="状态" align="center" prop="enabled">
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.enabled"
+              :disabled="scope.row.id === 1"
+              active-color="#409EFF"
+              inactive-color="#F56C6C"
+              @change="changeEnabled(scope.row, scope.row.enabled,)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column prop="createTime" label="创建日期">
+          <template slot-scope="scope">
+            <div>{{ scope.row.createTime | parseTime }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="checkPer(['admin','dept:edit','dept:del'])" label="操作" width="130px" align="center" fixed="right">
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+              :disabled-dle="scope.row.id === 1"
+              msg="确定删除吗,如果存在下级节点则一并删除，此操作不能撤销！"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
   </div>
 </template>
 
diff --git a/src/views/system/job/index.vue b/src/views/system/job/index.vue
index e48a092..13a9d48 100644
--- a/src/views/system/job/index.vue
+++ b/src/views/system/job/index.vue
@@ -1,50 +1,53 @@
 <template>
-  <div class="app-container  container-wrap">
-    <span class="right-top-line" />
-    <span class="left-bottom-line" />
+  <div>
+
     <!--工具栏-->
     <div class="head-container">
       <eHeader :dict="dict" :permission="permission" />
       <crudOperation :permission="permission" />
     </div>
     <!--表格渲染-->
-    <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-      <el-table-column type="selection" width="55" />
-      <el-table-column prop="name" label="名称" />
-      <el-table-column prop="jobSort" label="排序">
-        <template slot-scope="scope">
-          {{ scope.row.jobSort }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="status" label="状态" align="center">
-        <template slot-scope="scope">
-          <el-switch
-            v-model="scope.row.enabled"
-            active-color="#409EFF"
-            inactive-color="#F56C6C"
-            @change="changeEnabled(scope.row, scope.row.enabled)"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column prop="createTime" label="创建日期" />
-      <!--   编辑与删除   -->
-      <el-table-column
-        v-if="checkPer(['admin','job:edit','job:del'])"
-        label="操作"
-        width="130px"
-        align="center"
-        fixed="right"
-      >
-        <template slot-scope="scope">
-          <udOperation
-            :data="scope.row"
-            :permission="permission"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页组件-->
-    <pagination />
+    <div class="app-container  container-wrap" style="margin-top:0;min-height: calc(100vh - 292px);">
+      <span class="right-top-line" />
+      <span class="left-bottom-line" />
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="name" label="名称" />
+        <el-table-column prop="jobSort" label="排序">
+          <template slot-scope="scope">
+            {{ scope.row.jobSort }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="status" label="状态" align="center">
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.enabled"
+              active-color="#409EFF"
+              inactive-color="#F56C6C"
+              @change="changeEnabled(scope.row, scope.row.enabled)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column prop="createTime" label="创建日期" />
+        <!--   编辑与删除   -->
+        <el-table-column
+          v-if="checkPer(['admin','job:edit','job:del'])"
+          label="操作"
+          width="130px"
+          align="center"
+          fixed="right"
+        >
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
     <!--表单渲染-->
     <eForm :job-status="dict.job_status" />
   </div>
diff --git a/src/views/system/log/errorLog.vue b/src/views/system/log/errorLog.vue
index e45a869..cb2010a 100644
--- a/src/views/system/log/errorLog.vue
+++ b/src/views/system/log/errorLog.vue
@@ -1,7 +1,6 @@
 <template>
-  <div class="app-container  container-wrap">
-    <span class="right-top-line" />
-    <span class="left-bottom-line" />
+  <div>
+
     <div class="head-container">
       <Search />
       <crudOperation>
@@ -17,37 +16,41 @@
         </el-button>
       </crudOperation>
     </div>
-    <!--表格渲染-->
-    <el-table ref="table" v-loading="crud.loading" :data="crud.data" 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">
-            <el-form-item label="请求方法">
-              <span>{{ props.row.method }}</span>
-            </el-form-item>
-            <el-form-item label="请求参数">
-              <span>{{ props.row.params }}</span>
-            </el-form-item>
-          </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="createTime" label="创建日期" />
-      <el-table-column label="异常详情" width="100px">
-        <template slot-scope="scope">
-          <el-button size="mini" type="text" @click="info(scope.row.id)">查看详情</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-dialog :visible.sync="dialog" title="异常详情" append-to-body top="30px" width="85%">
-      <pre v-highlightjs="errorInfo"><code class="java" /></pre>
-    </el-dialog>
-    <!--分页组件-->
-    <pagination />
+    <div class="app-container  container-wrap" style="min-height: calc(100vh - 242px)">
+      <span class="right-top-line" />
+      <span class="left-bottom-line" />
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" 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">
+              <el-form-item label="请求方法">
+                <span>{{ props.row.method }}</span>
+              </el-form-item>
+              <el-form-item label="请求参数">
+                <span>{{ props.row.params }}</span>
+              </el-form-item>
+            </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="createTime" label="创建日期" />
+        <el-table-column label="异常详情" width="100px">
+          <template slot-scope="scope">
+            <el-button size="mini" type="text" @click="info(scope.row.id)">查看详情</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-dialog :visible.sync="dialog" title="异常详情" append-to-body top="30px" width="85%">
+        <pre v-highlightjs="errorInfo"><code class="java" /></pre>
+      </el-dialog>
+      <!--分页组件-->
+      <pagination />
+    </div>
   </div>
 </template>
 
@@ -109,7 +112,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 .demo-table-expand {
   font-size: 0;
 }
@@ -125,7 +128,7 @@ export default {
 .demo-table-expand .el-form-item__content {
   font-size: 12px;
 }
-/deep/ .el-dialog__body {
+::v-deep .el-dialog__body {
   padding: 0 20px 10px 20px !important;
 }
 .java.hljs {
@@ -133,4 +136,11 @@ export default {
   background: #ffffff !important;
   height: 630px !important;
 }
+::v-deep .head-container{
+  display: flex;
+  padding-bottom: 0;
+}
+.head-search{
+  margin-bottom:0 ;
+}
 </style>
diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue
index 937fb39..6505b8d 100644
--- a/src/views/system/log/index.vue
+++ b/src/views/system/log/index.vue
@@ -1,7 +1,5 @@
 <template>
-  <div class="app-container  container-wrap">
-    <span class="right-top-line" />
-    <span class="left-bottom-line" />
+  <div>
     <div class="head-container">
       <Search />
       <crudOperation>
@@ -18,35 +16,40 @@
       </crudOperation>
     </div>
     <!--表格渲染-->
-    <el-table ref="table" v-loading="crud.loading" :data="crud.data" 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">
-            <el-form-item label="请求方法">
-              <span>{{ props.row.method }}</span>
-            </el-form-item>
-            <el-form-item label="请求参数">
-              <span>{{ props.row.params }}</span>
-            </el-form-item>
-          </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="time" label="请求耗时" align="center">
-        <template slot-scope="scope">
-          <el-tag v-if="scope.row.time <= 300">{{ scope.row.time }}ms</el-tag>
-          <el-tag v-else-if="scope.row.time <= 1000" type="warning">{{ scope.row.time }}ms</el-tag>
-          <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>
-    <!--分页组件-->
-    <pagination />
+    <div class="app-container container-wrap" style="min-height: calc(100vh - 242px)">
+      <span class="right-top-line" />
+      <span class="left-bottom-line" />
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" 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">
+              <el-form-item label="请求方法">
+                <span>{{ props.row.method }}</span>
+              </el-form-item>
+              <el-form-item label="请求参数">
+                <span>{{ props.row.params }}</span>
+              </el-form-item>
+            </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="time" label="请求耗时" align="center">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.time <= 300">{{ scope.row.time }}ms</el-tag>
+            <el-tag v-else-if="scope.row.time <= 1000" type="warning">{{ scope.row.time }}ms</el-tag>
+            <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>
+      <!--分页组件-->
+      <pagination />
+    </div>
+
   </div>
 </template>
 
@@ -96,7 +99,7 @@ export default {
 }
 </script>
 
-<style>
+<style lang="scss" scoped>
 .demo-table-expand {
   font-size: 0;
 }
@@ -112,4 +115,11 @@ export default {
 .demo-table-expand .el-form-item__content {
   font-size: 12px;
 }
+::v-deep .head-container{
+  display: flex;
+  padding-bottom: 0;
+}
+.head-search{
+  margin-bottom:0 ;
+}
 </style>
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 3455753..72aa843 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -1,7 +1,6 @@
 <template>
-  <div class="app-container container-wrap">
-    <span class="right-top-line" />
-    <span class="left-bottom-line" />
+  <div>
+
     <!--工具栏-->
     <div class="head-container">
       <div v-if="crud.props.searchToggle" class="head-search">
@@ -95,65 +94,69 @@
       </div>
     </el-dialog>
     <!--表格渲染-->
-    <el-table
-      ref="table"
-      v-loading="crud.loading"
-      lazy
-      :load="getMenus"
-      :data="crud.data"
-      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-      row-key="id"
-      @select="crud.selectChange"
-      @select-all="crud.selectAllChange"
-      @selection-change="crud.selectionChangeHandler"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column :show-overflow-tooltip="true" label="菜单标题" width="125px" prop="title" />
-      <el-table-column prop="icon" label="图标" align="center" width="60px">
-        <template slot-scope="scope">
-          <svg-icon :icon-class="scope.row.icon ? scope.row.icon : ''" />
-        </template>
-      </el-table-column>
-      <el-table-column prop="menuSort" align="center" label="排序">
-        <template slot-scope="scope">
-          {{ scope.row.menuSort }}
-        </template>
-      </el-table-column>
-      <el-table-column :show-overflow-tooltip="true" prop="permission" label="权限标识" />
-      <el-table-column :show-overflow-tooltip="true" prop="component" label="组件路径" />
-      <el-table-column prop="iFrame" label="外链" width="75px">
-        <template slot-scope="scope">
-          <span v-if="scope.row.iFrame">是</span>
-          <span v-else>否</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="cache" label="缓存" width="75px">
-        <template slot-scope="scope">
-          <span v-if="scope.row.cache">是</span>
-          <span v-else>否</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="hidden" label="可见" width="75px">
-        <template slot-scope="scope">
-          <span v-if="scope.row.hidden">否</span>
-          <span v-else>是</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="createTime" label="创建日期" width="150px">
-        <template slot-scope="scope">
-          <div>{{ scope.row.createTime | parseTime }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column v-if="checkPer(['admin','menu:edit','menu:del'])" label="操作" width="130px" align="center" fixed="right">
-        <template slot-scope="scope">
-          <udOperation
-            :data="scope.row"
-            :permission="permission"
-            msg="确定删除吗,如果存在下级节点则一并删除，此操作不能撤销！"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
+    <div class="app-container container-wrap" style="margin-top:0;min-height: calc(100vh - 292px);">
+      <span class="right-top-line" />
+      <span class="left-bottom-line" />
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        lazy
+        :load="getMenus"
+        :data="crud.data"
+        :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+        row-key="id"
+        @select="crud.selectChange"
+        @select-all="crud.selectAllChange"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column :show-overflow-tooltip="true" label="菜单标题" width="125px" prop="title" />
+        <el-table-column prop="icon" label="图标" align="center" width="60px">
+          <template slot-scope="scope">
+            <svg-icon :icon-class="scope.row.icon ? scope.row.icon : ''" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="menuSort" align="center" label="排序">
+          <template slot-scope="scope">
+            {{ scope.row.menuSort }}
+          </template>
+        </el-table-column>
+        <el-table-column :show-overflow-tooltip="true" prop="permission" label="权限标识" />
+        <el-table-column :show-overflow-tooltip="true" prop="component" label="组件路径" />
+        <el-table-column prop="iFrame" label="外链" width="75px">
+          <template slot-scope="scope">
+            <span v-if="scope.row.iFrame">是</span>
+            <span v-else>否</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="cache" label="缓存" width="75px">
+          <template slot-scope="scope">
+            <span v-if="scope.row.cache">是</span>
+            <span v-else>否</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="hidden" label="可见" width="75px">
+          <template slot-scope="scope">
+            <span v-if="scope.row.hidden">否</span>
+            <span v-else>是</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="createTime" label="创建日期" width="150px">
+          <template slot-scope="scope">
+            <div>{{ scope.row.createTime | parseTime }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="checkPer(['admin','menu:edit','menu:del'])" label="操作" width="130px" align="center" fixed="right">
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+              msg="确定删除吗,如果存在下级节点则一并删除，此操作不能撤销！"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
   </div>
 </template>
 
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 3ecd5d8..cd48e2c 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -54,14 +54,14 @@
     </el-dialog>
     <el-row :gutter="15">
       <!--角色管理-->
-      <el-col :xs="15" :sm="17" :md="18" :lg="19" :xl="19" style="margin-bottom: 10px">
+      <el-col :xs="15" :sm="17" :md="18" :lg="19" :xl="19">
         <el-card class="box-card" shadow="never">
           <span class="right-top-line" />
           <span class="left-bottom-line" />
           <div slot="header" class="clearfix">
             <span class="role-span">角色列表</span>
           </div>
-          <el-table ref="table" v-loading="crud.loading" highlight-current-row style="width: 100%;" :data="crud.data" @selection-change="crud.selectionChangeHandler" @current-change="handleCurrentChange">
+          <el-table ref="table" v-loading="crud.loading" highlight-current-row style="width: 100%;" height="calc(100vh - 400px)" :data="crud.data" @selection-change="crud.selectionChangeHandler" @current-change="handleCurrentChange">
             <el-table-column :selectable="checkboxT" type="selection" width="55" />
             <el-table-column prop="name" label="名称" />
             <el-table-column prop="dataScope" label="数据权限" />
@@ -88,7 +88,7 @@
       </el-col>
       <!-- 菜单授权 -->
       <el-col :xs="9" :sm="7" :md="6" :lg="5" :xl="5">
-        <el-card class="box-card" shadow="never">
+        <el-card class="box-card" shadow="never" style="min-height:calc(100vh - 292px)">
           <span class="right-top-line" />
           <span class="left-bottom-line" />
           <div slot="header" class="clearfix">
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index bc2c1f5..fdc68bb 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -26,11 +26,9 @@
         />
       </el-col>
       <!--用户数据-->
-      <el-col class="container-right" :xs="15" :sm="18" :md="19" :lg="20" :xl="20">
-        <span class="right-top-line" />
-        <span class="left-bottom-line" />
+      <el-col :xs="15" :sm="18" :md="19" :lg="20" :xl="20">
         <!--工具栏-->
-        <div class="head-container">
+        <div class="head-container" style="padding:20px 0">
           <div v-if="crud.props.searchToggle" class="head-search">
             <!-- 搜索 -->
             <el-input
@@ -65,137 +63,141 @@
           </div>
           <crudOperation show="" :permission="permission" />
         </div>
-        <!--表单渲染-->
-        <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title">
-          <span class="dialog-right-top" />
-          <span class="dialog-left-bottom" />
-          <div class="setting-dialog">
-            <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="66px">
-              <el-form-item label="用户名" prop="username">
-                <el-input v-model="form.username" @keydown.native="keydown($event)" />
-              </el-form-item>
-              <el-form-item label="电话" prop="phone">
-                <el-input v-model.number="form.phone" />
-              </el-form-item>
-              <el-form-item label="昵称" prop="nickName">
-                <el-input v-model="form.nickName" @keydown.native="keydown($event)" />
-              </el-form-item>
-              <el-form-item label="邮箱" prop="email">
-                <el-input v-model="form.email" />
-              </el-form-item>
-              <el-form-item label="部门" prop="dept.id">
-                <treeselect
-                  v-model="form.dept.id"
-                  :options="depts"
-                  :load-options="loadDepts"
-                  style="width: 184px"
-                  placeholder="选择部门"
-                />
-              </el-form-item>
-              <el-form-item label="岗位" prop="jobs">
-                <el-select
-                  v-model="jobDatas"
-                  style="width: 184px"
-                  multiple
-                  placeholder="请选择"
-                  @remove-tag="deleteTag"
-                  @change="changeJob"
-                >
-                  <el-option
-                    v-for="item in jobs"
-                    :key="item.name"
-                    :label="item.name"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-              <el-form-item label="性别">
-                <el-radio-group v-model="form.gender" style="width: 184px">
-                  <el-radio label="男">男</el-radio>
-                  <el-radio label="女">女</el-radio>
-                </el-radio-group>
-              </el-form-item>
-              <el-form-item label="状态">
-                <el-radio-group v-model="form.enabled" :disabled="form.id === user.id">
-                  <el-radio
-                    v-for="item in dict.user_status"
-                    :key="item.id"
-                    :label="item.value"
-                  >{{ item.label }}</el-radio>
-                </el-radio-group>
-              </el-form-item>
-              <el-form-item style="margin-bottom: 0;" label="角色" prop="roles">
-                <el-select
-                  v-model="roleDatas"
-                  style="width: 437px"
-                  multiple
-                  placeholder="请选择"
-                  @remove-tag="deleteTag"
-                  @change="changeRole"
-                >
-                  <el-option
-                    v-for="item in roles"
-                    :key="item.name"
-                    :disabled="level !== 1 && item.level <= level"
-                    :label="item.name"
-                    :value="item.id"
+        <div class="container-right" style="min-height: calc(100vh - 312px);">
+          <span class="right-top-line" />
+          <span class="left-bottom-line" />
+          <!--表单渲染-->
+          <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title">
+            <span class="dialog-right-top" />
+            <span class="dialog-left-bottom" />
+            <div class="setting-dialog">
+              <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="66px">
+                <el-form-item label="用户名" prop="username">
+                  <el-input v-model="form.username" @keydown.native="keydown($event)" />
+                </el-form-item>
+                <el-form-item label="电话" prop="phone">
+                  <el-input v-model.number="form.phone" />
+                </el-form-item>
+                <el-form-item label="昵称" prop="nickName">
+                  <el-input v-model="form.nickName" @keydown.native="keydown($event)" />
+                </el-form-item>
+                <el-form-item label="邮箱" prop="email">
+                  <el-input v-model="form.email" />
+                </el-form-item>
+                <el-form-item label="部门" prop="dept.id">
+                  <treeselect
+                    v-model="form.dept.id"
+                    :options="depts"
+                    :load-options="loadDepts"
+                    style="width: 184px"
+                    placeholder="选择部门"
                   />
-                </el-select>
-              </el-form-item>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-              <el-button type="text" @click="crud.cancelCU">取消</el-button>
-              <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+                </el-form-item>
+                <el-form-item label="岗位" prop="jobs">
+                  <el-select
+                    v-model="jobDatas"
+                    style="width: 184px"
+                    multiple
+                    placeholder="请选择"
+                    @remove-tag="deleteTag"
+                    @change="changeJob"
+                  >
+                    <el-option
+                      v-for="item in jobs"
+                      :key="item.name"
+                      :label="item.name"
+                      :value="item.id"
+                    />
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="性别">
+                  <el-radio-group v-model="form.gender" style="width: 184px">
+                    <el-radio label="男">男</el-radio>
+                    <el-radio label="女">女</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+                <el-form-item label="状态">
+                  <el-radio-group v-model="form.enabled" :disabled="form.id === user.id">
+                    <el-radio
+                      v-for="item in dict.user_status"
+                      :key="item.id"
+                      :label="item.value"
+                    >{{ item.label }}</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+                <el-form-item style="margin-bottom: 0;" label="角色" prop="roles">
+                  <el-select
+                    v-model="roleDatas"
+                    style="width: 437px"
+                    multiple
+                    placeholder="请选择"
+                    @remove-tag="deleteTag"
+                    @change="changeRole"
+                  >
+                    <el-option
+                      v-for="item in roles"
+                      :key="item.name"
+                      :disabled="level !== 1 && item.level <= level"
+                      :label="item.name"
+                      :value="item.id"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-form>
+              <div slot="footer" class="dialog-footer">
+                <el-button type="text" @click="crud.cancelCU">取消</el-button>
+                <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+              </div>
             </div>
-          </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="username" label="用户名" />
-          <el-table-column :show-overflow-tooltip="true" prop="nickName" label="昵称" />
-          <el-table-column prop="gender" label="性别" />
-          <el-table-column :show-overflow-tooltip="true" prop="phone" width="100" label="电话" />
-          <el-table-column :show-overflow-tooltip="true" width="135" prop="email" label="邮箱" />
-          <el-table-column :show-overflow-tooltip="true" prop="dept" label="部门">
-            <template slot-scope="scope">
-              <div>{{ scope.row.dept.name }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column label="状态" align="center" prop="enabled">
-            <template slot-scope="scope">
-              <el-switch
-                v-model="scope.row.enabled"
-                :disabled="user.id === scope.row.id"
-                active-color="#409EFF"
-                inactive-color="#F56C6C"
-                @change="changeEnabled(scope.row, scope.row.enabled)"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column :show-overflow-tooltip="true" prop="createTime" width="145" label="创建日期">
-            <template slot-scope="scope">
-              <div>{{ scope.row.createTime | parseTime }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            v-if="checkPer(['admin','user:edit','user:del'])"
-            label="操作"
-            width="120"
-            align="center"
-            fixed="right"
-          >
-            <template slot-scope="scope">
-              <udOperation
-                :data="scope.row"
-                :permission="permission"
-                :disabled-dle="scope.row.id === user.id"
-              />
-            </template>
-          </el-table-column>
-        </el-table>
-        <!--分页组件-->
-        <pagination />
+          </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="username" label="用户名" />
+            <el-table-column :show-overflow-tooltip="true" prop="nickName" label="昵称" />
+            <el-table-column prop="gender" label="性别" />
+            <el-table-column :show-overflow-tooltip="true" prop="phone" width="100" label="电话" />
+            <el-table-column :show-overflow-tooltip="true" width="135" prop="email" label="邮箱" />
+            <el-table-column :show-overflow-tooltip="true" prop="dept" label="部门">
+              <template slot-scope="scope">
+                <div>{{ scope.row.dept.name }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column label="状态" align="center" prop="enabled">
+              <template slot-scope="scope">
+                <el-switch
+                  v-model="scope.row.enabled"
+                  :disabled="user.id === scope.row.id"
+                  active-color="#409EFF"
+                  inactive-color="#F56C6C"
+                  @change="changeEnabled(scope.row, scope.row.enabled)"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column :show-overflow-tooltip="true" prop="createTime" width="145" label="创建日期">
+              <template slot-scope="scope">
+                <div>{{ scope.row.createTime | parseTime }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="checkPer(['admin','user:edit','user:del'])"
+              label="操作"
+              width="120"
+              align="center"
+              fixed="right"
+            >
+              <template slot-scope="scope">
+                <udOperation
+                  :data="scope.row"
+                  :permission="permission"
+                  :disabled-dle="scope.row.id === user.id"
+                />
+              </template>
+            </el-table-column>
+          </el-table>
+          <!--分页组件-->
+          <pagination />
+        </div>
       </el-col>
     </el-row>
   </div>