From f95c2cc9d70420202c07d469b49303e7b3b0d094 Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期五, 17 五月 2024 10:03:05 +0800
Subject: [PATCH] Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang
---
javaweb-plus/javaweb-admin/src/main/resources/templates/main.html | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html b/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
index 339bbbf..0dd78b1 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
+++ b/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
@@ -31,13 +31,7 @@
<div class="row">
<div class="col-sm-8">
-<!-- <div>-->
-<!-- <div class="col-md-4">-->
-<!-- <input type="text" class="form-control" placeholder="椤圭洰鍏抽敭璇嶆煡璇㈠畾浣�">-->
-<!-- </div>-->
-<!-- <button type="button" class="btn btn-success">鏌ヨ</button>-->
-<!-- </div>-->
- <div id="map_div" style="width: 100%;height: 570px;margin-top: 10px"></div>
+ <div id="map_div" style="width: 100%;height: 750px;"></div>
</div>
<div class="col-sm-4">
@@ -67,7 +61,13 @@
<script th:src="@{/ajax/libs/flot/jquery.flot.js}"></script>
<script th:src="@{/ajax/libs/report/echarts/echarts-all.js}"></script>
<script th:src="@{/js/tdt.js}" type="text/javascript"></script>
+
+ <script src="http://lbs.tianditu.gov.cn/js/lib/d3/d3.min.js" type="text/javascript"></script>
+ <script src="http://lbs.tianditu.gov.cn/api/js4.0/opensource/openlibrary/D3SvgOverlay.js" type="text/javascript"></script>
+
<script th:src="@{/js/custom/main.js}"></script>
+
+
<th:block th:include="include :: sparkline-js" />
<th:block th:include="include :: footer" />
--
Gitblit v1.9.1