Merge branch 'master' of http://git.2weisou.com/liumin/zkPCproject

src/const/crud/admin/log.js

@@ -15,6 +15,7 @@ export const tableOption = {
   addBtn: false,
   editBtn: false,
   viewBtn: true,
+  size: "small",
   column: [
     {
       label: "操作人",
@@ -28,6 +29,7 @@ export const tableOption = {
     },
     {
       label: "终端",
+      width: 180,
       prop: "title"
     },
     {

src/views/Equipment/state.vue

@@ -352,8 +352,7 @@
         stripe
         @selection-change="handleSelectionChange"
         style="width: 100%"
-         height="390"
-         :header-cell-style="{background:'#F5F7FA',color:'#333333'}"
+        :header-cell-style="{background:'#F5F7FA',color:'#333333'}"
       >
         <el-table-column type="selection" width="55"> </el-table-column>
         <el-table-column type="index" label="序号" align="center">
@@ -834,7 +833,7 @@ export default {
       },
       receiveVisible: false,
       currentPage: 1,
-      size: 30,
+      size: 10,
       total: 10,
       value: "",
       input: "",

src/views/ReceivingRecords/index.vue

@@ -29,7 +29,6 @@
       <div class="app-titel">
         <div
           class="label"
-          style="color: #32363d; font-weight: 400; font-size: 16px"
         >
           筛选时间：
         </div>

src/views/Statistics/BuildingContrast.vue

@@ -737,8 +737,7 @@ export default {
   width: 100%;
   padding: 15px;
   background: #ffffff;
-  // margin-top: 15px;
-  margin-top: 80px;
+  margin-top: 75px;
 }
 
 .tophove {

src/views/Statistics/ConsultantBrand.vue

@@ -1250,7 +1250,6 @@ export default {
 
 .app-box-san {
   width: 100%;
-  min-height: 400px;
   display: flex;
   margin-top: 15px;
   .zuo {

src/views/Statistics/ReceptionOverview.vue

@@ -88,7 +88,7 @@
     <!-- 二 -->
     <div
       class="app-box-er"
-      :style="{ 'margin-top': role != 3 ? '110px' : '70px' }"
+      :style="{ 'margin-top': role != 3 ? '110px' : '65px' }"
     >
       <div class="container tabcard">
         <el-card shadow="hover" :class="{ tophovese: cardindex == 4 }">
@@ -1817,9 +1817,8 @@ export default {
 
 .box-center {
   width: 100%;
-  padding: 15px;
+  padding: 15px 15px 50px;
   min-width: 1000px;
-  padding-bottom: 100px;
 }
 
 .noflex {
@@ -2095,7 +2094,7 @@ export default {
   background: #ffffff;
   box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.04);
   border-radius: 4px;
-  margin-top: 100px;
+  margin-top: 65px;
   padding: 15px;
 }
 

src/views/admin/dept/index.vue

@@ -47,8 +47,8 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="currentPage4"
-          :page-sizes="[6, 12, 18, 24]"
-          :page-size="30"
+          :page-sizes="[10, 20, 30, 50,100]"
+          :page-size="size"
           layout="total, sizes, prev, pager, next, jumper"
           :total="total"
         >
@@ -137,7 +137,7 @@ export default {
       houseId: "",
       houseList: [],
       Page: 1,
-      size: 6,
+      size: 10,
       words: "",
       total: 0,
       ruleser: {

src/views/admin/user/index.vue

@@ -1086,7 +1086,7 @@ export default {
       page1: {
         total: 0, // 总页数
         current: 1, // 当前页数
-        size: 30, // 每页显示多少条,
+        size: 10, // 每页显示多少条,
         isAsc: false, // 是否倒序
       },
       list: [],