From 017886be8a6c07ccaaf6300b8c7652ddbd41d734 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 15 一月 2024 16:50:08 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/mdc/base/modules/DeviceProcessReport/DeviceProcessReportList.vue | 144 +++++++++++++++--------------------------------
1 files changed, 46 insertions(+), 98 deletions(-)
diff --git a/src/views/mdc/base/modules/DeviceProcessReport/DeviceProcessReportList.vue b/src/views/mdc/base/modules/DeviceProcessReport/DeviceProcessReportList.vue
index a4b39d9..3f87906 100644
--- a/src/views/mdc/base/modules/DeviceProcessReport/DeviceProcessReportList.vue
+++ b/src/views/mdc/base/modules/DeviceProcessReport/DeviceProcessReportList.vue
@@ -1,6 +1,5 @@
<template>
- <div style="width: 100%;">
- <div :bordered="false">
+ <div class="device_list">
<!-- 鏌ヨ鍖哄煙 -->
<div class="seach-content">
<div class="table-page-search-wrapper">
@@ -17,7 +16,7 @@
</a-form-item>
</a-col>
- <a-col :md="5" :sm="5" :xs="5">
+ <a-col :md="7" :sm="7" :xs="7">
<a-form-item label="鏃堕棿">
<a-range-picker
:placeholder="['寮�濮嬫椂闂�', '缁撴潫鏃堕棿']"
@@ -41,12 +40,10 @@
</div>
</div>
- <div class="container" id="EfficiencyShift" style="margin-top: 20px;">
- <div class="table2">
- <a-table :columns="columns" :dataSource="dataSource.records" :pagination="false" bordered>
- <span slot="duration" slot-scope="text">{{getFormattedTime(text)}}</span>
- </a-table>
- </div>
+ <div class="container" id="EfficiencyShift" style="flex:1;overflow: hidden">
+ <a-table :columns="columns" rowKey="equipmentId" :dataSource="dataSource.records" :scroll="{x:'max-content',y:scrollY}" :pagination="false" bordered>
+ <span slot="duration" slot-scope="text">{{getFormattedTime(text)}}</span>
+ </a-table>
</div>
<div class="pagination">
<a-pagination
@@ -61,7 +58,6 @@
@showSizeChange="handlePageSizeChange"
/>
</div>
- </div>
</div>
</template>
@@ -83,7 +79,7 @@
typeEquipment: 1,
allowClear: true,
allowClearSu: true,
- dates: [moment(), moment()],
+ dates: [moment().subtract('days', 1), moment().subtract('days', 1)],
identifying: [],
queryParam: {
pageSize: 20,
@@ -151,7 +147,8 @@
}
],
dataSource: [],
- driveTypeList: []
+ driveTypeList: [],
+ scrollY:465
}
},
props: { nodeTree: '', Type: '', nodePeople: '' },
@@ -161,6 +158,13 @@
this.queryParam.typeTree = '1'
this.loadData()
this.getDriveTypeByApi()
+ },
+ mounted(){
+ window.addEventListener('resize',this.handleWindowResize)
+ this.handleWindowResize()
+ },
+ beforeDestroy(){
+ window.removeEventListener('resize',this.handleWindowResize)
},
watch: {
Type(valmath) {
@@ -328,112 +332,56 @@
return (
option.componentOptions.children[0].text.toUpperCase().indexOf(input.toUpperCase()) >= 0
)
+ },
+
+ /**
+ * 褰撴祻瑙堝櫒鍙绐楀彛灏哄鍙戠敓鏀瑰彉鏃惰Е鍙�
+ */
+ handleWindowResize(){
+ const boxHeight = +window.getComputedStyle(document.getElementById('EfficiencyShift')).height.slice(0,-2)
+ const tableHeadHeight = +window.getComputedStyle(document.querySelector('.ant-table-thead th')).height.slice(0,-2)
+ this.scrollY = boxHeight - tableHeadHeight
}
}
}
</script>
<style scoped>
- .table2 {
- width: 100%;
- height: 100%;
- overflow: auto;
- }
-
.pagination {
display: flex;
justify-content: end;
margin: 20px 0;
}
- @media screen and (min-width: 1920px) {
- #EfficiencyShift {
- height: 670px !important;
- overflow: scroll;
+ .device_list{
+ overflow: hidden;
+ display: flex;
+ flex-direction: column;
+ }
+
+ @media screen and (min-width: 1920px){
+ .device_list{
+ height: 811px!important;
}
}
-
- @media screen and (min-width: 1680px) and (max-width: 1920px) {
- #EfficiencyShift {
- height: 670px !important;
- overflow: scroll;
+ @media screen and (min-width: 1680px) and (max-width: 1920px){
+ .device_list{
+ height: 811px!important;
}
}
-
- @media screen and (min-width: 1400px) and (max-width: 1680px) {
- #EfficiencyShift {
- height: 522px !important;
- overflow: scroll;
+ @media screen and (min-width: 1400px) and (max-width: 1680px){
+ .device_list{
+ height: 663px!important;
}
}
-
- @media screen and (min-width: 1280px) and (max-width: 1400px) {
- #EfficiencyShift {
- height: 414px !important;
- overflow: scroll;
+ @media screen and (min-width: 1280px) and (max-width: 1400px){
+ .device_list{
+ height: 564px!important;
}
}
-
- @media screen and (max-width: 1280px) {
- #EfficiencyShift {
- height: 414px !important;
- overflow: scroll;
+ @media screen and (max-width: 1280px){
+ .device_list{
+ height: 564px!important;
}
- }
-
- .identifyingclass {
- width: 55px;
- height: 15px;
- display: inline-block
- }
-
- .dataContent {
- white-space: nowrap;
- /*margin: 0;*/
- /*border: none;*/
- border-collapse: separate;
- border-spacing: 0;
- /*table-layout: fixed;*/
- border: 1px solid #ccc;
- /*border: 1px solid #ccc;*/
- width: 100%;
- /*height: 100%;*/
- /*overflow: hidden;*/
- /*overflow-y: auto;*/
- text-align: center;
- }
-
- .dataContent .fixed th {
- width: 50px;
- }
-
- .dataContent .thead th {
- background-color: #fafafa;
- text-align: center;
- height: 30px;
- padding: 5px;
- }
-
- .dataContent .notfixed th {
- width: auto;
- }
-
- /*.dataContent tr td {*/
- /*height: 35px*/
- /*}*/
-
- .dataContent .mathData td {
- padding: 10px;
- /*display: none;*/
- }
-
- .dataContent .mathData .td {
- /*background-color: #ff9bd2;*/
- display: inline-block;
- padding: 10px;
- }
-
- .dataContent .mathData .tdd {
- /*display: none;*/
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3