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 | 117 +++++-----------------------------------------------------
1 files changed, 10 insertions(+), 107 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 ebcee67..0dd78b1 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
+++ b/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
@@ -13,128 +13,25 @@
<link rel="stylesheet" th:href="@{/css/custom/main.css}" />
<th:block th:include="include :: datetimepicker-css" />
<style type="text/css">
- .div_any_child {
- width: 100%;
- height: 280px;
- box-shadow: none !important;
- border: 1px solid #034c6a;
- box-sizing: border-box;
- position: relative;
- margin-top: 25px;
- }
-
- .con {
+ .content {
width: 100%;
background-color: rgba(0,0,0,0.01) !important;
- padding-top: 20px;
- padding-bottom: 20px;
}
</style>
</head>
<body class="gray-bg">
- <div class="con left">
- <!--鏁版嵁鎬绘-->
- <div class="con_div">
- <div class="con_div_text left">
- <div class="con_div_text01 left">
- <img th:src="@{/images/main/project.png}" class="left text01_img">
-
- <div class="left text01_div">
- <p>鍦ㄦ柦椤圭洰</p>
- <p class="panel_num project-num">0</p>
- </div>
- </div>
- <div class="con_div_text01 right">
- <img th:src="@{/images/main/project2.png}" class="left text01_img">
- <div class="left text01_div">
- <p>鍏ㄩ儴椤圭洰</p>
- <p class="panel_num all-project-num">0</p>
- </div>
- </div>
- </div>
- <div class="con_div_text left">
- <div class="con_div_text01 left">
- <img th:src="@{/images/main/company.png}" class="left text01_img">
- <div class="left text01_div">
- <p>鍦ㄦ柦浼佷笟</p>
- <p class="panel_num enterprise-num">0</p>
- </div>
- </div>
- <div class="con_div_text01 right">
- <img th:src="@{/images/main/company2.png}" class="left text01_img">
- <div class="left text01_div">
- <p>鍏ㄩ儴浼佷笟</p>
- <p class="panel_num all-enterprise-num">0</p>
- </div>
- </div>
- </div>
- <div class="con_div_text left">
- <div class="con_div_text01 left">
- <img th:src="@{/images/main/kantan.png}" class="left text01_img">
- <div class="left text01_div">
- <p>鍦ㄦ柦鍕樻帰鐐�</p>
- <p class="panel_num exploration-num">0</p>
- </div>
- </div>
- <div class="con_div_text01 right">
- <img th:src="@{/images/main/kantan2.png}" class="left text01_img">
- <div class="left text01_div">
- <p>鍏ㄩ儴鍕樻帰鐐�</p>
- <p class="panel_num all-exploration-num">0</p>
- </div>
- </div>
- </div>
- <div class="con_div_text left">
- <div class="con_div_text01 left">
- <img th:src="@{/images/main/jinchi.png}" class="left text01_img">
- <div class="left text01_div">
- <p>鍦ㄦ柦杩涘昂</p>
- <p class="panel_num jinchi-num">0</p>
- </div>
- </div>
- <div class="con_div_text01 right">
- <img th:src="@{/images/main/jinchi2.png}" class="left text01_img">
- <div class="left text01_div">
- <p>鍏ㄩ儴杩涘昂</p>
- <p class="panel_num all-jinchi-num">0</p>
- </div>
- </div>
- </div>
- <div class="con_div_text left">
- <div class="con_div_text01 left">
- <img th:src="@{/images/main/yichang.png}" class="left text01_img">
- <div class="left text01_div">
- <p>鍦ㄦ柦寮傚父鎬婚噺</p>
- <p class="panel_num abnormal-num">0</p>
- </div>
- </div>
- <div class="con_div_text01 right">
- <img th:src="@{/images/main/yichang2.png}" class="left text01_img">
- <div class="left text01_div">
- <p>鍏ㄩ儴寮傚父鎬婚噺</p>
- <p class="panel_num all-abnormal-num">0</p>
- </div>
- </div>
- </div>
- </div>
-
+ <div class="content">
<div class="col-sm-12">
<div class="ibox float-e-margins">
<div class="ibox-title">
- <h5>椤圭洰缁熻</h5>
+ <h3>娌夐檷鐩戞祴缃戝缓璁惧伐绋嬮」鐩垎甯�</h3>
</div>
<div class="ibox-content">
<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">
@@ -164,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