From 0d1b8d5609a0dfe7defd79dd6cf6db151413f1d3 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 25 十二月 2025 17:06:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-web/src/main/resources/templates/group/index.html | 70 ++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 30 deletions(-)
diff --git a/fzzy-igdss-web/src/main/resources/templates/group/index.html b/fzzy-igdss-web/src/main/resources/templates/group/index.html
index b986355..3ad26fd 100644
--- a/fzzy-igdss-web/src/main/resources/templates/group/index.html
+++ b/fzzy-igdss-web/src/main/resources/templates/group/index.html
@@ -140,15 +140,15 @@
</li>
<li>
<h3>搴撶偣锛堜釜锛�</h3>
- <p id="deptAreaNum">0</p>
+ <p id="deptNum">0</p>
</li>
<li>
<h3>浠撳簱锛堜釜锛�</h3>
- <p id="depotSum">0</p>
+ <p id="depotNum">0</p>
</li>
<li>
- <h3>绛掍粨锛堜釜锛�</h3>
- <p id="depotOilSum">0</p>
+ <h3>璐ㄦ娂浠擄紙涓級</h3>
+ <p id="depotBankNum">0</p>
</li>
</ul>
@@ -156,7 +156,7 @@
</div><!-- i-m1 end -->
<div class="left-m2">
- <div class="panel-title" id="panel-title">鐩戠鍔ㄦ�佷俊鎭�</div>
+ <div class="panel-title" id="panel-title">AI浜嬩欢鍔ㄦ��</div>
<div class="panel-content">
<div class="panel-content-head">
@@ -168,52 +168,62 @@
<div class="panel-content-body" id="inventoryInfoBox">
<div id="inventoryInfo">
<div class="panel-content-body-tr">
- <span class="body-item">搴撳尯1</span>
+ <span class="body-item sp">浼婂畞鍘垮悍杈惧啘涓氬彂灞曟湁闄愬叕鍙�</span>
<span class="body-item">褰撴棩鍒嗘瀽涓�鍒囨甯�</span>
<span class="body-item" style="flex: 0.3;">04/22</span>
</div>
<div class="panel-content-body-tr">
- <span class="body-item">搴撳尯2</span>
+ <span class="body-item sp">浼婂畞鍘挎亽杈惧啘涓氬彂灞曟湁闄愬叕鍙�</span>
<span class="body-item">褰撴棩鍒嗘瀽涓�鍒囨甯�</span>
<span class="body-item" style="flex: 0.3;">04/22</span>
</div>
<div class="panel-content-body-tr">
- <span class="body-item">搴撳尯3</span>
+ <span class="body-item sp">浼婂畞鍘胯壘瑗跨儹鏅儤骞插巶</span>
<span class="body-item">褰撴棩鍒嗘瀽涓�鍒囨甯�</span>
<span class="body-item" style="flex: 0.3;">04/22</span>
</div>
<div class="panel-content-body-tr">
- <span class="body-item">搴撳尯4</span>
+ <span class="body-item sp">灏煎嫆鍏嬪幙鏈ㄦ柉涔℃綐鍒氱儤骞插巶</span>
<span class="body-item">褰撴棩鍒嗘瀽涓�鍒囨甯�</span>
<span class="body-item" style="flex: 0.3;">04/22</span>
</div>
<div class="panel-content-body-tr">
- <span class="body-item">搴撳尯5</span>
+ <span class="body-item sp">鏂扮枂浼婂畞淇濆仴楗叉枡鏈夐檺鍏徃搴撳尯</span>
<span class="body-item">褰撴棩鍒嗘瀽涓�鍒囨甯�</span>
<span class="body-item" style="flex: 0.3;">04/22</span>
</div>
<div class="panel-content-body-tr">
- <span class="body-item">搴撳尯6</span>
+ <span class="body-item sp">浼婂畞鍘垮嚡婧愮帀绫崇妞嶅啘姘戜笓涓氬悎浣滅ぞ</span>
<span class="body-item">褰撴棩鍒嗘瀽涓�鍒囨甯�</span>
<span class="body-item" style="flex: 0.3;">04/22</span>
</div>
<div class="panel-content-body-tr">
- <span class="body-item">搴撳尯7</span>
+ <span class="body-item sp">浼婂畞鍘跨帀婧愬啘鍓骇鍝佽喘閿�涓撲笟鍚堜綔绀�</span>
<span class="body-item">褰撴棩鍒嗘瀽涓�鍒囨甯�</span>
<span class="body-item" style="flex: 0.3;">04/22</span>
</div>
<div class="panel-content-body-tr">
- <span class="body-item">搴撳尯8</span>
+ <span class="body-item sp">鏂扮枂鐗熸皬璋烽噾鍐滀笟绉戞妧鏈夐檺璐ｄ换鍏徃搴撳尯</span>
<span class="body-item">褰撴棩鍒嗘瀽涓�鍒囨甯�</span>
<span class="body-item" style="flex: 0.3;">04/22</span>
</div>
<div class="panel-content-body-tr">
- <span class="body-item">搴撳尯9</span>
+ <span class="body-item sp">鏂扮枂骞挎嘲闅嗗啘涓氬彂灞曟湁闄愬叕鍙�</span>
<span class="body-item">褰撴棩鍒嗘瀽涓�鍒囨甯�</span>
<span class="body-item" style="flex: 0.3;">04/22</span>
</div>
<div class="panel-content-body-tr">
- <span class="body-item">搴撳尯10</span>
+ <span class="body-item sp">浼婂畞鍘垮箍绮晢璐告湁闄愬叕鍙稿簱鍖�</span>
+ <span class="body-item">褰撴棩鍒嗘瀽涓�鍒囨甯�</span>
+ <span class="body-item" style="flex: 0.3;">04/22</span>
+ </div>
+ <div class="panel-content-body-tr">
+ <span class="body-item sp">鏄嫃75鍥�</span>
+ <span class="body-item">褰撴棩鍒嗘瀽涓�鍒囨甯�</span>
+ <span class="body-item" style="flex: 0.3;">04/22</span>
+ </div>
+ <div class="panel-content-body-tr">
+ <span class="body-item sp">鏄嫃77鍥�</span>
<span class="body-item">褰撴棩鍒嗘瀽涓�鍒囨甯�</span>
<span class="body-item" style="flex: 0.3;">04/22</span>
</div>
@@ -254,7 +264,7 @@
<h3>鏁ｇ伯 (鍚�)</h3>
</li>
<li>
- <p id="oilSum">0</p>
+ <p id="packFoodSum">0</p>
<h3>鎴愬搧 (鍚�)</h3>
</li>
</ul>
@@ -267,33 +277,33 @@
<div class="panel-title">搴撶偣淇℃伅</div>
<div class="right-topInfo-address">
<i class="i-icon32"><img th:src="@{/img/web/group/icon-address.png}" alt=""></i>
- <span id="cityAndCounty">涔岄瞾鏈ㄩ綈甯�</span>
+ <span id="county">涔岄瞾鏈ㄩ綈甯�</span>
</div>
<div class="panel-content">
- <h2 class="right-topInfo-kd-h" id="deptAreaName">搴撳尯1</h2>
+ <h2 class="right-topInfo-kd-h" id="deptName">搴撳尯1</h2>
<div class="right-topInfo-kd">
<div class="right-topInfo-kd-item">
- <h3>褰撴棩鍏ュ簱鏁帮紙涓級</h3>
- <p id="depotNum">0</p>
+ <h3>褰撴棩鍏ュ簱鍗曟暟锛堜釜锛�</h3>
+ <p id="inNum">0</p>
</div>
<div class="right-topInfo-kd-item">
- <h3>褰撴棩鍑哄簱鏁帮紙涓級</h3>
- <p id="depotOilNum">0</p>
+ <h3>褰撴棩鍑哄簱鍗曟暟锛堜釜锛�</h3>
+ <p id="outNum">0</p>
</div>
</div>
<ul class="right-topInfo-kd-list right-topInfo-jg">
<li>
- <p id="foodNum">0</p>
+ <p id="depotNumber">0</p>
<h3>浠撳簱鏁帮紙涓級</h3>
</li>
<li>
- <p id="oilNum">0</p>
- <h3>鍌ㄧ伯鏁帮紙鍚級</h3>
+ <p id="depotBankNumber">0</p>
+ <h3>璐ㄦ娂浠撴暟锛堜釜锛�</h3>
</li>
<li>
- <p id="area">0</p>
- <h3>鍗犲湴闈㈢Н锛坢虏锛�</h3>
+ <p id="storageNum">0</p>
+ <h3>搴撳瓨鏁帮紙鍚級</h3>
</li>
</ul>
</div>
@@ -436,9 +446,9 @@
<script th:src="@{/common/igds-common.js}"></script>
<script th:src="@{/group/mapList.js}"></script>
<script th:src="@{/group/index.js}"></script>
-<script th:inline="javascript">
- var userId = [[${loginUser.loginName}]];
- var companyId = [[${loginUser.companyId}]];
+<script th:inline="javascript"> var userId = [[${loginUser.loginName}]];
+var companyId = [[${loginUser.companyId}]];
+
var deptId = [[${deptId}]];
var dicSlogan = [[${dicSlogan}]];
var deptList = [[${deptList}]];
--
Gitblit v1.9.3