From d7a8405c0f57f8947f971b798d3e4713a8d1800f Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 15 五月 2025 16:49:39 +0800
Subject: [PATCH] 1、利用率分段分析页面增加导出功能，默认进入页面的计算时间段修改为00:00至23:59 2、设备管理页面增加设备属性的维护（普通、重点）同时TEEP页面新增对应筛选条件 3、看板增加MES产量数据展示（饼图里面改为设备产量对比，饼图下方增加两行展示计划量和完成量数目，点击饼图出现弹窗展示对应车间或车间工段下产量列表）2h 4、设备管理页面新增字段展示权限（弹窗中设备状态字段增加菜单按钮权限控制显隐） 5、OEE计算弹窗新增loading提示与计算成功后刷新列表功能 6、删除用户管理冗余字段展示
---
src/views/mdc/base/modules/OpenRateFractionAnalysis/OpenRateFractionAnalysisMain.vue | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/views/mdc/base/modules/OpenRateFractionAnalysis/OpenRateFractionAnalysisMain.vue b/src/views/mdc/base/modules/OpenRateFractionAnalysis/OpenRateFractionAnalysisMain.vue
index 6972c4b..1ee20b1 100644
--- a/src/views/mdc/base/modules/OpenRateFractionAnalysis/OpenRateFractionAnalysisMain.vue
+++ b/src/views/mdc/base/modules/OpenRateFractionAnalysis/OpenRateFractionAnalysisMain.vue
@@ -16,8 +16,9 @@
<a-space>
<a-time-picker :default-value="moment('00:00', 'HH:mm')" format="HH:mm" @change="onChangeStart" :allowClear="false"/>
鑷�
- <a-time-picker :default-value="moment('08:00', 'HH:mm')" format="HH:mm" @change="onChangeEnd" :allowClear="false"/>
+ <a-time-picker :default-value="moment('23:59', 'HH:mm')" format="HH:mm" @change="onChangeEnd" :allowClear="false"/>
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+ <a-button type="primary" @click="exportExcel" icon="download">瀵煎嚭</a-button>
</a-space>
</a-form-item>
</a-col>
@@ -28,17 +29,16 @@
<a-spin :spinning="loading">
<div id="Efficiency" class="container" style="margin-bottom: 15px;">
<div class="table2">
- <table class="dataContent table" border="1" cellspacing="0" cellpadding="0"
- style="white-space: nowrap;text-align: center;">
+ <table class="dataContent table" border="1" cellspacing="0" cellpadding="0">
<thead>
<tr class="thead fixed equipname">
- <th class="thgu dong1 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">
+ <th class="thgu dong1 name" style="min-width: 150px; max-width: 150px;width: 150px;">
璁惧缂栧彿
</th>
- <th class="thgu dong2 name" rowspan="2" style="min-width: 162px; max-width: 162px;width: 162px;">
+ <th class="thgu dong2 name" style="min-width: 162px; max-width: 162px;width: 162px;">
璁惧鍚嶇О
</th>
- <th class="thgu dong3 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">
+ <th class="thgu dong3 name" style="min-width: 100px; max-width: 100px;width: 100px;">
璁惧绫诲瀷
</th>
<template v-for="(tableHead, index) in tableHeads">
@@ -128,7 +128,7 @@
this.queryParam.startDate = moment(this.dates[0]).format('YYYYMMDD')
this.queryParam.endDate = moment(this.dates[1]).format('YYYYMMDD')
this.queryParam.startTime = '00:00'
- this.queryParam.endTime = '08:00'
+ this.queryParam.endTime = '23:59'
this.queryParam.typeTree = '1'
this.loadData1()
@@ -183,6 +183,17 @@
},
methods: {
moment,
+ exportExcel() {
+ $('#Efficiency').table2excel({
+ exclude: '.noExl',
+ name: 'Excel Document Name',
+ filename: '鍒╃敤鐜囧垎娈靛垎鏋�',
+ exclude_img: true,
+ fileext: '.xls',
+ exclude_links: true,
+ exclude_inputs: true
+ })
+ },
onChangeStart(time, timeString) {
this.queryParam.startTime = timeString
// console.log(time, timeString);
--
Gitblit v1.9.3