From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue | 308 ++++++++++++++++++++++----------------------------
1 files changed, 136 insertions(+), 172 deletions(-)
diff --git a/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue b/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
index 4a0be14..43395c1 100644
--- a/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
+++ b/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
@@ -1,66 +1,78 @@
<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-auto-complete
- v-model="queryParam.driveType"
- :data-source="driveTypeList"
- placeholder="璇烽�夋嫨椹卞姩绫诲瀷"
- :filter-option="filterOption"
- />
- </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"
- />
- </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>
+ <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="4" :sm="4" :xs="4">
+ <a-form-item label="椹卞姩绫诲瀷">
+ <a-auto-complete
+ v-model="queryParam.driveType"
+ :data-source="driveTypeList"
+ placeholder="璇烽�夋嫨椹卞姩绫诲瀷"
+ :filter-option="filterOption"
+ :allowClear="true"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :md="4" :sm="4" :xs="4">
+ <a-form-item label="璁惧绾у埆">
+ <j-dict-select-tag placeholder="璇烽�夋嫨璁惧绾у埆" dictCode="device_level" v-model="queryParam.deviceLevel"
+ allow-clear/>
+ </a-form-item>
+ </a-col>
+ <a-col :md="4" :sm="4" :xs="4">
+ <a-form-item label="璁惧绉嶇被">
+ <j-dict-select-tag placeholder="璇烽�夋嫨璁惧绉嶇被" dictCode="device_category" v-model="queryParam.deviceCategory"
+ allow-clear/>
+ </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="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>
- </div>
-
- <div class="container" id="EfficiencyShift" style="margin-top: 20px;">
- <div class="table2">
- <a-table :columns="columns" :dataSource="dataSource.records" :pagination="false" bordered
- :scroll="{ x: 3200, 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">
+ <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>
@@ -77,15 +89,9 @@
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
},
queryParamEquip: {},
@@ -107,21 +113,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: 200,
dataIndex: 'equipmentName'
- // fixed: 'left'
},
{
title: '璁惧鍨嬪彿',
@@ -140,7 +143,7 @@
align: 'center',
width: 100,
dataIndex: 'shift',
- ellipsis: true,
+ ellipsis: true
},
{
title: '姣忕彮灏忔椂',
@@ -283,17 +286,25 @@
}
],
dataSource: [],
- driveTypeList: []
+ driveTypeList: [],
+ scrollY: 465,
+ tableLoading: false
}
},
props: { nodeTree: '', Type: '', nodePeople: '' },
created() {
- // this.initShiftList()
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()
+ },
+ mounted() {
+ window.addEventListener('resize', this.handleWindowResize)
+ this.handleWindowResize()
+ },
+ beforeDestroy() {
+ window.removeEventListener('resize', this.handleWindowResize)
},
watch: {
Type(valmath) {
@@ -337,11 +348,19 @@
},
methods: {
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')
},
-
+ handleDateChange(value) {
+ console.log('handleDateChangeValue', value)
+ if (!value.length) {
+ delete this.queryParam.startTime
+ delete this.queryParam.endTime
+ this.dates = []
+ }
+ },
initShiftList() {
getAction(this.url.initShiftList).then((res) => {
if (res.success) {
@@ -381,29 +400,20 @@
},
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()
+ this.queryParam.pageNo = 1
+ this.loadData()
},
searchReset() {
this.queryParam = {
- pageSize: 20,
+ pageSize: 10000,
pageNo: 1
}
this.dates = []
@@ -420,11 +430,17 @@
},
loadData() {
- getAction(this.url.list, this.queryParam).then(res => {
- if (res.success) {
- this.dataSource = res.result
- }
- })
+ 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
+ })
},
/**
@@ -456,112 +472,60 @@
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;
}
+ .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;*/
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3