From 7f6af6907202cb7c9395a7020d249bd62e17d50f Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 05 一月 2024 17:59:17 +0800
Subject: [PATCH] 1、解决车间看板页面因浏览器兼容性问题导致的样式不适配问题（使用浏览器86版本与其他版本做对比） 2、优化车间看板页面代码，将看板拖拽区域设置高度后再设置限制拖拽以试图解决进入页面后有概率设备无法自由拖拽问题（猜想因父子组件渲染顺序导致，父组件还未渲染完成，子组件就已限制区域，此时区域高度可能0，未在现场调试，本地调试无问题） 3、优化设备利用率、开动率及班次利用率页面代码，解决因浏览器版本问题导致表格前3列文字无法垂直排列导致的布局问题以及调整右上角区间展示区域为响应式布局
---
src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue | 210 ++++++++++++++++++++++++++++++----------------------
1 files changed, 120 insertions(+), 90 deletions(-)
diff --git a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
index 522f636..96b3752 100644
--- a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
+++ b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
@@ -39,20 +39,18 @@
</a-select>
</a-form-item>
</a-col>
- </a-row>
- <a-row :gutter="24">
- <a-col :md="9" :sm="9" :xs="9">
- <a-checkbox-group :value="checkedList" :default-value="['lyl']" :options="efficiencyOptions"
- @change="efficiencyOptionsOnChange"/>
- </a-col>
- <a-col :md="5" :sm="5">
+ <a-col :md="7" :sm="7" :xs="7">
<a-space>
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
<a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
<a-button type="primary" @click="exportExcel" icon="download">瀵煎嚭</a-button>
</a-space>
</a-col>
- <a-col :md="10" :sm="10">
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :md="24" :sm="24" :xs="24" style="display: flex;justify-content: space-between">
+ <a-checkbox-group :value="checkedList" :default-value="['lyl']" :options="efficiencyOptions"
+ @change="efficiencyOptionsOnChange"/>
<table cellpadding="5" cellspacing="1" style="border: 1px solid darkgray;">
<tr>
<td v-for="(item, index) in identifying">{{item.title}}</td>
@@ -80,87 +78,102 @@
<!--</table>-->
<!--</div>-->
</div>
- <div class="container" id="EfficiencyShift" style="margin-top: 20px;">
- <div class="table2">
- <table class="dataContent table" border="1" cellspacing="0" cellpadding="0" style="white-space: nowrap">
- <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 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;">璁惧缂栧彿</th>
- <th class="thgu dong5 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">璁惧鍚嶇О</th>
- <th class="thgu dong6 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧绫诲瀷</th>
- <th class="thgu dong7 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">鐝</th>
- <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>-->
+ <a-spin :spinning="spinning">
+ <div class="container" id="EfficiencyShift" style="margin-top: 20px;">
+ <div class="table2">
+ <table class="dataContent table" border="1" cellspacing="0" cellpadding="0" style="white-space: nowrap" 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 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;">璁惧缂栧彿</th>
+ <th class="thgu dong5 name" rowspan="2" style="min-width: 162px; max-width: 162px;width: 162px;">璁惧鍚嶇О</th>
+ <th class="thgu dong6 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧绫诲瀷</th>
+ <th class="thgu dong7 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">鐝</th>
+ <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('kjsj') > -1">寮�鏈烘椂闂�(s)</th>
- <th v-if="checkedList.indexOf('jgsj') > -1">鍔犲伐鏃堕棿(s)</th>
- <th v-if="checkedList.indexOf('djsj') > -1">寰呮満鏃堕棿(s)</th>
- <th v-if="checkedList.indexOf('gjsj') > -1">鍏虫満鏃堕棿(s)</th>
- </template>
- </tr>
-<!-- <tr>-->
-<!-- <th rowspan="2">骞冲潎鍊�</th>-->
-<!-- </tr>-->
- </thead>
- <tbody>
- <tr class="mathData" v-for="(item, index) in dataList">
- <td class="tdgu kaitou wenzi" :rowspan="item.level1span" :class="{hidden: item.level1dis,noExl:item.level1dis}" v-show="!item.level1dis">{{item.level1}}</td>
- <td class="tdgu1 kaitou wenzi" :rowspan="item.level2span" :class="{hidden: item.level2dis,noExl:item.level2dis}" v-show="!item.level2dis">{{item.level2}}</td>
- <td class="tdgu2 kaitou wenzi" :rowspan="item.level3span" :class="{hidden: item.level3dis,noExl:item.level3dis}" v-show="!item.level3dis">{{item.level3}}</td>
- <td class="tdgu3 kaitou">{{item.equipmentId}}</td>
- <td class="tdgu4 kaitou">{{item.equipmentName}}</td>
- <td class="tdgu5 kaitou">{{item.equipmentType}}</td>
- <td class="tdgu6 kaitou">{{item.shiftSubName}}</td>
+ </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('kjsj') > -1">寮�鏈烘椂闂�(灏忔椂)</th>
+ <th v-if="checkedList.indexOf('jgsj') > -1">鍔犲伐鏃堕棿(灏忔椂)</th>
+ <th v-if="checkedList.indexOf('djsj') > -1">寰呮満鏃堕棿(灏忔椂)</th>
+ <th v-if="checkedList.indexOf('gjsj') > -1">鍏虫満鏃堕棿(灏忔椂)</th>
+ </template>
+ </tr>
+ </thead>
+ <tbody>
+ <tr class="mathData" v-for="(item, index) in dataList">
+ <template v-if="item.level1!=='鍚堣'&&item.level1!=='骞冲潎鍊�'">
+ <td class="tdgu kaitou" :rowspan="item.level1span" :class="{hidden: item.level1dis,noExl:item.level1dis}" v-show="!item.level1dis">
+ <div class="wenzi">
+ {{item.level1}}
+ </div></td>
+ <td class="tdgu1 kaitou" :rowspan="item.level2span" :class="{hidden: item.level2dis,noExl:item.level2dis}" v-show="!item.level2dis">
+ <div class="wenzi">
+ {{item.level2}}
+ </div>
+ </td>
+ <td class="tdgu2 kaitou" :rowspan="item.level3span" :class="{hidden: item.level3dis,noExl:item.level3dis}" v-show="!item.level3dis">
+ <div class="wenzi">
+ {{item.level3}}
+ </div>
+ </td>
+ <td class="tdgu3 kaitou">{{item.equipmentId}}</td>
+ <td class="tdgu4 kaitou" style="min-width: 162px; max-width: 162px;width: 162px;">{{item.equipmentName}}</td>
+ <td class="tdgu5 kaitou">{{item.equipmentType}}</td>
+ <td class="tdgu6 kaitou">{{item.shiftSubName}}</td>
+ </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">-->
+ <template v-else>
+ <td colspan="7" class="tdgu kaitou">{{item.level1}}</td>
+ </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('kjsj') > -1">
- {{tableHead.openLong}}
- </td>
- <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('jgsj') > -1">
- {{tableHead.processLong}}
- </td>
- <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('djsj') > -1">
- {{tableHead.waitLong}}
- </td>
- <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('gjsj') > -1">
- {{tableHead.closeLong}}
- </td>
- <!--<td :style="{background:item[tableHead].color }" v-if="checkedList.indexOf('gjsj') > -1">-->
+ <!--</td>-->
+ <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('kjsj') > -1">
+ {{tableHead.openLong | getFormattedTime}}
+ </td>
+ <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('jgsj') > -1">
+ {{tableHead.processLong | getFormattedTime}}
+ </td>
+ <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('djsj') > -1">
+ {{tableHead.waitLong | getFormattedTime}}
+ </td>
+ <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>
+ <!--</td>-->
+ </template>
+ <!--<td :style="{background:item.average.color }" >{{item.average.lyl | numFilter}}</td>-->
+ </tr>
+ </tbody>
+ </table>
+ </div>
</div>
- </div>
+ </a-spin>
</div>
</div>
</template>
@@ -210,7 +223,8 @@
},
tableHeads: [],
shiftList: [],
- shiftSubList: []
+ shiftSubList: [],
+ spinning:false
}
},
props: { nodeTree: '', Type:'',nodePeople: '' },
@@ -262,7 +276,20 @@
} else {
return '0'
}
- }
+ },
+
+ /**
+ * 鏍煎紡鍖栨椂闂�
+ * @param seconds 绉掓暟
+ * @returns '' 鏍煎紡鍖栧悗鏃堕棿瀛楃涓�
+ */
+ getFormattedTime(seconds) {
+ if (seconds) {
+ return parseFloat((seconds / 3600).toFixed(2))
+ } else {
+ return '0'
+ }
+ },
},
methods: {
checkSameData(dataList){
@@ -474,6 +501,7 @@
// this.onClearSelected()
},
loadData() {
+ this.spinning=true
this.tableHeads = []
this.dataList = []
getAction(this.url.list, this.queryParam).then(res => {
@@ -486,6 +514,8 @@
this.combineCell();
// this.initDeviceType(this.dataList)
}
+ }).finally(()=>{
+ this.spinning=false
})
},
queryGroup() {
@@ -554,12 +584,12 @@
}
.table tbody tr .tdgu5{
position: sticky;
- left: 400px;
+ left: 412px;
z-index: 2;
}
.table tbody tr .tdgu6{
position: sticky;
- left: 500px;
+ left: 512px;
z-index: 2;
}
@@ -600,11 +630,11 @@
}
.table2 thead .equipname .dong6{
z-index: 5;
- left: 400px;
+ left: 412px;
}
.table2 thead .equipname .dong7{
z-index: 6;
- left: 500px;
+ left: 512px;
}
@media screen and (min-width: 1920px){
--
Gitblit v1.9.3