统一样式 工具栏放在框框外

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,6 +45,9 @@
         </div>
       </div>
     </el-dialog>
+    <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" />
@@ -55,6 +58,7 @@
       <!--分页组件-->
       <pagination />
     </div>
+  </div>
 </template>
 
 <script>

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="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>

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,6 +31,9 @@
       <rrOperation />
       <!-- <crudOperation :permission="permission" /> -->
     </div>
+    <div class="container-wrap" style="min-height: calc(100vh - 242px)">
+      <span class="right-top-line" />
+      <span class="left-bottom-line" />
       <!--表格渲染-->
       <el-table
         ref="table"
@@ -61,6 +62,9 @@
         <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>
 

src/views/components/field/index.vue

@@ -1,11 +1,13 @@
 <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>
+    <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" />
@@ -26,6 +28,7 @@
           </template>
         </el-table-column>
       </el-table>
+    </div>
     <!--表单渲染-->
     <eForm ref="eform" />
     <el-dialog title="关键提示" :visible.sync="verifyDialogVisible" :before-close="handleClose">

src/views/storeManage/deviceManage/index.vue

@@ -31,18 +31,21 @@
     </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="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">

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,6 +59,9 @@
       </div>
     </el-dialog>
     <!--表格渲染-->
+    <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"
@@ -103,6 +105,7 @@
         </el-table-column>
       </el-table>
     </div>
+  </div>
 </template>
 
 <script>

src/views/system/job/index.vue

@@ -1,13 +1,15 @@
 <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>
     <!--表格渲染-->
+    <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="名称" />
@@ -45,6 +47,7 @@
       </el-table>
       <!--分页组件-->
       <pagination />
+    </div>
     <!--表单渲染-->
     <eForm :job-status="dict.job_status" />
   </div>

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,6 +16,9 @@
         </el-button>
       </crudOperation>
     </div>
+    <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">
@@ -49,6 +51,7 @@
       <!--分页组件-->
       <pagination />
     </div>
+  </div>
 </template>
 
 <script>
@@ -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>

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,6 +16,9 @@
       </crudOperation>
     </div>
     <!--表格渲染-->
+    <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">
@@ -48,6 +49,8 @@
       <!--分页组件-->
       <pagination />
     </div>
+
+  </div>
 </template>
 
 <script>
@@ -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>

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,6 +94,9 @@
       </div>
     </el-dialog>
     <!--表格渲染-->
+    <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"
@@ -155,6 +157,7 @@
         </el-table-column>
       </el-table>
     </div>
+  </div>
 </template>
 
 <script>

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">

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,6 +63,9 @@
           </div>
           <crudOperation show="" :permission="permission" />
         </div>
+        <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" />
@@ -196,6 +197,7 @@
           </el-table>
           <!--分页组件-->
           <pagination />
+        </div>
       </el-col>
     </el-row>
   </div>