ソースを参照

设备清单样式修改

zhangyu 5 年 前
コミット
6aef68e8a7

+ 2 - 2
src/assets/style/style.scss

@@ -8,8 +8,8 @@
 
 .right {
     text-align: right;
-    background: #f2f2f2;
-    padding-top: 11px;
+    background: #fff;
+    padding-top: 10px;
 }
 
 .right-nobg {

+ 4 - 2
src/components/common/myPagination.vue

@@ -15,7 +15,6 @@
         :current-page.sync="page.currentPage"
         :page-sizes="page.sizes"
         :page-size="page.size"
-        :small="true"
         :layout=" isSmall ? 'total, sizes, prev, pager, next, jumper' : 'prev, pager, next'"
         :total="page.total">
         </el-pagination>
@@ -52,7 +51,10 @@ export default {
 };
 </script>
 <style>
+.el-pagination button, .el-pagination span:not([class*=suffix]) {
+    vertical-align: middle;
+}
 .block{
-  margin-top: 5px;
+  /* margin-top: 5px; */
 }
 </style>

+ 1 - 1
src/components/ledger/handsontables/assets.vue

@@ -1270,7 +1270,7 @@ http://47.94.89.44:8058/asset?id=${infos.id}&pid=${this.projectId}&secret=${this
   padding: 5px 10px;
   font-size: 14px;
   overflow: hidden;
-  margin-top: 10px;
+  // margin-top: 10px;
   line-height: 40px;
   .iconfont {
     font-size: 12px;

+ 4 - 4
src/components/ledger/handsontables/device.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="height: 94%;">
+  <div style="height: calc(100% - 44.5px);padding: 0px 10px 10px;box-sizing: border-box;">
     <div class="hanson-bar">
       <span
         style="width:20px;float:left;display:block;height:20px;cursor: pointer;"
@@ -114,7 +114,7 @@
         
         
     
-    <div v-show="mess.deviceId && main && main.length" v-loading="loading" id="handsontable" ref="handsontable" style="margin-left:10px"></div>
+    <div v-show="mess.deviceId && main && main.length" v-loading="loading" id="handsontable" ref="handsontable"></div>
     <div  v-show="mess.deviceId && main && main.length" class="right">
         <my-pagination @change="getMain" :page="page"></my-pagination>
     </div>
@@ -833,7 +833,7 @@ export default {
         columns: this.getType(this.headers), //数据显示格式
         filters: true,
         maxRows: this.main.length,
-        height: winHeight - 100 - 50 - 200,
+        height: winHeight - 335,
         columnSorting: true, //添加排序
         sortIndicator: true, //添加排序
         renderAllRows: true,
@@ -1345,7 +1345,7 @@ export default {
   padding: 5px 10px;
   font-size: 14px;
   overflow: hidden;
-  margin-top: 10px;
+  // margin-top: 10px;
   line-height: 40px;
   .iconfont {
     font-size: 12px;

+ 4 - 2
src/components/ledger/lib/myPagination.vue

@@ -15,7 +15,6 @@
         :current-page.sync="page.currentPage"
         :page-sizes="page.sizes"
         :page-size="page.size"
-        :small="true"
         :layout=" isSmall ? 'total, sizes, prev, pager, next, jumper' : 'prev, pager, next'"
         :total="page.total">
         </el-pagination>
@@ -52,7 +51,10 @@ export default {
 };
 </script>
 <style>
+.el-pagination button, .el-pagination span:not([class*=suffix]) {
+    vertical-align: middle;
+}
 .block{
-  margin-top: 5px;
+  /* margin-top: 5px; */
 }
 </style>

+ 4 - 1
src/views/ledger/cenotelist/index.vue

@@ -4,7 +4,7 @@
       <cenote-type @change="changeFloor"></cenote-type>
     </div>
     <el-row class="right">
-      <span style="float:left;">当前筛选条件下共{{page.total || '--'}}设备</span>
+      <span style="float:left;">当前筛选条件下共{{page.total || '--'}}竖井</span>
       <el-select v-model="onlyRead" @change="getTableHeader" style="width:100px;margin-right:10px;vertical-align:bottom;">
         <el-option
           v-for="item in options"
@@ -454,4 +454,7 @@ export default {
     }
   }
 }
+.el-pagination button, .el-pagination span:not([class*=suffix]) {
+    vertical-align: middle;
+}
 </style>

+ 3 - 3
src/views/ledger/facility/index.vue

@@ -191,17 +191,17 @@ export default {
 #deviceList {
   overflow: hidden;
   height: 100%;
-  background-color: #f6f6f6;
+  background-color: #fff;
   position: relative;
   .table-main {
     position: absolute;
     top: 87px;
-    bottom: 10px;
+    bottom: 0;
     left: 0;
     right: 0;
     background-color: #fff;
     // border-radius: 5px;
-    padding: 10px 0;
+    // padding: 10px 0;
   }
   .search-header {
     overflow: hidden;

+ 4 - 1
src/views/rent/rentlist/index.vue

@@ -137,7 +137,7 @@ export default {
     },
     async getTableData() {//获取表格数据
       let data = {
-        // Filters: `ProjectId='${this.projectId}'`, //项目id条件筛选
+        Filters: `ProjectId='${this.projectId}'`,
         PageNumber: this.page.pageNumber,
         PageSize: this.page.pageSize
       }
@@ -474,4 +474,7 @@ export default {
     }
   }
 }
+.el-pagination button, .el-pagination span:not([class*=suffix]) {
+    vertical-align: middle;
+}
 </style>