From e7ab049344b954b044fc474992c378fcbbeeba33 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期日, 08 二月 2026 19:08:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-web/src/main/resources/static/group/index.js | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/fzzy-igdss-web/src/main/resources/static/group/index.js b/fzzy-igdss-web/src/main/resources/static/group/index.js
index b654621..a5a3281 100644
--- a/fzzy-igdss-web/src/main/resources/static/group/index.js
+++ b/fzzy-igdss-web/src/main/resources/static/group/index.js
@@ -365,21 +365,24 @@
num7 = '杩戜竷澶╂暟閲�'+ item.warnNum7 + '涓�';
}
html += '<div class="panel-content-body-tr">';
- if (item.warnNum7 > 10) {
+ if (item.dailyTotal > 0) {
flag = true;
- html += '<span class="body-item sp" style="color: #bc2032;flex: 1.5;">' + item.deptName + '</span>';
- html += '<span class="body-item sp" style="color: #bc2032;">' + num1 + '</span>';
- html += '<span class="body-item sp" style="color: #bc2032;">' + num7 + '</span>';
- } else if (item.warnNum7 > 1 && item.warnNum7 < 10) {
- flag = true;
- html += '<span class="body-item sp" style="color: #f37b3d;flex: 1.5;">' + item.deptName + '</span>';
- html += '<span class="body-item sp" style="color: #f37b3d;">' + num1+ '</span>';
- html += '<span class="body-item sp" style="color: #f37b3d;">' + num7 + '</span>';
- }else {
+ }
+ // if (item.warnNum7 > 10) {
+ // flag = true;
+ // html += '<span class="body-item sp" style="color: #bc2032;flex: 1.5;">' + item.deptName + '</span>';
+ // html += '<span class="body-item sp" style="color: #bc2032;">' + num1 + '</span>';
+ // html += '<span class="body-item sp" style="color: #bc2032;">' + num7 + '</span>';
+ // } else if (item.warnNum7 > 1 && item.warnNum7 < 10) {
+ // flag = true;
+ // html += '<span class="body-item sp" style="color: #f37b3d;flex: 1.5;">' + item.deptName + '</span>';
+ // html += '<span class="body-item sp" style="color: #f37b3d;">' + num1+ '</span>';
+ // html += '<span class="body-item sp" style="color: #f37b3d;">' + num7 + '</span>';
+ // }else {
html += '<span class="body-item sp" style="flex: 1.5;">' + item.deptName + '</span>';
html += '<span class="body-item sp">' + num1 + '</span>';
html += '<span class="body-item sp">' + num7 + '</span>';
- }
+ // }
html += '</div>';
})
}
--
Gitblit v1.9.3