From 4ef0342708910d02453fdcfae2148eadbf6d7004 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 05 六月 2024 11:34:21 +0800
Subject: [PATCH] 1、设备综合效率分析页面表格列属性ellipsis开启后内容若超出盒子宽度则出现与表头错位现象，而无法实现ellipsis开启后内容超出单元格则省略功能，现采取增加列宽度方式且关闭ellipsis属性功能方法解决问题 2、设备综合效率分析页面调整计算表格垂直滚动条方法以试图解决项目服务器上无法正常显示水平滚动条问题
---
src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue | 505 +++++++++++++++++++++++++++++++------------------------
1 files changed, 285 insertions(+), 220 deletions(-)
diff --git a/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue b/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
index 136a05d..acb9a04 100644
--- a/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
+++ b/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
@@ -1,77 +1,123 @@
<template>
- <div style="width: 100%;">
- <div :bordered="false">
- <!-- 鏌ヨ鍖哄煙 -->
- <div class="seach-content">
- <div class="table-page-search-wrapper">
- <a-form layout="inline" @keyup.enter.native="searchQuery">
- <a-row :gutter="24">
- <a-col :md="5" :sm="5" :xs="5">
- <a-form-item label="鏃堕棿">
- <a-range-picker
- :placeholder="['寮�濮嬫椂闂�', '缁撴潫鏃堕棿']"
- format="YYYY-MM"
- :value="dates"
- :mode="['month', 'month']"
- @panelChange="dateParamChange"
- />
- </a-form-item>
- </a-col>
- <!--<a-col :md="5" :sm="5" :xs="5">-->
- <!--<a-form-item label="鐝埗">-->
- <!--<a-select v-model="queryParam.shiftId" placeholder="璇烽�夋嫨鐝埗"-->
- <!--@change="initShiftSubList" :allowClear="allowClear">-->
- <!--<a-select-option v-for="(em,index) in shiftList" :key="index" :value="em.value">-->
- <!--{{ em.label }}-->
- <!--</a-select-option>-->
- <!--</a-select>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
- <!--<a-col :md="5" :sm="5" :xs="5">-->
- <!--<a-form-item label="鐝">-->
- <!--<a-select v-model="queryParam.shiftSubId" placeholder="璇烽�夋嫨鐝" @change="initShiftSubListChange"-->
- <!--:allowClear="allowClearSu">-->
- <!--<a-select-option v-for="(em,index) in shiftSubList" :key="index" :value="em.value">-->
- <!--{{ em.label }}-->
- <!--</a-select-option>-->
- <!--</a-select>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
+ <div class="device_list">
+ <!-- 鏌ヨ鍖哄煙 -->
+ <div class="seach-content">
+ <div class="table-page-search-wrapper">
+ <a-form layout="inline" @keyup.enter.native="searchQuery">
+ <a-row :gutter="24">
+ <a-col :md="5" :sm="5" :xs="5">
+ <a-form-item label="璁惧绫诲瀷">
+ <a-select
+ :value="queryParams.equipmentType"
+ mode="multiple"
+ placeholder="璇烽�夋嫨璁惧绫诲瀷"
+ allow-clear
+ :maxTagCount="1"
+ @change="selectChange($event,'equipmentType')"
+ >
+ <a-select-option v-for="(item,index) in equipmentTypeList" :value="item.value" :key="index">
+ {{item.label}}
+ </a-select-option>
+ </a-select>
+ </a-form-item>
+ </a-col>
+ <a-col :md="5" :sm="5" :xs="5">
+ <a-form-item label="椹卞姩绫诲瀷">
+ <a-select
+ :value="queryParams.driveType"
+ mode="multiple"
+ placeholder="璇烽�夋嫨椹卞姩绫诲瀷"
+ allow-clear
+ :maxTagCount="1"
+ @change="selectChange($event,'driveType')"
+ >
+ <a-select-option v-for="(item,index) in driveTypeList" :value="item.value" :key="index">
+ {{item.label}}
+ </a-select-option>
+ </a-select>
+ </a-form-item>
+ </a-col>
+ <a-col :md="4" :sm="4" :xs="4">
+ <a-form-item label="璁惧绾у埆">
+ <a-select
+ :value="queryParams.deviceLevel"
+ mode="multiple"
+ placeholder="璇烽�夋嫨璁惧绾у埆"
+ allow-clear
+ :maxTagCount="1"
+ @change="selectChange($event,'deviceLevel')"
+ >
+ <a-select-option v-for="(item,index) in device_level_list" :value="item.value" :key="index">
+ {{item.label}}
+ </a-select-option>
+ </a-select>
+ </a-form-item>
+ </a-col>
+ <a-col :md="5" :sm="5" :xs="5">
+ <a-form-item label="璁惧绉嶇被">
+ <a-select
+ :value="queryParams.deviceCategory"
+ mode="multiple"
+ placeholder="璇烽�夋嫨璁惧绉嶇被"
+ allow-clear
+ :maxTagCount="1"
+ @change="selectChange($event,'deviceCategory')"
+ >
+ <a-select-option v-for="(item,index) in device_category_list" :value="item.value" :key="index">
+ {{item.label}}
+ </a-select-option>
+ </a-select>
+ </a-form-item>
+ </a-col>
+ <a-col :md="5" :sm="5" :xs="5">
+ <a-form-item label="鏃堕棿">
+ <a-range-picker
+ :placeholder="['寮�濮嬫椂闂�', '缁撴潫鏃堕棿']"
+ format="YYYY-MM"
+ :value="dates"
+ :mode="['month', 'month']"
+ @panelChange="dateParamChange"
+ @change="handleDateChange"
+ />
+ </a-form-item>
+ </a-col>
- <a-col :md="8" :sm="8" :xs="8">
- <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-row>
- </a-form>
+ </a-row>
- </div>
- </div>
+ <a-row :gutter="24" style="margin-bottom: 20px">
+ <a-col :md="4" :sm="4" :xs="4">
+ <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-button type="primary" icon="printer" v-print="'#EfficiencyShift'" v-has="'efficiencyShift:print'">
+ 鎵撳嵃
+ </a-button>
+ </a-space>
+ </a-col>
+ </a-row>
+ </a-form>
- <div class="container" id="EfficiencyShift" style="margin-top: 20px;">
- <div class="table2">
- <a-table :columns="columns" :dataSource="dataSource.records" :pagination="false" bordered
- :scroll="{ x: 3000, y: false }">
- </a-table>
- </div>
- </div>
- <div class="pagination">
- <a-pagination
- :total=dataSource.total
- :show-total="(total, range) => `${range[0]}-${range[1]} 鍏� ${total} 鏉"
- :page-size="+queryParam.pageSize"
- :default-current="1"
- :current=+queryParam.pageNo
- show-size-changer
- :pageSizeOptions="['20','30','40','50']"
- @change="handlePageNoChange"
- @showSizeChange="handlePageSizeChange"
- />
</div>
</div>
+
+ <div id="EfficiencyShift" style="flex:1;overflow: hidden;height: inherit">
+ <a-table :columns="columns" rowKey="id" :dataSource="dataSource.records" :loading="tableLoading"
+ :pagination="false" :scroll="{x:'max-content',y:scrollY}" bordered></a-table>
+ </div>
+ <!--<div class="pagination">-->
+ <!--<a-pagination-->
+ <!--:total=dataSource.total-->
+ <!--:show-total="(total, range) => `${range[0]}-${range[1]} 鍏� ${total} 鏉"-->
+ <!--:page-size="+queryParam.pageSize"-->
+ <!--:default-current="1"-->
+ <!--:current=+queryParam.pageNo-->
+ <!--show-size-changer-->
+ <!--:pageSizeOptions="['20','30','40','50']"-->
+ <!--@change="handlePageNoChange"-->
+ <!--@showSizeChange="handlePageSizeChange"-->
+ <!--/>-->
+ <!--</div>-->
</div>
</template>
@@ -81,32 +127,30 @@
import $ from 'jquery'
import '@/components/table2excel/table2excel'
import { ajaxGetDictItems, getDictItemsFromCache, duplicateCheck } from '@/api/api'
+ import api from '@api/mdc'
export default {
name: 'OEEAnalysisList',
components: {},
data() {
return {
- typeTree: '',
- typeParent: 1,
- typeEquipment: 1,
- allowClear: true,
- allowClearSu: true,
dates: [moment().subtract('month', 1), moment().subtract('month', 1)],
- identifying: [],
queryParam: {
- pageSize: 20,
+ pageSize: 10000,
pageNo: 1
+ },
+ queryParams: {
+ equipmentType: [],
+ driveType: [],
+ deviceLevel: [],
+ deviceCategory: []
},
queryParamEquip: {},
queryParamPeople: {},
url: {
list: '/mdc/mdcOverallEquipmentEfficiency/list',
- initShiftList: '/mdc/mdcMdcShift/initShiftList',
- initShiftSubList: '/mdc/mdcShiftSub/initShiftSubList'
+ queryEquipmentType: '/mdc/mdcEquipmentType/queryEquipmentType'
},
- shiftList: [],
- shiftSubList: [],
columns: [
{
title: '搴忓彿',
@@ -117,21 +161,18 @@
customRender: function(t, r, index) {
return parseInt(index) + 1
}
- // fixed: 'left'
},
{
title: '璁惧缁熶竴缂栧彿',
align: 'center',
dataIndex: 'equipmentId',
width: 120
- // fixed: 'left'
},
{
title: '璁惧鍚嶇О',
align: 'center',
- width: 150,
+ width: 200,
dataIndex: 'equipmentName'
- // fixed: 'left'
},
{
title: '璁惧鍨嬪彿',
@@ -148,7 +189,7 @@
{
title: '鐝',
align: 'center',
- width: 80,
+ width: 300,
dataIndex: 'shift'
},
{
@@ -249,7 +290,7 @@
dataIndex: 'timeActuationRate',
align: 'center',
width: 110,
- customRender: text => text != 0 ? text * 100 + '%' : 0
+ customRender: text => text != 0 ? parseFloat((text * 100).toFixed(2)) + '%' : 0
},
{
title: '鍔犲伐闆朵欢鏁帮紙浠讹級',
@@ -268,7 +309,7 @@
dataIndex: 'performanceRate',
align: 'center',
width: 110,
- customRender: text => text != 0 ? text * 100 + '%' : 0
+ customRender: text => text != 0 ? parseFloat((text * 100).toFixed(2)) + '%' : 0
},
{
title: '搴熷搧鏁�',
@@ -281,26 +322,50 @@
dataIndex: 'passRate',
align: 'center',
width: 100,
- customRender: text => text != 0 ? text * 100 + '%' : 0
+ customRender: text => text != 0 ? parseFloat((text * 100).toFixed(2)) + '%' : 0
},
{
title: '璁惧缁煎悎鏁堢巼',
dataIndex: 'overallEquipmentEfficiency',
align: 'center',
width: 120,
- customRender: text => text != 0 ? text * 100 + '%' : 0
+ customRender: text => text != 0 ? parseFloat((text * 100).toFixed(2)) + '%' : 0
}
],
- dataSource: []
+ dataSource: [],
+ driveTypeList: [],
+ equipmentTypeList: [],
+ device_level_list: [],
+ device_category_list: [],
+ scrollY: 465,
+ tableLoading: false
}
},
props: { nodeTree: '', Type: '', nodePeople: '' },
created() {
- this.initShiftList()
+ const { isEquipment, productionId } = this.$route.params
+ if (productionId) {
+ console.log('productionId', productionId)
+ console.log('isEquipment', isEquipment)
+ if (!isEquipment) this.queryParam.parentId = productionId
+ else this.queryParam.equipmentId = productionId
+ }
+
this.queryParam.startTime = moment(this.dates[0]).format('YYYY-MM')
this.queryParam.endTime = moment(this.dates[1]).format('YYYY-MM')
this.queryParam.typeTree = '1'
this.loadData()
+ this.getDriveTypeByApi()
+ this.queryGroup()
+ this.initDictData('device_level')
+ this.initDictData('device_category')
+ },
+ mounted() {
+ window.addEventListener('resize', this.handleWindowResize)
+ // this.handleWindowResize()
+ },
+ beforeDestroy() {
+ window.removeEventListener('resize', this.handleWindowResize)
},
watch: {
Type(valmath) {
@@ -333,46 +398,38 @@
}
}
},
- filters: {
- numFilter(value) {
- if (value) {
- return parseFloat((value * 100).toFixed(2))
- } else {
- return '0'
- }
- }
- },
methods: {
+ initDictData(dictCode) {
+ // //浼樺厛浠庣紦瀛樹腑璇诲彇瀛楀吀閰嶇疆
+ if (getDictItemsFromCache(dictCode)) {
+ this[dictCode + '_list'] = getDictItemsFromCache(dictCode)
+ return
+ }
+ //鏍规嵁瀛楀吀Code, 鍒濆鍖栧瓧鍏告暟缁�
+ ajaxGetDictItems(dictCode, null).then((res) => {
+ if (res.success) {
+ this[dictCode + '_list'] = res.result
+ return
+ }
+ })
+ },
+ selectChange(value, key) {
+ this.queryParams[key] = value
+ },
dateParamChange(value) {
+ console.log('dateParamChangeValue', value)
this.dates = value
this.queryParam.startTime = moment(this.dates[0]).format('YYYY-MM')
this.queryParam.endTime = moment(this.dates[1]).format('YYYY-MM')
},
- initShiftList() {
- getAction(this.url.initShiftList).then((res) => {
- if (res.success) {
- this.shiftList = res.result
- }
- })
- },
-
- initShiftSubList(val) {
- //姣忔閲嶆柊閫夋嫨鐝埗鏃剁彮娆℃竻绌轰笖鏄剧ずplaceholder鍐呭
- this.queryParam.shiftSubId = undefined
- getAction(this.url.initShiftSubList, { shiftId: val }).then((res) => {
- if (res.success) {
- this.shiftSubList = res.result
- }
- })
- },
-
- initShiftSubListChange() {
- getAction(this.url.initShiftSubList, { shiftId: this.queryParam.shiftId }).then((res) => {
- if (res.success) {
- this.shiftSubList = res.result
- }
- })
+ handleDateChange(value) {
+ console.log('handleDateChangeValue', value)
+ if (!value.length) {
+ delete this.queryParam.startTime
+ delete this.queryParam.endTime
+ this.dates = []
+ }
},
exportExcel() {
@@ -388,41 +445,77 @@
},
searchQuery() {
- if (this.dates != '') {
- if (this.queryParam.typeTree == '1') {
- this.queryParam.parentId = this.queryParamEquip.parentId
- this.queryParam.equipmentId = this.queryParamEquip.equipmentId
- } else {
- this.queryParam.parentId = this.queryParamPeople.parentId
- this.queryParam.equipmentId = ''
- }
- this.queryParam.pageNo = 1
- this.loadData()
+ if (this.queryParam.typeTree == '1') {
+ this.queryParam.parentId = this.queryParamEquip.parentId
+ this.queryParam.equipmentId = this.queryParamEquip.equipmentId
} else {
- // this.$message.warning("璇烽�夋嫨鏃堕棿")
- this.$notification.warning({
- message: '娑堟伅',
- description: '璇烽�夋嫨鏃堕棿'
- })
+ this.queryParam.parentId = this.queryParamPeople.parentId
+ this.queryParam.equipmentId = ''
}
- // this.onClearSelected()
+ Object.keys(this.queryParams).forEach(item => {
+ this.queryParam[item] = this.queryParams[item].join()
+ // 姝ゅ涓轰繚璇佹帴鍙ｅ弬鏁颁笉澶氫綑锛屽彲鐪佺暐
+ if (this.queryParams[item].length === 0) delete this.queryParam[item]
+ })
+ this.loadData()
},
searchReset() {
this.queryParam = {
- pageSize: 20,
- pageNo: 1
+ pageSize: 10000,
+ pageNo: 1,
+ typeTree: 1
+ }
+ this.queryParams = {
+ equipmentType: [],
+ driveType: [],
+ deviceLevel: [],
+ deviceCategory: []
}
this.dates = []
this.loadData()
},
- loadData() {
- getAction(this.url.list, this.queryParam).then(res => {
+ /**
+ * 璋冪敤鎺ュ彛鑾峰彇鎺у埗绯荤粺绫诲瀷
+ */
+ getDriveTypeByApi() {
+ api.getDriveTypeApi().then((res) => {
+ if (res.success) this.driveTypeList = res.result
+ })
+ },
+
+ queryGroup() {
+ getAction(this.url.queryEquipmentType).then(res => {
if (res.success) {
- this.dataSource = res.result
+ this.equipmentTypeList = res.result.map(item => {
+ return {
+ label: item.equipmentTypeName,
+ value: item.equipmentTypeName
+ }
+ })
+ } else {
+ this.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
}
})
+ },
+
+ loadData() {
+ this.tableLoading = true
+ getAction(this.url.list, this.queryParam)
+ .then(res => {
+ if (res.success) {
+ this.dataSource = res.result
+ this.tableLoading = false
+ }
+ })
+ .finally(() => {
+ this.tableLoading = false
+ this.handleWindowResize()
+ })
},
/**
@@ -443,112 +536,84 @@
handlePageSizeChange(current, size) {
this.queryParam.pageSize = size
this.loadData()
+ },
+
+ /**
+ * 褰撴祻瑙堝櫒鍙绐楀彛灏哄鍙戠敓鏀瑰彉鏃惰Е鍙�
+ */
+ handleWindowResize() {
+ const devicePixelRatio = window.devicePixelRatio // 娴忚鍣ㄧ缉鏀炬瘮
+ console.log('devicePixelRatio', devicePixelRatio)
+ if (devicePixelRatio < 1) return // 缂╂斁姣斿皬浜�1鏃朵笉杩涜楂樺害閲嶆柊璁剧疆锛屽洜涓簊crollY鍙樺ぇ鍚庤〃鏍艰秴鍑洪儴鍒嗕細琚殣钘忓鑷存粴鍔ㄦ潯涓嶅彲瑙�
+ const clientHeight = document.body.clientHeight || document.documentElement.clientHeight// 娴忚鍣ㄥ彲瑙嗗尯鍩熼珮搴�
+ console.log('clientHeight', clientHeight)
+ const containerTopToClientTopHeight = document.getElementById('EfficiencyShift').getBoundingClientRect().top // 琛ㄦ牸瀹瑰櫒椤堕儴鍒版祻瑙堝櫒鍙鍖哄煙椤堕儴鐨勯棿璺�
+ console.log('containerTopToClientTopHeight', containerTopToClientTopHeight)
+ // const tableHeadHeight = +window.getComputedStyle(document.querySelector('.ant-table-thead th')).height.slice(0, -2) // 琛ㄦ牸琛ㄥご楂樺害
+ const tableHeadHeight = document.querySelector('.ant-table-thead th').offsetHeight // 琛ㄦ牸琛ㄥご楂樺害
+ console.log('tableHeadHeight', tableHeadHeight)
+ // this.scrollY = clientHeight - containerTopToClientTopHeight - tableHeadHeight
+ const tableSuitableScrollY = clientHeight - containerTopToClientTopHeight - tableHeadHeight // 琛ㄦ牸鍨傜洿婊氬姩鏉″悎閫傞珮搴︼紙琛ㄦ牸姘村钩婊氬姩鏉″垰濂藉湪鍙鍖哄煙鏈�涓嬫柟锛�
+ // const tableSuitableScrollY = 600
+ console.log('tableSuitableScrollY', tableSuitableScrollY)
+ const tableContainerHeight = document.getElementById('EfficiencyShift').offsetHeight
+ console.log('tableContainerHeight', tableContainerHeight)
+ const tableMaxScrollY = tableContainerHeight - tableHeadHeight // 琛ㄦ牸鍨傜洿婊氬姩鏉℃渶澶ч珮搴︼紙鑻ヨ秴鍑哄垯姘村钩婊氬姩鏉¤閬尅锛�
+ console.log('tableMaxScrollY', tableMaxScrollY)
+ if (tableSuitableScrollY && tableSuitableScrollY < tableMaxScrollY) this.scrollY = tableSuitableScrollY
+ else this.scrollY = tableMaxScrollY
+ console.log('scrollY', this.scrollY)
}
}
}
</script>
-<style scoped>
- .table2 {
- width: 100%;
- height: 100%;
- overflow: auto;
- }
-
+<style scoped lang="less">
.pagination {
display: flex;
justify-content: end;
margin: 20px 0;
}
+ .device_list {
+ overflow: hidden;
+ display: flex;
+ flex-direction: column;
+ }
+
@media screen and (min-width: 1920px) {
- #EfficiencyShift {
- height: 670px !important;
- overflow: scroll;
+ .device_list {
+ height: 811px !important;
}
}
@media screen and (min-width: 1680px) and (max-width: 1920px) {
- #EfficiencyShift {
- height: 670px !important;
- overflow: scroll;
+ .device_list {
+ height: 811px !important;
}
}
@media screen and (min-width: 1400px) and (max-width: 1680px) {
- #EfficiencyShift {
- height: 522px !important;
- overflow: scroll;
+ .device_list {
+ height: 663px !important;
}
}
@media screen and (min-width: 1280px) and (max-width: 1400px) {
- #EfficiencyShift {
- height: 414px !important;
- overflow: scroll;
+ .device_list {
+ height: 564px !important;
}
}
@media screen and (max-width: 1280px) {
- #EfficiencyShift {
- height: 414px !important;
- overflow: scroll;
+ .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;*/
+ /deep/ .ant-table-body {
+ &::-webkit-scrollbar {
+ height: 12px;
+ }
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3