From 237b5f107cf9fab2a6b730f1a036dbdcbfb63498 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期一, 27 十一月 2023 15:45:08 +0800
Subject: [PATCH] 1、车间看板页面非全屏模式下使图纸盒子占满底部，而不是被屏幕任务栏遮盖 2、报警分析页面调整右侧表格以及图表布局，调整表格合计持续字段展示格式为时分秒 3.大屏车间管理页面选择已有设备窗口弹出方式由模态窗改为右侧抽屉
---
src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue b/src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue
index e923eb5..cbb9217 100644
--- a/src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue
+++ b/src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue
@@ -19,7 +19,7 @@
</div>
<div id="DeviceList">
<div class="openRateTrendDg">
- <div id="Efficiency" class="container" style="margin-top: 20px;">
+ <div id="Efficiency" class="container">
<div class="table2">
<table class="dataContent table" border="1" cellspacing="0" cellpadding="0"
style="white-space: nowrap;text-align: left;">
@@ -31,7 +31,7 @@
鍑虹幇娆℃暟
</th>
<th class="thgu dong3 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">
- 鍚堣鎸佺画鏃堕棿锛堢锛�
+ 鍚堣鎸佺画鏃堕棿
</th>
<th class="thgu dong4 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">
鎶ヨ淇℃伅
@@ -45,7 +45,8 @@
<tr class="mathData" v-for="(item, index) in dataList" @click="TableDraw(index,item)">
<td class="tdgu kaitou">{{item.alarmCode}}</td>
<td class="tdgu1 kaitou">{{item.count}}</td>
- <td class="tdgu2 kaitou">{{item.timeCount}}</td>
+ <td class="tdgu2 kaitou">{{getFormattedTime(item.timeCount)}}
+ <!--<td class="tdgu2 kaitou">{{item.timeCount}}</td>-->
<td class="tdgu3 kaitou">{{item.alarmContent}}</td>
<!--<template v-for="(tableHead, index) in item.dataList">-->
<!--<td :style="{background:tableHead.color }">{{tableHead.utilizationRate | numFilter}}</td>-->
@@ -56,7 +57,7 @@
</div>
</div>
</div>
- <div style="width: 100%;height: 60%;display: flex;">
+ <div style="width: 100%;height: 55%;display: flex;">
<div id="MdcEquipmentWarningPie" style="height: 100%;width: 35%;"></div>
<div id="MdcEquipmentWarningLine" style="height: 100%;width: 65%;"></div>
</div>
@@ -429,6 +430,14 @@
]
}
equipmentWarningLine.setOption(equipmentWarningLineOption, true)
+ },
+
+ getFormattedTime(seconds){
+ var hours = Math.floor(seconds / 3600);
+ var minutes = Math.floor((seconds % 3600) / 60);
+ var secs = seconds % 60;
+
+ return `${hours}灏忔椂 ${minutes}鍒� ${secs}绉抈
}
}
}
@@ -591,28 +600,28 @@
@media screen and (min-width: 1920px) {
#Efficiency {
- height: 337px !important;
+ height: 258px !important;
overflow: scroll;
}
}
@media screen and (min-width: 1680px) and (max-width: 1920px) {
#Efficiency {
- height: 337px !important;
+ height: 258px !important;
overflow: scroll;
}
}
@media screen and (min-width: 1400px) and (max-width: 1680px) {
#Efficiency {
- height: 190px !important;
+ height: 160px !important;
overflow: scroll;
}
}
@media screen and (min-width: 1280px) and (max-width: 1400px) {
#Efficiency {
- height: 90px !important;
+ height: 60px !important;
overflow: scroll;
}
}
--
Gitblit v1.9.3