From df3503fd8695506027798f011b4a0a11f1bbd5c9 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 13 四月 2026 11:08:44 +0800
Subject: [PATCH] 增加派工完工每日报表，修改设备每日报表
---
WebTM/views/设备管理/设备报表/Sb_EquipDailyRunStateReport.html | 61 ++++++++++++++++--------------
1 files changed, 32 insertions(+), 29 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipDailyRunStateReport.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipDailyRunStateReport.html"
index 72a14af..ddfd67c 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipDailyRunStateReport.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipDailyRunStateReport.html"
@@ -1,4 +1,4 @@
-锘匡豢
+锘�
<!DOCTYPE html>
<html>
<head>
@@ -55,22 +55,23 @@
border-radius: 6px;
padding: 8px;
flex: 1;
- overflow: hidden;
+ overflow: auto;
min-height: 0;
- }
-
- .chart-row {
- display: flex;
- height: 100%;
+ display: grid;
+ grid-template-columns: repeat(auto-fit, minmax(260px, 1fr));
+ gap: 8px;
}
.chart-box {
- flex: 1;
margin: 4px;
border: 1px solid #eee;
border-radius: 4px;
background: #fafbfc;
position: relative;
+ min-height: 260px;
+ display: flex;
+ align-items: stretch;
+ justify-content: stretch;
}
.empty-tip {
@@ -193,7 +194,6 @@
for (var key in ChartConfig) { chartConfigKeys.push(key); }
generateSummaryCards();
generateChartBoxes();
- calculateHeights();
}
function generateSummaryCards() {
var $summaryRow = $('#summaryRow'); $summaryRow.empty();
@@ -205,25 +205,10 @@
});
}
function generateChartBoxes() {
- var $c = $('#chartContainer'); $c.empty(); var cols = 4;
- var rows = Math.ceil(chartConfigKeys.length / cols);
- for (let r = 0; r < rows; r++) {
- var $row = $('<div class="chart-row"></div>');
- for (let col = 0; col < cols; col++) {
- var i = r * cols + col;
- if (i < chartConfigKeys.length) {
- var key = chartConfigKeys[i];
- $row.append(`<div class="chart-box" id="chart-${key}"><div class="empty-tip">鏆傛棤鏁版嵁</div></div>`);
- } else {
- $row.append('<div class="chart-box" style="visibility:hidden;"></div>');
- }
- }
- $c.append($row);
- }
- }
- function calculateHeights() {
- var rows = Math.ceil(chartConfigKeys.length / 4);
- $('.chart-row').css('height', (100 / rows) + '%');
+ var $c = $('#chartContainer'); $c.empty();
+ chartConfigKeys.forEach(key => {
+ $c.append(`<div class="chart-box" id="chart-${key}"><div class="empty-tip">鏆傛棤鏁版嵁</div></div>`);
+ });
}
//鏌ヨ
@@ -377,8 +362,11 @@
var dom = $chartBox[0];
var chartKey = 'chart-' + key;
- // 1. 閿�姣佹棫瀹炰緥锛屾竻绌哄鍣�
+ // 1. 閿�姣佹棫瀹炰緥锛屾柇寮� ResizeObserver 骞舵竻绌哄鍣�
if (chartInstances[chartKey]) {
+ try {
+ if (chartInstances[chartKey]._resizeObserver) chartInstances[chartKey]._resizeObserver.disconnect();
+ } catch (e) { }
chartInstances[chartKey].dispose();
delete chartInstances[chartKey];
}
@@ -414,6 +402,14 @@
var chart = echarts.init(dom);
chartInstances['chart-' + key] = chart;
+ // 鑷姩鍝嶅簲瀹瑰櫒灏哄鍙樺寲锛堜紭鍏堜娇鐢� ResizeObserver锛�
+ if (window.ResizeObserver) {
+ try {
+ var ro = new ResizeObserver(function () { try { chart.resize(); } catch (e) { } });
+ ro.observe(dom);
+ chart._resizeObserver = ro;
+ } catch (e) { }
+ }
// 璁＄畻鎬诲拰
var total = data.reduce((s, x) => s + x.value, 0);
@@ -491,6 +487,13 @@
var dom = document.getElementById('chart-' + key);
var chart = echarts.init(dom);
chartInstances['chart-' + key] = chart;
+ if (window.ResizeObserver) {
+ try {
+ var ro = new ResizeObserver(function () { try { chart.resize(); } catch (e) { } });
+ ro.observe(dom);
+ chart._resizeObserver = ro;
+ } catch (e) { }
+ }
var colorList = ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'];
chart.setOption({
--
Gitblit v1.9.1