From 1369c87ddcc0e76e17d01208ef66261ee0cd27da Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 27 二月 2026 18:13:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-web/src/main/resources/templates/group/gis.html | 82 ++++++++++++++---------------------------
1 files changed, 28 insertions(+), 54 deletions(-)
diff --git a/fzzy-igdss-web/src/main/resources/templates/group/gis.html b/fzzy-igdss-web/src/main/resources/templates/group/gis.html
index 6db5a86..a1de508 100644
--- a/fzzy-igdss-web/src/main/resources/templates/group/gis.html
+++ b/fzzy-igdss-web/src/main/resources/templates/group/gis.html
@@ -92,8 +92,8 @@
<div class="chartbox">
<div class="chart" id="breedChart"></div>
<div class="txt">
- <div class="n" id="foodSum">1433331 </div>
- <div class="p">鍚� </div>
+ <div class="n" id="foodSum">10 </div>
+ <div class="p">涓� </div>
</div>
</div>
</div>
@@ -102,99 +102,78 @@
<li>
<div class="con" style="background-color: rgba(0, 228, 250,.05);">
<div class="dot" style="background-color: rgb(0, 228, 250);"></div>
- <div class="num" style="color: rgb(0, 228, 250);">42.2%</div>
- <div class="type">娣峰悎灏忛害</div>
+ <div class="num" style="color: rgb(0, 228, 250);">0%</div>
+ <div class="type">浼婂畞甯�</div>
</div>
</li>
<li>
<div class="con" style="background-color: rgba(22, 226, 173,.05);">
<div class="dot" style="background-color: rgb(22, 226, 173);"></div>
- <div class="num" style="color: rgb(22, 226, 173);">12.6%</div>
- <div class="type">灏忛害</div>
+ <div class="num" style="color: rgb(22, 226, 173);">0%</div>
+ <div class="type">濂庡悲甯�</div>
</div>
</li>
<li>
<div class="con" style="background-color: rgba(255, 181, 23,.05);">
<div class="dot" style="background-color: rgb(255, 181, 23);"></div>
- <div class="num" style="color: rgb(255, 181, 23);">21.0%</div>
- <div class="type">鐜夌背</div>
+ <div class="num" style="color: rgb(255, 181, 23);">0%</div>
+ <div class="type">闇嶅皵鏋滄柉甯�</div>
</div>
</li>
<li>
<div class="con" style="background-color: rgba(238, 60, 72,.05);">
<div class="dot" style="background-color: rgb(238, 60, 72);"></div>
- <div class="num" style="color: rgb(238, 60, 72);">5.8%</div>
- <div class="type">绋昏胺</div>
+ <div class="num" style="color: rgb(238, 60, 72);">90%</div>
+ <div class="type">浼婂畞鍘�</div>
</div>
</li>
<li>
<div class="con" style="background-color: rgba(135, 103, 255,.05);">
<div class="dot" style="background-color: rgb(135, 103, 255);"></div>
- <div class="num" style="color: rgb(135, 103, 255);">0.9%</div>
- <div class="type">闈掔</div>
+ <div class="num" style="color: rgb(135, 103, 255);">0%</div>
+ <div class="type">瀵熷竷鏌ュ皵閿′集鑷不鍘�</div>
</div>
</li>
<li>
<div class="con" style="background-color: rgba(41, 122, 255,.05);">
<div class="dot" style="background-color: rgb(41, 122, 255);"></div>
- <div class="num" style="color: rgb(41, 122, 255);">10.2%</div>
- <div class="type">鑻﹁崬楹�</div>
+ <div class="num" style="color: rgb(41, 122, 255);">0%</div>
+ <div class="type">闇嶅煄鍘�</div>
</div>
</li>
<li>
<div class="con" style="background-color: rgba(238, 60, 144,.05);">
<div class="dot" style="background-color: rgb(238, 60, 144);"></div>
- <div class="num" style="color: rgb(238, 60, 144);">16.2%</div>
- <div class="type">澶ц眴</div>
+ <div class="num" style="color: rgb(238, 60, 144);">0%</div>
+ <div class="type">宸╃暀鍘�</div>
</div>
</li>
<li>
<div class="con" style="background-color: rgba(0, 228, 250,.05);">
<div class="dot" style="background-color: rgb(0, 228, 250);"></div>
- <div class="num" style="color: rgb(0, 228, 250);">42.2%</div>
- <div class="type">娣峰悎灏忛害</div>
+ <div class="num" style="color: rgb(0, 228, 250);">0%</div>
+ <div class="type">鏂版簮鍘�</div>
</div>
</li>
<li>
<div class="con" style="background-color: rgba(22, 226, 173,.05);">
<div class="dot" style="background-color: rgb(22, 226, 173);"></div>
- <div class="num" style="color: rgb(22, 226, 173);">12.6%</div>
- <div class="type">灏忛害</div>
+ <div class="num" style="color: rgb(22, 226, 173);">0%</div>
+ <div class="type">鏄嫃鍘�</div>
</div>
</li>
<li>
<div class="con" style="background-color: rgba(255, 181, 23,.05);">
<div class="dot" style="background-color: rgb(255, 181, 23);"></div>
- <div class="num" style="color: rgb(255, 181, 23);">21.0%</div>
- <div class="type">鐜夌背</div>
+ <div class="num" style="color: rgb(255, 181, 23);">0%</div>
+ <div class="type">鐗瑰厠鏂幙</div>
</div>
</li>
<li>
<div class="con" style="background-color: rgba(238, 60, 72,.05);">
- <div class="dot" style="background-color: rgb(238, 60, 72);"></div>
- <div class="num" style="color: rgb(238, 60, 72);">5.8%</div>
- <div class="type">绋昏胺</div>
- </div>
- </li>
- <li>
- <div class="con" style="background-color: rgba(135, 103, 255,.05);">
- <div class="dot" style="background-color: rgb(135, 103, 255);"></div>
- <div class="num" style="color: rgb(135, 103, 255);">0.9%</div>
- <div class="type">闈掔</div>
- </div>
- </li>
- <li>
- <div class="con" style="background-color: rgba(41, 122, 255,.05);">
- <div class="dot" style="background-color: rgb(41, 122, 255);"></div>
- <div class="num" style="color: rgb(41, 122, 255);">10.2%</div>
- <div class="type">鑻﹁崬楹�</div>
- </div>
- </li>
- <li>
- <div class="con" style="background-color: rgba(238, 60, 144,.05);">
- <div class="dot" style="background-color: rgb(238, 60, 144);"></div>
- <div class="num" style="color: rgb(238, 60, 144);">16.2%</div>
- <div class="type">澶ц眴</div>
+ <div class="dot" style="background-color: rgb(32,134,32);"></div>
+ <div class="num" style="color: rgb(32,134,32);">10%</div>
+ <div class="type">灏煎嫆鍏嬪幙</div>
</div>
</li>
</ul>
@@ -202,7 +181,6 @@
</div>
<div class="m-box2">
<div class="item">
-
<div class="bot">
<div class="chart" id="ss"></div>
</div>
@@ -430,16 +408,10 @@
</div>
-
-
- <!-- <script src="../js/bootstrap.min.js" type="text/javascript"></script> -->
-
- <script>
+ <script th:inline="javascript">
window._AMapSecurityConfig = {
securityJsCode:'39051edca2c561cb80d8f49b4624ab17',
}
- </script>
- <script th:inline="javascript">
var userId = [[${loginUser.loginName}]];
var companyId = [[${loginUser.companyId}]];
var deptId = [[${deptId}]];
@@ -447,7 +419,9 @@
var allArea = [[${allArea}]];
var deptList = [[${deptList}]];
var bizType = [[${bizType}]];
+ var bizTag = [[${bizTag}]];
var dicSlogan = [[${dicSlogan}]];
+ var gisData = [[${gisData}]];
var defaultAreaCode = [[${defaultAreaCode}]];
</script>
<script th:src="@{https://webapi.amap.com/maps?v=2.0&key=5249315a4ba00ea7212898d4449b8c0e&plugin=AMap.DistrictSearch}" src="https://webapi.amap.com/maps?v=2.0&key=5249315a4ba00ea7212898d4449b8c0e"></script>
--
Gitblit v1.9.3