From 40671eb79c1805f661fd0e12061dd1b406af9b15 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期六, 17 一月 2026 17:10:58 +0800
Subject: [PATCH] Merge branch 'master' of http://124.71.187.17:8299/r/fzzy-igdss
---
fzzy-igdss-web/src/main/resources/templates/work/flow-his.html | 26 ++------------------------
1 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/fzzy-igdss-web/src/main/resources/templates/work/flow-his.html b/fzzy-igdss-web/src/main/resources/templates/work/flow-his.html
index 647a4c5..0aa99e2 100644
--- a/fzzy-igdss-web/src/main/resources/templates/work/flow-his.html
+++ b/fzzy-igdss-web/src/main/resources/templates/work/flow-his.html
@@ -12,21 +12,17 @@
scrollbar-width: none; /* Firefox */
-ms-overflow-style: none; /* IE 鍜� Edge */
}
-
/* Chrome, Safari 鍜� Opera */
.hide-scrollbar::-webkit-scrollbar {
display: none;
}
-
/* 骞虫粦婊氬姩鏁堟灉 */
.smooth-scroll {
scroll-behavior: smooth;
}
-
html {
overflow: hidden;
}
-
/* 椤甸潰鍩虹鏍峰紡 */
body {
background-color: #FFF;
@@ -35,7 +31,6 @@
font-size: 14px;
overflow-x: hidden;
}
-
.container {
margin: 0 auto;
background-color: #fff;
@@ -43,13 +38,11 @@
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
overflow: hidden;
}
-
.header {
background-color: #e6e6e6;
padding: 15px;
font-weight: bold;
}
-
.summary-box {
margin: 20px;
padding: 15px;
@@ -58,22 +51,18 @@
border-radius: 4px;
font-size: 14px;
}
-
.summary-box .layui-icon {
margin-right: 8px;
color: #1E9FFF;
}
-
.timeline-container {
padding: 0 20px 20px;
}
-
/* 鑷畾涔夋椂闂磋酱鏍峰紡 */
.custom-timeline {
position: relative;
padding: 20px 0;
}
-
.custom-timeline:before {
content: '';
position: absolute;
@@ -83,17 +72,14 @@
width: 2px;
background-color: #e8e8e8;
}
-
.timeline-item {
position: relative;
padding-left: 50px;
margin-bottom: 25px;
}
-
.timeline-item:last-child {
margin-bottom: 0;
}
-
.timeline-icon {
position: absolute;
left: 0;
@@ -107,7 +93,6 @@
color: white;
z-index: 2;
}
-
.timeline-content {
background-color: #f9f9f9;
border-radius: 6px;
@@ -115,7 +100,6 @@
border-left: 3px solid #1E9FFF;
font-size: 14px;
}
-
.operator-info {
font-weight: bold;
color: #333;
@@ -129,31 +113,25 @@
color: #888;
font-size: 13px;
}
-
.time-info {
text-align: right;
color: #999;
font-size: 13px;
margin-top: 8px;
}
-
/* 涓嶅悓鐘舵�佺殑鍥炬爣棰滆壊 */
.status-created {
background-color: #FFB800;
}
-
.status-waiting {
background-color: #FF5722;
}
-
.status-processing {
background-color: #1E9FFF;
}
-
.status-completed {
background-color: #009688;
}
-
/* 鍙粴鍔ㄥ尯鍩熸牱寮� */
.scrollable-area {
max-height: 400px; /* 璁剧疆鏈�澶ч珮搴� */
@@ -205,8 +183,8 @@
<!-- </div>-->
<div class="summary-box">
<i class="layui-icon layui-icon-tips"></i>
- 澶勭悊璁板綍锛氳宸ュ崟绱澶勭悊鏃堕暱 <span style="color:#1E9FFF; font-weight:bold;">1鍒嗛挓</span>锛岀疮璁″鐞嗘鏁� <span
- style="color:#1E9FFF; font-weight:bold;">3娆�</span>
+ 澶勭悊璁板綍锛氳宸ュ崟绱澶勭悊鏃堕暱 <span style="color:#1E9FFF; font-weight:bold;" th:text="${tipTime}">0鍒嗛挓</span>锛岀疮璁″鐞嗘鏁� <span
+ style="color:#1E9FFF; font-weight:bold;" th:text="${tipCount}">0娆�</span>
</div>
<div class="timeline-container">
--
Gitblit v1.9.3