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/efficiencyPOReport/EfficiencyPOList.vue | 89 ++++++--------------------------------------
1 files changed, 13 insertions(+), 76 deletions(-)
diff --git a/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue b/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
index a280450..cfee18f 100644
--- a/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
+++ b/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
@@ -21,7 +21,7 @@
</a-select>
</a-form-item>
</a-col>
- <a-col :md="6" :sm="6">
+ <a-col :md="5" :sm="5">
<a-form-item label="椹卞姩绫诲瀷">
<a-select
:value="queryParams.driveType"
@@ -41,69 +41,6 @@
<a-form-item label="鏃堕棿">
<a-range-picker @change="dateParamChange" :disabledDate="disabledDate" format="YYYYMMDD" v-model="dates"
:allowClear="false"/>
- </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-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="2" :sm="2">
- <a
- @click="toggleSearchStatus=!toggleSearchStatus"
- @selectstart="$event.preventDefault()"
- style="display: inline-block;height: 32px;line-height: 32px"
- >
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
- </a>
- </a-col>
- </a-row>
-
- <a-row :gutter="24" v-if="toggleSearchStatus">
-
- <a-col :md="5" :sm="5" :xs="5">
- <a-form-item label="閲嶈绋嬪害">
- <a-select
- :value="queryParams.deviceImportanceLevel"
- mode="multiple"
- placeholder="璇烽�夋嫨璁惧閲嶈绋嬪害"
- allow-clear
- :maxTagCount="1"
- @change="selectChange($event,'deviceImportanceLevel')"
- >
- <a-select-option v-for="(item,index) in device_importance_level_list" :value="item.value"
- :key="index">
- {{item.label}}
- </a-select-option>
- </a-select>
</a-form-item>
</a-col>
</a-row>
@@ -150,14 +87,14 @@
</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 class="thgu dong4 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">璁惧缂栧彿
</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 class="thgu dong6 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">璁惧绫诲瀷
</th>
- <th class="thgu dong7 name" rowspan="2" style="min-width: 120px; max-width: 120px;width: 120px;">璁惧鍨嬪彿
- </th>
+ <!--<th class="thgu dong7 name" rowspan="2" style="min-width: 162px; max-width: 162px;width: 162px;">璁惧鍨嬪彿-->
+ <!--</th>-->
<!--<th rowspan="2">缁勫埆</th>-->
<template v-for="(tableHead, index) in tableHeads">
<th class="timeth" :colspan="checkedList.length">{{tableHead}}</th>
@@ -200,11 +137,11 @@
{{item.equipmentName}}
</td>
<td class="tdgu5 kaitou">{{item.equipmentType}}</td>
- <td class="tdgu6 kaitou">{{item.equipmentModel}}</td>
+ <!--<td class="tdgu6 kaitou">{{item.equipmentModel}}</td>-->
</template>
<template v-else>
- <td colspan="7" class="tdgu kaitou">{{item.level1}}</td>
+ <td colspan="6" class="tdgu kaitou">{{item.level1}}</td>
</template>
<template v-for="(tableHead, index) in item.dataList">
<td :style="{background:tableHead.color }" v-if="checkedList.indexOf('lyl') > -1">
@@ -680,19 +617,19 @@
.table tbody tr .tdgu4 {
position: sticky;
- left: 250px;
+ left: 300px;
z-index: 2;
}
.table tbody tr .tdgu5 {
position: sticky;
- left: 412px;
+ left: 462px;
z-index: 2;
}
.table tbody tr .tdgu6 {
position: sticky;
- left: 512px;
+ left: 612px;
z-index: 2;
}
@@ -735,17 +672,17 @@
.table2 thead .equipname .dong5 {
z-index: 5;
- left: 250px;
+ left: 300px;
}
.table2 thead .equipname .dong6 {
z-index: 5;
- left: 412px;
+ left: 462px;
}
.table2 thead .equipname .dong7 {
z-index: 5;
- left: 512px;
+ left: 612px;
}
#EfficiencyPO {
--
Gitblit v1.9.3