From 60bc0411894c39aafab981d235300bf2dca1cd02 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期四, 11 四月 2024 09:17:33 +0800
Subject: [PATCH] 1、设备利用率、设备开动率以及班次利用率页面查询条件多选框删除至少选择第一项条件的限制条件，即可一项条件都不选 2、设备利用率、设备开动率以及班次利用率页面表格高度设置为页面进入时即可拖动水平滚动条的高度
---
src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue | 103 ++++++++++++++-------------------------------------
1 files changed, 28 insertions(+), 75 deletions(-)
diff --git a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
index 40a627a..a1bcedd 100644
--- a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
+++ b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
@@ -56,7 +56,8 @@
<a-col :md="2" :sm="2">
<a
@click="toggleSearchStatus=!toggleSearchStatus"
- style="display:block;height: 32px;display: flex;align-items: center"
+ @selectstart="$event.preventDefault()"
+ style="display: inline-block;height: 32px;line-height: 32px"
>
{{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
@@ -109,18 +110,6 @@
</a-row>
</a-form>
</div>
- <!--<div style="width: 530px;position:absolute;top: 10px; right: 0;">-->
- <!--<table cellpadding="5" cellspacing="1" style="border: 1px solid darkgray;">-->
- <!--<tr>-->
- <!--<td v-for="(item, index) in identifying">{{item.title}}</td>-->
- <!--</tr>-->
- <!--<tr>-->
- <!--<td style="text-align:center;" v-for="(item, index) in identifying">-->
- <!--<div class="identifyingclass" :style="{background: item.color}"></div>-->
- <!--</td>-->
- <!--</tr>-->
- <!--</table>-->
- <!--</div>-->
</div>
<a-spin :spinning="spinning">
<div class="container" id="EfficiencyShift" style="margin-top: 20px;">
@@ -129,7 +118,7 @@
v-if="dataList.length>0">
<thead>
<tr class="thead fixed equipname">
- <th class="thgu dong1 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;">鍏徃</th>
+ <th class="thgu dong1 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;height: 66px">鍏徃</th>
<th class="thgu dong2 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;">杞﹂棿</th>
<th class="thgu dong3 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;">宸ユ</th>
<th class="thgu dong4 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧缂栧彿
@@ -142,18 +131,11 @@
<template v-for="(tableHead, index) in tableHeads">
<th class="timeth" :colspan="checkedList.length">{{tableHead}}</th>
</template>
- <!--average-->
- <!--<th class="thgu dong4 name" rowspan="2" style="min-width: 100px; max-width: 150px;width: 150px;">骞冲潎鍊�(鐝鍒╃敤鐜�)</th>-->
</tr>
<tr class="thead notfixed gudingth">
<template v-for="(tableHead, index) in tableHeads">
- <th>鐝鍒╃敤鐜�(%)</th>
- <!--<th v-if="checkedList.indexOf('gzl') > -1">鏁呴殰鐜�(%)</th>-->
- <!--<th v-if="checkedList.indexOf('processingLong') > -1">杩愯鏃堕棿(s)</th>-->
- <!--<th v-if="checkedList.indexOf('totalLong') > -1">鏈夋晥鏃堕棿(s)</th>-->
- <!--<th v-if="checkedList.indexOf('faultLong') > -1">鏁呴殰鏃堕棿(s)</th>-->
- <!--<!–<th v-if="checkedList.indexOf('gjsj') > -1">鍏虫満鏃堕棿(s)</th>–>-->
+ <th v-if="checkedList.indexOf('lyl') > -1">鐝鍒╃敤鐜�(%)</th>
<th v-if="checkedList.indexOf('kjsj') > -1">寮�鏈烘椂闂�(灏忔椂)</th>
<th v-if="checkedList.indexOf('jgsj') > -1">鍔犲伐鏃堕棿(灏忔椂)</th>
<th v-if="checkedList.indexOf('djsj') > -1">寰呮満鏃堕棿(灏忔椂)</th>
@@ -195,16 +177,7 @@
</template>
<!--<td>{{item.tierType}}</td>-->
<template v-for="(tableHead, index) in item.dataList">
- <!--<td :style="{background:tableHead.color }" v-if='tableHead.utilizationRate !== 0'>{{tableHead.utilizationRate | numFilter}}</td>-->
- <!--<td :style="{background:tableHead.color }" v-if='tableHead.lyl == 0 && tableHead.status == 1'>缁翠慨</td>-->
- <!--<td :style="{background:tableHead.color }" v-if='tableHead.lyl == 0 && tableHead.status == 2'>浼戠彮</td>-->
- <!--<td :style="{background:tableHead.color }" v-if='tableHead.lyl == 0 && tableHead.status == 10'>{{tableHead.lyl | numFilter}}</td>-->
- <!--<td :style="{background:tableHead.color }" v-if='tableHead.lyl == 0 && tableHead.status == 11'>鏈绠�</td>-->
- <!--<td :style="{background:tableHead.color }" v-if='tableHead.lyl == 0 && tableHead.status == 12'>鏃犵彮娆�</td>-->
- <td :style="{background:tableHead.color }">{{tableHead.utilizationRate | numFilter}}</td>
- <!--<td :style="{background:tableHead.color }" v-if="checkedList.indexOf('gzl') > -1">-->
- <!--{{tableHead.gzl | numFilter}}-->
- <!--</td>-->
+ <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('lyl') > -1">{{tableHead.utilizationRate | numFilter}}</td>
<td :style="{background:tableHead.color }" v-if="checkedList.indexOf('kjsj') > -1">
{{tableHead.openLong | getFormattedTime}}
</td>
@@ -217,11 +190,7 @@
<td :style="{background:tableHead.color }" v-if="checkedList.indexOf('gjsj') > -1">
{{tableHead.closeLong | getFormattedTime}}
</td>
- <!--<td :style="{background:item[tableHead].color }" v-if="checkedList.indexOf('gjsj') > -1">-->
- <!--{{item[tableHead].gjsj}}-->
- <!--</td>-->
</template>
- <!--<td :style="{background:item.average.color }" >{{item.average.lyl | numFilter}}</td>-->
</tr>
</tbody>
</table>
@@ -296,6 +265,10 @@
this.loadData()
this.queryGroup()
this.getDriveTypeByApi()
+ },
+ mounted() {
+ window.addEventListener('resize', this.handleWindowResize)
+ this.handleWindowResize()
},
watch: {
Type(valmath) {
@@ -517,15 +490,15 @@
// if(!this.queryParam.startTime&&!this.queryParam.endTime)this.searchReset()
},
efficiencyOptionsOnChange(checkedList) {
- let index = checkedList.indexOf('lyl')
- if (index < 0) {
- // this.$message.warn('涓嶈兘鍙栨秷鏌ヨ鍒╃敤鐜�')
- this.$notification.warning({
- message: '娑堟伅',
- description: '涓嶈兘鍙栨秷鏌ヨ鐝鍒╃敤鐜�'
- })
- return false
- }
+ // let index = checkedList.indexOf('lyl')
+ // if (index < 0) {
+ // // this.$message.warn('涓嶈兘鍙栨秷鏌ヨ鍒╃敤鐜�')
+ // this.$notification.warning({
+ // message: '娑堟伅',
+ // description: '涓嶈兘鍙栨秷鏌ヨ鐝鍒╃敤鐜�'
+ // })
+ // return false
+ // }
this.checkedList = checkedList
},
searchQuery() {
@@ -615,6 +588,16 @@
return (
option.componentOptions.children[0].text.toUpperCase().indexOf(input.toUpperCase()) >= 0
)
+ },
+
+ /**
+ * 鍒嗚鲸鐜囨敼鍙樻椂鍚屾椂鏀瑰彉琛ㄦ牸楂樺害宸蹭繚璇侀椤典竴杩涘叆涓嶆嫋鍔ㄥ瀭鐩存粴鍔ㄦ潯鏃跺嵆鍙嫋鍔ㄨ〃鏍兼按骞虫粴鍔ㄦ潯
+ */
+ handleWindowResize() {
+ const tableContainer = document.getElementById('EfficiencyShift')
+ const clientHeight = document.body.clientHeight
+ const containerTopToClientTopHeight = tableContainer.getBoundingClientRect().top
+ tableContainer.style.height = (clientHeight - containerTopToClientTopHeight - 32) + 'px'
}
}
}
@@ -736,36 +719,6 @@
#EfficiencyShift {
overflow: hidden;
- }
-
- @media screen and (min-width: 1920px) {
- #EfficiencyShift {
- height: 670px !important;
- }
- }
-
- @media screen and (min-width: 1680px) and (max-width: 1920px) {
- #EfficiencyShift {
- height: 670px !important;
- }
- }
-
- @media screen and (min-width: 1400px) and (max-width: 1680px) {
- #EfficiencyShift {
- height: 522px !important;
- }
- }
-
- @media screen and (min-width: 1280px) and (max-width: 1400px) {
- #EfficiencyShift {
- height: 414px !important;
- }
- }
-
- @media screen and (max-width: 1280px) {
- #EfficiencyShift {
- height: 414px !important;
- }
}
.identifyingclass {
--
Gitblit v1.9.3