From 5e322ff901135f1dbc5a33699e25dc0efd5a640e Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期三, 22 五月 2024 16:05:52 +0800
Subject: [PATCH] 提交代码

---
 /dev/null                                                                                          |  652 -----------------
 javaweb-plus/javaweb-admin/src/main/resources/templates/main copy.html                             | 1202 +++++++++++++++++++++++++++++++
 javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java |   18 
 javaweb-plus/javaweb-admin/src/main/resources/templates/main.html                                  |  403 +---------
 4 files changed, 1,257 insertions(+), 1,018 deletions(-)

diff --git a/javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java b/javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java
index 65725e7..c46a855 100644
--- a/javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java
+++ b/javaweb-plus/javaweb-admin/src/main/java/com/javaweb/web/controller/system/SysIndexController.java
@@ -185,10 +185,12 @@
      * @return
      */
     @ResponseBody
-    @GetMapping("/system/indexVo")
-    public AjaxResult projectProcess2() {
+    @GetMapping("/system/indexDataCount")
+    public AjaxResult indexDataCount() {
         IndexVo result = new IndexVo();
-
+        result.setProjectStatus0(0);
+        result.setProjectStatus0(0);
+        result.setProjectStatus0(0);
         //=============================鏌ヨ鍦哄湴鏁伴噺===============================
         List<Project> projectList = projectService.selectProjectCountByStatus();
         if (!ObjectUtils.isEmpty(projectList)) {
@@ -204,16 +206,6 @@
                 }
             }
         }
-        if (ObjectUtils.isEmpty(result.getProjectStatus1())) {
-            result.setProjectStatus0(0);
-        }
-        if (ObjectUtils.isEmpty(result.getProjectStatus2())) {
-            result.setProjectStatus0(0);
-        }
-        if (ObjectUtils.isEmpty(result.getProjectStatus2())) {
-            result.setProjectStatus0(0);
-        }
-
         //=============================鏌ヨ杩涘昂===============================
         Hole hole = holeService.selectHoleTotalProcess();
         result.setFootageCplCount(hole.getFootageCpl());
diff --git "a/javaweb-plus/javaweb-admin/src/main/resources/templates/main - \345\211\257\346\234\254.html" "b/javaweb-plus/javaweb-admin/src/main/resources/templates/main - \345\211\257\346\234\254.html"
deleted file mode 100644
index 6d36a76..0000000
--- "a/javaweb-plus/javaweb-admin/src/main/resources/templates/main - \345\211\257\346\234\254.html"
+++ /dev/null
@@ -1,172 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org">
-<head>
-<th:block th:include="include :: header('寮瑰眰缁勪欢')" />
-<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet" />
-<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet" />
-<link href="../static/css/main/animate.min.css" th:href="@{/css/main/animate.min.css}" rel="stylesheet" />
-<link href="../static/css/main/style.min862f.css" th:href="@{/css/main/style.min862f.css}" rel="stylesheet" />
-<link rel="stylesheet" th:href="@{/css/custom/main.css}" />
-	<th:block th:include="include :: datetimepicker-css" />
-
-<link rel="stylesheet" href="../static/css/bootstrap.min.css" th:href="@{/js/elementUI/index.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 {
-			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="col-sm-12">
-			<div class="ibox float-e-margins">
-				<div class="ibox-title">
-					<h5>椤圭洰缁熻</h5>
-				</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>
-
-						<div class="col-sm-4">
-							<div>
-								<div class="col-md-6">
-									<span style="font-size:16px;font-weight: bold;line-height: 40px;">鐩戠鍗曚綅椤圭洰缁熻</span>
-								</div>
-								<div class="col-md-6" style="z-index:1;">
-									<div class="btn-group statistic-btn" style="float: right">
-										<button class="btn btn-white" type="button">鎬昏</button>
-										<button class="btn btn-white" type="button">鏈勾搴�</button>
-										<button class="btn btn-white" type="button">鏈湀搴�</button>
-									</div>
-								</div>
-							</div>
-							<div id="rank_chart" style="width: 100%;height: 600px;margin-top: 10px"></div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-
-	</div>
-
-	<script th:src="@{/js/jquery.min.js}"></script>
-	<script th:src="@{/js/bootstrap.min.js}"></script>
-	<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 th:src="@{/js/custom/main.js}"></script>
-	<th:block th:include="include :: sparkline-js" />
-	
-	<th:block th:include="include :: footer" />
-
-</body>
-</html>
diff --git a/javaweb-plus/javaweb-admin/src/main/resources/templates/main copy.html b/javaweb-plus/javaweb-admin/src/main/resources/templates/main copy.html
new file mode 100644
index 0000000..f65207f
--- /dev/null
+++ b/javaweb-plus/javaweb-admin/src/main/resources/templates/main copy.html
@@ -0,0 +1,1202 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<head>
+<th:block th:include="include :: header('寮瑰眰缁勪欢')" />
+<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet" />
+<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet" />
+<link href="../static/css/main/animate.min.css" th:href="@{/css/main/animate.min.css}" rel="stylesheet" />
+<link href="../static/css/main/style.min862f.css" th:href="@{/css/main/style.min862f.css}" rel="stylesheet" />
+<link rel="stylesheet" th:href="@{/css/custom/main.css}" />
+<link href="../static/js/elementUI/index.css" th:href="@{/js/elementUI/index.css}" rel="stylesheet" />
+
+<style type="text/css">
+	.content {
+		width: 100%;
+		background-color: rgba(0,0,0,0.01) !important;
+	}
+	.el-card__header{
+		height: 40px;
+		padding: 8px 20px;
+	}
+	.active-red{
+		width: 20px;
+		height: 20px;
+		border-radius: 50%;
+		font-size: 14px;
+		color: white;
+		background: #314659;
+		text-align: center;
+		line-height: 20px;
+		float: left;
+	}
+
+	.active-blue{
+		width: 20px;
+		height: 20px;
+		border-radius: 50%;
+		font-size: 16px;
+		color: white;
+		background: dodgerblue;
+		text-align: center;
+		line-height: 20px;
+		float: left;
+	}
+	.cdcode{
+		width: 15%;
+		float: left;
+		margin-left: 10px;
+		font-size: 16px;
+		line-height: 20px;
+	}
+	.cdstatus{
+		width: 15%;
+		float: left;
+		margin-left: 0px;
+		font-size: 16px;
+		line-height: 20px;
+	}
+	.cdprocess{
+		width: 60%;
+		float: left;
+		margin-left: 10px;
+	}
+	.rankrow{
+		margin-top: 12px;
+	}
+
+</style>
+</head>
+
+<body class="gray-bg">
+	<div class="content" id="app">
+		<el-row style="height: 130px;">
+			<el-col :span="6">
+				<el-card class="box-card">
+					<div>
+						<span style="color:rgba(0,0,0,.65);font-size: 15px;">鍦哄湴鏁伴噺</span>
+						<li class="el-icon-s-promotion" style="font-size: 18px;float: right;color: grey">
+					</div>
+					<div>
+						<span style="color:#000;font-size: 26px;word-break: break-all;line-height: 38px">34涓�
+						</span>
+					</div>
+					<div>
+						<span style="color:rgba(0,0,0,.65);font-size: 15px;">
+							鍗忚皟涓�   0
+							<li class="el-icon-caret-bottom" style="color: #f56c6c">
+						</span>
+						<span style="color:rgba(0,0,0,.65);font-size: 15px;">
+							寰呭紑宸�   34
+						    <li class="el-icon-caret-bottom" style="color: #e6a23c">
+						</span>
+						<span style="color:rgba(0,0,0,.65);font-size: 15px;">
+							杩涜涓�   0
+							<li class="el-icon-caret-top" style="color: #409eff">
+						</span>
+
+					</div>
+				</el-card>
+			</el-col>
+
+			<el-col :span="6">
+				<el-card class="box-card">
+					<div>
+						<span style="color:rgba(0,0,0,.65);font-size: 15px;">閽诲瓟杩涘昂</span>
+						<li class="el-icon-coin" style="font-size: 18px;float: right;color: grey">
+					</div>
+					<div>
+						<span style="color:#000;font-size: 26px;word-break: break-all;line-height: 38px">647涓�
+						</span>
+					</div>
+					<div>
+						<span style="color:rgba(0,0,0,.65);font-size: 15px;">
+							鎬昏繘灏�  134,1000.00m
+							<li class="el-icon-caret-bottom" style="color: #f56c6c">
+						</span>
+						<span style="color:rgba(0,0,0,.65);font-size: 15px;">
+							宸插畬鎴�   12,322.23m
+						    <li class="el-icon-caret-bottom" style="color: #409eff">
+						</span>
+					</div>
+				</el-card>
+			</el-col>
+
+			<el-col :span="6">
+				<el-card class="box-card">
+					<div>
+						<span style="color:rgba(0,0,0,.65);font-size: 15px;">瀹炴椂鐩戞帶</span>
+						<li class="el-icon-video-camera" style="font-size: 18px;float: right;color: grey">
+					</div>
+					<div>
+						<span style="color:#000;font-size: 26px;word-break: break-all;line-height: 38px">68涓�
+						</span>
+					</div>
+					<div>
+						<span style="color:rgba(0,0,0,.65);font-size: 15px;">
+							宸插畨瑁�  0
+							<li class="el-icon-caret-bottom" style="color: #f56c6c">
+						</span>
+						<span style="color:rgba(0,0,0,.65);font-size: 15px;">
+							鏈畨瑁�   68
+						    <li class="el-icon-caret-bottom" style="color: #409eff">
+						</span>
+					</div>
+				</el-card>
+			</el-col>
+			<el-col :span="6">
+				<el-card class="box-card">
+					<div>
+						<span style="color:rgba(0,0,0,.65);font-size: 15px;">璧勬枡鏂囦欢</span>
+						<li class="el-icon-s-order" style="font-size: 18px;float: right;color: grey">
+					</div>
+					<div>
+						<span style="color:#000;font-size: 26px;word-break: break-all;line-height: 38px">3813
+						</span>
+					</div>
+					<div>
+						<span style="color:rgba(0,0,0,.65);font-size: 15px;">
+							鎬昏繘灏�  134,1000.00m
+							<li class="el-icon-caret-bottom" style="color: #f56c6c">
+						</span>
+						<span style="color:rgba(0,0,0,.65);font-size: 15px;">
+							宸插畬鎴�   12,322.23m
+						    <li class="el-icon-caret-bottom" style="color: #409eff">
+						</span>
+					</div>
+
+				</el-card>
+			</el-col>
+		</el-row>
+		<el-row>
+			<el-col :span="16">
+				<el-card class="box-card">
+					<div style="height: 200px;">
+						<h3>鏉愭枡缁熻</h3>
+					</div>
+				</el-card>
+
+				<el-card class="box-card">
+					<div id="map_div" style="width: 100%;height: 550px;"></div>
+				</el-card>
+
+			</el-col>
+
+			<el-col :span="8">
+				<el-card class="box-card">
+					<div style="width: 100%;height: 20px;">
+						<h3>椤圭洰鎬讳綋杩涘害(%)</h3>
+					</div>
+					<div id="Chart1" style="width: 80%;height: 180px;margin-left: 10%;"></div>
+				</el-card>
+
+				<el-card class="box-card">
+					<div style="width: 100%;height: 20px;">
+						<h3>鍦哄湴璇︾粏杩涘害(%)</h3>
+					</div>
+					<div style="width: 100%;height: 500px;overflow: auto">
+<!--						<div id="Chart2" style="width: 100%;height: 1500px;"></div>-->
+
+						<el-row class="rankrow">
+							<el-col :span="2">
+								<div class="active-red">1</div>
+							</el-col>
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍦哄湴001</div>
+							</el-col >
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍗忚皟涓�</div>
+							</el-col>
+
+							<el-col :span="12">
+								<div><el-progress :stroke-width="12" :percentage="50"></el-progress></div>
+							</el-col>
+						</el-row>
+						<el-row class="rankrow">
+							<el-col :span="2">
+								<div class="active-red">1</div>
+							</el-col>
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍦哄湴002</div>
+							</el-col >
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍗忚皟涓�</div>
+							</el-col>
+
+							<el-col :span="12">
+								<div><el-progress :stroke-width="12" :percentage="50"></el-progress></div>
+							</el-col>
+						</el-row>
+						<el-row class="rankrow">
+							<el-col :span="2">
+								<div class="active-red">20</div>
+							</el-col>
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍦哄湴003</div>
+							</el-col >
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍗忚皟涓�</div>
+							</el-col>
+
+							<el-col :span="12">
+								<div><el-progress :stroke-width="12" :percentage="50"></el-progress></div>
+							</el-col>
+						</el-row>
+						<el-row class="rankrow">
+							<el-col :span="2">
+								<div class="active-red">1</div>
+							</el-col>
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍦哄湴001</div>
+							</el-col >
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍗忚皟涓�</div>
+							</el-col>
+
+							<el-col :span="12">
+								<div><el-progress :stroke-width="12" :percentage="50"></el-progress></div>
+							</el-col>
+						</el-row>
+						<el-row class="rankrow">
+							<el-col :span="2">
+								<div class="active-red">1</div>
+							</el-col>
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍦哄湴001</div>
+							</el-col >
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍗忚皟涓�</div>
+							</el-col>
+
+							<el-col :span="12">
+								<div><el-progress :stroke-width="12" :percentage="50"></el-progress></div>
+							</el-col>
+						</el-row>
+						<el-row class="rankrow">
+							<el-col :span="2">
+								<div class="active-red">1</div>
+							</el-col>
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍦哄湴001</div>
+							</el-col >
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍗忚皟涓�</div>
+							</el-col>
+
+							<el-col :span="12">
+								<div><el-progress :stroke-width="12" :percentage="50"></el-progress></div>
+							</el-col>
+						</el-row>
+						<el-row class="rankrow">
+							<el-col :span="2">
+								<div class="active-red">1</div>
+							</el-col>
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍦哄湴001</div>
+							</el-col >
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍗忚皟涓�</div>
+							</el-col>
+
+							<el-col :span="12">
+								<div><el-progress :stroke-width="12" :percentage="50"></el-progress></div>
+							</el-col>
+						</el-row>
+						<el-row class="rankrow">
+							<el-col :span="2">
+								<div class="active-red">1</div>
+							</el-col>
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍦哄湴001</div>
+							</el-col >
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍗忚皟涓�</div>
+							</el-col>
+
+							<el-col :span="12">
+								<div><el-progress :stroke-width="12" :percentage="50"></el-progress></div>
+							</el-col>
+						</el-row>
+						<el-row class="rankrow">
+							<el-col :span="2">
+								<div class="active-red">1</div>
+							</el-col>
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍦哄湴001</div>
+							</el-col >
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍗忚皟涓�</div>
+							</el-col>
+
+							<el-col :span="12">
+								<div><el-progress :stroke-width="12" :percentage="50"></el-progress></div>
+							</el-col>
+						</el-row>
+						<el-row class="rankrow">
+							<el-col :span="2">
+								<div class="active-red">1</div>
+							</el-col>
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍦哄湴001</div>
+							</el-col >
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍗忚皟涓�</div>
+							</el-col>
+
+							<el-col :span="12">
+								<div><el-progress :stroke-width="12" :percentage="50"></el-progress></div>
+							</el-col>
+						</el-row>
+						<el-row class="rankrow">
+							<el-col :span="2">
+								<div class="active-red">1</div>
+							</el-col>
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍦哄湴001</div>
+							</el-col >
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍗忚皟涓�</div>
+							</el-col>
+
+							<el-col :span="12">
+								<div><el-progress :stroke-width="12" :percentage="50"></el-progress></div>
+							</el-col>
+						</el-row>
+						<el-row class="rankrow">
+							<el-col :span="2">
+								<div class="active-red">1</div>
+							</el-col>
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍦哄湴001</div>
+							</el-col >
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍗忚皟涓�</div>
+							</el-col>
+
+							<el-col :span="12">
+								<div><el-progress :stroke-width="12" :percentage="50"></el-progress></div>
+							</el-col>
+						</el-row>
+						<el-row class="rankrow">
+							<el-col :span="2">
+								<div class="active-red">1</div>
+							</el-col>
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍦哄湴001</div>
+							</el-col >
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍗忚皟涓�</div>
+							</el-col>
+
+							<el-col :span="12">
+								<div><el-progress :stroke-width="12" :percentage="50"></el-progress></div>
+							</el-col>
+						</el-row>
+						<el-row class="rankrow">
+							<el-col :span="2">
+								<div class="active-red">1</div>
+							</el-col>
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍦哄湴001</div>
+							</el-col >
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍗忚皟涓�</div>
+							</el-col>
+
+							<el-col :span="12">
+								<div><el-progress :stroke-width="12" :percentage="50"></el-progress></div>
+							</el-col>
+						</el-row>
+						<el-row class="rankrow">
+							<el-col :span="2">
+								<div class="active-red">1</div>
+							</el-col>
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍦哄湴001</div>
+							</el-col >
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍗忚皟涓�</div>
+							</el-col>
+
+							<el-col :span="12">
+								<div><el-progress :stroke-width="12" :percentage="50"></el-progress></div>
+							</el-col>
+						</el-row>
+						<el-row class="rankrow">
+							<el-col :span="2">
+								<div class="active-red">1</div>
+							</el-col>
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍦哄湴001</div>
+							</el-col >
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍗忚皟涓�</div>
+							</el-col>
+
+							<el-col :span="12">
+								<div><el-progress :stroke-width="12" :percentage="50"></el-progress></div>
+							</el-col>
+						</el-row>
+						<el-row class="rankrow">
+							<el-col :span="2">
+								<div class="active-red">1</div>
+							</el-col>
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍦哄湴001</div>
+							</el-col >
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍗忚皟涓�</div>
+							</el-col>
+
+							<el-col :span="12">
+								<div><el-progress :stroke-width="12" :percentage="50"></el-progress></div>
+							</el-col>
+						</el-row>
+						<el-row class="rankrow">
+							<el-col :span="2">
+								<div class="active-red">1</div>
+							</el-col>
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍦哄湴001</div>
+							</el-col >
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍗忚皟涓�</div>
+							</el-col>
+
+							<el-col :span="12">
+								<div><el-progress :stroke-width="12" :percentage="50"></el-progress></div>
+							</el-col>
+						</el-row>
+						<el-row class="rankrow">
+							<el-col :span="2">
+								<div class="active-red">1</div>
+							</el-col>
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍦哄湴001</div>
+							</el-col >
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍗忚皟涓�</div>
+							</el-col>
+
+							<el-col :span="12">
+								<div><el-progress :stroke-width="12" :percentage="50"></el-progress></div>
+							</el-col>
+						</el-row>
+						<el-row class="rankrow">
+							<el-col :span="2">
+								<div class="active-red">1</div>
+							</el-col>
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍦哄湴001</div>
+							</el-col >
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍗忚皟涓�</div>
+							</el-col>
+
+							<el-col :span="12">
+								<div><el-progress :stroke-width="12" :percentage="50"></el-progress></div>
+							</el-col>
+						</el-row>
+						<el-row class="rankrow">
+							<el-col :span="2">
+								<div class="active-red">1</div>
+							</el-col>
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍦哄湴001</div>
+							</el-col >
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍗忚皟涓�</div>
+							</el-col>
+
+							<el-col :span="12">
+								<div><el-progress :stroke-width="12" :percentage="50"></el-progress></div>
+							</el-col>
+						</el-row>
+						<el-row class="rankrow">
+							<el-col :span="2">
+								<div class="active-red">1</div>
+							</el-col>
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍦哄湴001</div>
+							</el-col >
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍗忚皟涓�</div>
+							</el-col>
+
+							<el-col :span="12">
+								<div><el-progress :stroke-width="12" :percentage="50"></el-progress></div>
+							</el-col>
+						</el-row>
+						<el-row class="rankrow">
+							<el-col :span="2">
+								<div class="active-red">1</div>
+							</el-col>
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍦哄湴001</div>
+							</el-col >
+
+							<el-col :span="4">
+								<div style="font-size: 16px">鍗忚皟涓�</div>
+							</el-col>
+
+							<el-col :span="12">
+								<div><el-progress :stroke-width="12" :percentage="50"></el-progress></div>
+							</el-col>
+						</el-row>
+
+
+					</div>
+
+				</el-card>
+
+			</el-col>
+
+		</el-row>
+
+	</div>
+
+	<script th:src="@{/js/jquery.min.js}"></script>
+	<script th:src="@{/js/bootstrap.min.js}"></script>
+	<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>
+
+	<script th:src="@{/js/vue.min.js}"></script>
+	<script th:src="@{/js/elementUI/index.js}"></script>
+
+	<th:block th:include="include :: sparkline-js" />
+	<th:block th:include="include :: footer" />
+
+	<script th:inline="javascript">
+
+	$(function() {
+		loadMap();
+		getReallyData();
+		totalProcess();
+		stationProcess();
+	})
+	var vm = new Vue({
+		el: "#app",
+		data() {
+			return {};
+		},
+		methods: {
+		}
+	});
+	// 鍔犺浇鍦板浘
+	let map=null;
+	var countries = [];
+	var countriesOverlay = new T.D3Overlay(init,redraw);
+	var countriesOverlay1 = new T.D3Overlay(init1,redraw1);
+	function loadMap() {
+		map = new T.Map('map_div');
+		map.centerAndZoom(new T.LngLat(116.38, 40.2), 9);
+
+		var control = new T.Control.Zoom();
+		control.setPosition(T_ANCHOR_TOP_RIGHT);
+		map.addControl(control);// 娣诲姞缂╂斁骞崇Щ鎺т欢
+		var scale = new T.Control.Scale();// 鍒涘缓姣斾緥灏烘帶浠跺璞�
+		d3.json("/bjfw/js/custom/beijing.json", function (data) {
+			countries = data.features;
+			map.addOverLay(countriesOverlay)
+			countriesOverlay.bringToBack();
+			map.addOverLay(countriesOverlay1)
+			countriesOverlay.bringToBack();
+		});
+	}
+
+	function init(sel, transform) {
+		var upd = sel.selectAll('path.geojson').data(countries);
+		upd.enter()
+				.append('path')
+				.attr("class", "geojson")
+				.attr('stroke', 'grey')
+				.attr('fill', function (d, i) {
+					//return d3.hsl(Math.random() * 360, 0.9, 0.5)
+					return "transparent"
+				})
+				.attr('fill-opacity', '0')
+	}
+	function redraw(sel, transform) {
+		sel.selectAll('path.geojson').each(
+				function (d, i) {
+					d3.select(this).attr('d', transform.pathFromGeojson)
+				}
+		)
+	}
+	function init1(sel, transform) {
+		var upd = sel.selectAll('path.geojson1').data(countries);
+		upd.enter()
+				.append('path')
+				.attr("class", "geojson1")
+				.attr('stroke', 'grey')
+				.attr('fill', function (d, i) {
+					return d3.hsl(Math.random() * 360, 0.9, 0.5)
+				})
+				.attr('fill-opacity', '0.1')
+	}
+
+	function redraw1(sel, transform) {
+		sel.selectAll('path.geojson1').each(
+				function (d, i) {
+					d3.select(this).attr('d', transform.pathFromGeojson)
+				}
+		)
+	}
+
+	// 鑾峰彇鏁版嵁搴撶湡瀹炴暟鎹�
+	function getReallyData() {
+		let url = window.location.protocol + "//" + window.location.host + "/bjfw/system/project";
+		$.get(url,function(res){
+			var data = res.projects;
+			showProjectPoint(data);
+		})
+	}
+	//鍦板浘涓婂睍绀洪」鐩偣
+	function showProjectPoint(data){
+		var projectIcon = new T.Icon({
+			iconUrl: '/bjfw/images/icon/6.png',
+			iconSize: new T.Point(30, 30),
+			iconAnchor: new T.Point(6, 40),
+		});
+		for(let i =0;i<data.length;i++){
+			let lng = data[i].lng;
+			let lat = data[i].lat;
+			let marker = new T.Marker(new T.LngLat(lng, lat), { title: "鍦哄湴浣嶇疆",icon:projectIcon});
+			let proj = infoWindowProject(data[i]);
+			addClickHandler(proj, marker);
+			map.addOverLay(marker);
+		}
+
+	}
+
+	function infoWindowProject(e){
+
+		let ids = e.ids + "";
+		var sContent =
+				"<div style='margin:0px;'>" +
+				"<div>" +
+				"<div style='margin:1px 0px 1px 2px;width: 200px;'>" +
+				"<font style='font-weight: bolder;'>鍦哄湴缂栧彿 :</font>" + e.code + "<br>" +
+				"<font style='font-weight: bolder;'>鍦哄湴鍚嶅瓧 :</font>" + e.fullName + "<br>" +
+				"<font style='font-weight: bolder;'>璐熻矗浜� :</font>" + e.leader + "<br>" +
+				"<a class='btn' onclick=viewdata(" +"'" + ids+ "'" + ")>鍦哄湴鏁版嵁</a>" +
+				"</div>" +
+				"</div>" +
+				"</div>";
+		return sContent;
+	}
+	function viewdata (id) {
+		$.modal.openTab("鍦哄湴瀵艰埅",ctx+ "/geo/project/navigate?ids="+id);
+	}
+
+	function addClickHandler(content, marker) {
+		marker.addEventListener("click", function (e) {
+			openInfo(content, e)
+		});
+	}
+
+	function openInfo(content, e) {
+		var point = e.lnglat;
+		var markerInfoWin = new T.InfoWindow(content, { offset: new T.Point(0, -30) }); // 鍒涘缓淇℃伅绐楀彛瀵硅薄
+		map.openInfoWindow(markerInfoWin, point); //寮�鍚俊鎭獥鍙�
+	}
+
+	//鎬昏繘搴︿华琛ㄧ洏
+	function totalProcess() {
+		var Chart1 = echarts.init(document.getElementById('Chart1'));
+		var pointerData = 0; // 浠〃鎸囬拡鏁版嵁
+		let url = ctx + "/system/totalProcess";
+		$.ajaxSettings.async = false;
+		$.get(url,{},function(res){
+			pointerData = res.pointerData;
+			pointerData = (pointerData*100).toFixed(0);
+		})
+		$.ajaxSettings.async = false;
+		var option = {
+			backgroundColor: "#fff",
+			series: [
+				{
+					type: "gauge",
+					radius: 80,
+					z: 1,
+					startAngle: 225,
+					endAngle: -45,
+					splitNumber: 50,
+					title: {
+						color: "red",
+					},
+					splitLine: {
+						show: true,
+						length: 15,
+						distance: -10,
+						lineStyle: {
+							color: "#fff",
+							width: 1,
+						},
+					},
+					detail: {
+						show: true,
+						offsetCenter: [0, 60],
+						fontSize: 22,
+						formatter: (val) => [`{a|${val}}`, `{b|%}`].join(""),
+						rich: {
+							a: {
+								fontSize: 20,
+								color: "rgba(84, 108, 198, 0.65)",
+							},
+							b: {
+								fontSize: 24,
+								color: "rgba(84, 108, 198, 0.65)",
+							},
+						},
+					},
+					// 浠〃鐩樼殑绾匡紝棰滆壊鍊间负涓�涓暟缁�
+					axisLine: {
+						show: true,
+						// 涓ょ鏄惁璁剧疆涓哄渾瑙掞紱鍦�5.0涔嬪悗鐨勭増鏈湁鏁�
+						roundCap: false,
+						lineStyle: {
+							width: 15,
+							shadowColor: "#0093ee", //榛樿閫忔槑
+							shadowOffsetX: 0,
+							shadowOffsetY: 0,
+							shadowBlur: 20,
+							opacity: 1,
+							color: [
+								[
+									pointerData / 100,
+									{
+										x: 0,
+										y: 0,
+										x1: 1,
+										y1: 0,
+										colorStops: [
+											{
+												offset: 0,
+												color: "rgba(0, 255, 255, 0.6)",
+											},
+											{
+												offset: 1,
+												color: "rgba(0, 0, 255, .6)",
+											},
+										],
+									},
+								],
+								[1, "rgba(0,0,0,0.15)"],
+							],
+						},
+					},
+					// 浠〃鐩樺埢搴︽爣绛�
+					axisLabel: {
+						show: true,
+						color: "rgba(84, 108, 198, 0.65)",
+						fontSize: 14,
+						distance: 20,
+						formatter: (val) => {
+							const num = Math.floor(val);
+							return num % 20 === 0 ? num : "";
+						},
+					},
+					// 鍒诲害
+					axisTick: {
+						show: false,
+					},
+					// 鎸囬拡锛屾璁剧疆浠呭5.0浠ヤ笂鐨勭増鏈敓鏁�
+					anchor: {
+						show: true,
+						icon: "circle",
+						showAbove: true,
+						size: 20,
+						itemStyle: {
+							borderWidth: 6,
+							borderColor: "rgba(84, 108, 198, 0.85)",
+						},
+					},
+					data: [pointerData],
+				},
+				{
+					// 鑳屾櫙娓愬彉鑹�
+					type: "pie",
+					radius: "80%",
+					// 涓嶅搷搴斿強瑙﹀彂榧犳爣浜嬩欢
+					silent: true,
+					// 鍏抽棴鑳屾櫙鍔ㄧ敾
+					animation: false,
+					z: 0,
+					itemStyle: {
+						color: {
+							type: "radial", // 寰勫悜娓愬彉
+							x: 0.5,
+							y: 0.5,
+							r: 0.25,
+							colorStops: [
+								{
+									offset: 0,
+									color: "rgba(84, 103, 198, 0.6)",
+								},
+								{
+									offset: 0.1,
+									color: "rgba(84, 103, 198, 0.35)",
+								},
+								{
+									offset: 1,
+									color: "rgba(84, 103, 198, 0)",
+								},
+							],
+						},
+					},
+					data: [pointerData],
+				},
+			],
+		};
+		Chart1.setOption(option);
+	}
+
+	var datas = [
+		{ ranking: 1, station: '鍦哄湴001    鍗忚皟涓�', value: 85 },
+		{ ranking: 2, station: '鍦哄湴002    鍗忚皟涓�', value: 22 },
+		{ ranking: 3, station: '鍦哄湴003', value: 33 },
+		{ ranking: 4, station: '鍦哄湴004', value: 40 },
+		{ ranking: 5, station: '鍦哄湴005', value: 33 },
+		{ ranking: 6, station: '鍦哄湴006', value: 14.97 },
+		{ ranking: 7, station: '鍦哄湴007', value: 13.03 },
+		{ ranking: 8, station: '鍦哄湴008', value: 18.48 },
+		{ ranking: 9, station: '鍦哄湴009', value: 16.74 },
+		{ ranking: 10, station: '鍦哄湴010', value: 14.97 },
+
+		{ ranking: 11, station: '鍦哄湴011', value: 13.03 },
+		{ ranking: 12, station: '鍦哄湴012', value: 18.48 },
+
+		{ ranking: 13, station: '鍦哄湴013', value: 16.74 },
+		{ ranking: 14, station: '鍦哄湴014', value: 14.97 },
+		{ ranking: 15, station: '鍦哄湴015', value: 13.03 },
+		{ ranking: 16, station: '鍦哄湴016', value: 18.48 },
+
+		{ ranking: 17, station: '鍦哄湴017', value: 16.74 },
+		{ ranking: 18, station: '鍦哄湴018', value: 14.97 },
+		{ ranking: 19, station: '鍦哄湴019', value: 13.03 },
+		{ ranking: 20, station: '鍦哄湴020', value: 18.48 },
+
+		{ ranking: 21, station: '鍦哄湴021', value: 16.74 },
+		{ ranking: 22, station: '鍦哄湴022', value: 14.97 },
+		{ ranking: 23, station: '鍦哄湴023', value: 13.03 },
+		{ ranking: 24, station: '鍦哄湴024', value: 18.48 },
+
+		{ ranking: 25, station: '鍦哄湴025', value: 16.74 },
+		{ ranking: 26, station: '鍦哄湴026', value: 14.97 },
+		{ ranking: 27, station: '鍦哄湴027', value: 13.03 },
+		{ ranking: 28, station: '鍦哄湴028', value: 18.48 },
+
+		{ ranking: 29, station: '鍦哄湴029', value: 13.03 },
+		{ ranking: 30, station: '鍦哄湴030', value: 18.48 },
+		{ ranking: 31, station: '鍦哄湴031', value: 13.03 },
+		{ ranking: 32, station: '鍦哄湴032', value: 18.48 },
+		{ ranking: 33, station: '鍦哄湴033', value: 13.03 },
+		{ ranking: 34, station: '鍦哄湴034', value: 18.48 },
+	];
+
+
+	var seriesName = ['宸插畬鎴愯繘搴�','鎬昏繘搴�'];
+	var attackSourcesColor1 = ['#FF557F','#FFAA00','#5470C6','#1E9FFF'];
+
+	var attackSourcesColor = [
+		new echarts.graphic.LinearGradient(0, 1, 1, 1, [
+			{ offset: 0, color: 'rgba(255,85,127,1)' },
+			{ offset: 1, color: 'rgba(255,85,127,1)' },
+		]),
+		new echarts.graphic.LinearGradient(0, 1, 1, 1, [
+			{ offset: 0, color: 'rgba(255,170,0,1)' },
+			{ offset: 1, color: 'rgba(255,170,0,1)' },
+		]),
+		new echarts.graphic.LinearGradient(0, 1, 1, 1, [
+			{ offset: 0, color: 'rgba(84,112,198,1)' },
+			{ offset: 1, color: 'rgba(84,112,198,1)' },
+		]),
+		new echarts.graphic.LinearGradient(0, 1, 1, 1, [
+			{ offset: 0, color: 'rgba(30,159,255,.82)' },
+			{ offset: 1, color: 'rgba(30,159,255,.82)' },
+		]),
+	];
+	
+	function stationProcess() {
+
+		let url = ctx + "/system/projectProcess";
+		$.ajaxSettings.async = false;
+		$.get(url,{},function(res){
+			console.log(res.projectData);
+			datas = res.projectData;
+		})
+		$.ajaxSettings.async = false;
+
+
+		var Chart2 = echarts.init(document.getElementById('Chart2'));
+		var rankings = [];
+		var stationData = [];
+		var values = [];
+
+		datas.forEach(function (it, index) {
+			rankings.push(it.ranking);
+			stationData.push(it.station);
+			values.push(it.value);
+		});
+
+		option = {
+			// backgroundColor: '#000',
+			tooltip: {
+				trigger: 'axis',
+				axisPointer: {
+					type: 'shadow',
+				},
+			},
+
+			grid: {
+				left: '-8%',
+				right: '2%',
+				bottom: '3%',
+				top:'2%',
+				containLabel: true,
+			},
+			xAxis: {
+				type: 'value',
+				splitLine: {
+					show: false,
+				},
+				axisLabel: {
+					show: false,
+				},
+				axisTick: {
+					show: false,
+				},
+				axisLine: {
+					show: false,
+				},
+			},
+			yAxis: [
+				{
+					type: 'category',
+					inverse: true,
+					axisLine: {
+						show: false,
+					},
+					axisTick: {
+						show: false,
+					},
+					data: stationData,
+					axisLabel: {
+						margin: 30,
+						fontSize: 14,
+						align: 'left',
+						padding: [3, 0, 0, 0],
+						color: '#000',
+						rich: {
+							nt1: {
+								color: '#fff',
+								backgroundColor: attackSourcesColor1[0],
+								width: 20,
+								height: 18,
+								fontSize: 12,
+								align: 'center',
+								borderRadius: 50,
+								lineHeight: '5',
+								padding: [2, 0, 0, 0],
+								// padding:[0,0,2,0],
+							},
+							nt2: {
+								color: '#fff',
+								backgroundColor: attackSourcesColor1[1],
+								width: 20,
+								height: 18,
+								fontSize: 12,
+								align: 'center',
+								borderRadius: 50,
+								padding: [2, 0, 0, 0],
+							},
+							nt3: {
+								color: '#fff',
+								backgroundColor: attackSourcesColor1[2],
+								width: 20,
+								height: 18,
+								fontSize: 12,
+								align: 'center',
+								borderRadius: 50,
+								padding: [2, 0, 0, 0],
+							},
+							nt: {
+								color: '#fff',
+								backgroundColor: attackSourcesColor1[3],
+								width: 20,
+								height: 18,
+								fontSize: 12,
+								align: 'center',
+								borderRadius: 50,
+								padding: [2, 0, 0, 0],
+							},
+						},
+						formatter: function (value, index) {
+							index = contains(stationData, value) + 1;
+							if (index - 1 < 3) {
+								return ['{nt' + index + '|' + index + '}'].join('\n');
+							} else {
+								return ['{nt|' + index + '}'].join('\n');
+							}
+						},
+					},
+				},
+
+				{
+					type: 'category',
+					inverse: true,
+					axisTick: 'none',
+					axisLine: 'none',
+					show: true,
+					axisLabel: {
+						textStyle: {
+							color: '#666',
+							fontSize: '12',
+						},
+					},
+					data: dataFormat(values),
+				},
+
+				{  // 鏉$姸鏍囬
+					type: 'category',
+					inverse: true,
+					offset: -10,
+					position: 'left',
+					axisTick: 'none',
+					axisLine: 'none',
+					show: true,
+					axisLabel: {
+						interval: 0,
+						color: ['#666'],
+						align: 'left',
+						verticalAlign: 'bottom',
+						lineHeight: 42,
+						fontSize: 14,
+					},
+					data: dataFormat(stationData),
+				},
+			],
+			series: [
+				{
+					zlevel: 1,
+					name: seriesName[0],
+					type: 'bar',
+					barWidth: 15,
+					data: dataFormat(values),
+					align: 'center',
+					itemStyle: {
+						normal: {
+							barBorderRadius: 10,
+						},
+					},
+					label: {   //鏉$姸涓殑鏍峰紡
+						show: true,
+						fontSize: 10,
+						color: '#fff', //鏉¤涓瓧浣撻鑹�
+						textBorderWidth: 2,
+						padding: [2, 0, 0, 0],
+					},
+				},
+				{
+					name: seriesName[1],
+					type: 'bar',
+					barWidth: 15,
+					barGap: '-100%',
+					data: [100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
+						100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
+						100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
+						100, 100, 100, 100],
+					itemStyle: {
+						normal: {
+							color: 'rgba(200,200,200,.3)',
+							//width:"100%",
+							fontSize: 12,
+							barBorderRadius: 30,
+						},
+					},
+				},
+			],
+		};
+		Chart2.setOption(option);
+	}
+
+	function dataFormat(data) {
+		var arr = [];
+		data.forEach(function (item, i) {
+			let itemStyle = {
+				color: i > 3 ? attackSourcesColor[3] : attackSourcesColor[i],
+			};
+			arr.push({
+				value: item,
+				itemStyle: itemStyle,
+			});
+		});
+		return arr;
+	}
+
+	function contains(arr, dst) {
+		var i = arr.length;
+		while ((i -= 1)) {
+			if (arr[i] == dst) {
+				return i;
+			}
+		}
+		return false;
+	}
+
+
+
+
+</script>
+
+</body>
+</html>
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 403df31..ff61655 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
+++ b/javaweb-plus/javaweb-admin/src/main/resources/templates/main.html
@@ -22,7 +22,7 @@
 		width: 20px;
 		height: 20px;
 		border-radius: 50%;
-		font-size: 16px;
+		font-size: 14px;
 		color: white;
 		background: #314659;
 		text-align: center;
@@ -61,7 +61,7 @@
 		margin-left: 10px;
 	}
 	.rankrow{
-		margin-top: 15px;
+		margin-top: 12px;
 	}
 
 </style>
@@ -82,7 +82,7 @@
 					</div>
 					<div>
 						<span style="color:rgba(0,0,0,.65);font-size: 15px;">
-							鍗忚皟涓�   0
+							鍗忚皟涓�
 							<li class="el-icon-caret-bottom" style="color: #f56c6c">
 						</span>
 						<span style="color:rgba(0,0,0,.65);font-size: 15px;">
@@ -105,7 +105,7 @@
 						<li class="el-icon-coin" style="font-size: 18px;float: right;color: grey">
 					</div>
 					<div>
-						<span style="color:#000;font-size: 26px;word-break: break-all;line-height: 38px">864涓�
+						<span style="color:#000;font-size: 26px;word-break: break-all;line-height: 38px">647涓�
 						</span>
 					</div>
 					<div>
@@ -128,16 +128,16 @@
 						<li class="el-icon-video-camera" style="font-size: 18px;float: right;color: grey">
 					</div>
 					<div>
-						<span style="color:#000;font-size: 26px;word-break: break-all;line-height: 38px">114涓�
+						<span style="color:#000;font-size: 26px;word-break: break-all;line-height: 38px">68涓�
 						</span>
 					</div>
 					<div>
 						<span style="color:rgba(0,0,0,.65);font-size: 15px;">
-							鎬昏繘灏�  134,1000.00m
+							宸插畨瑁�  0
 							<li class="el-icon-caret-bottom" style="color: #f56c6c">
 						</span>
 						<span style="color:rgba(0,0,0,.65);font-size: 15px;">
-							宸插畬鎴�   12,322.23m
+							鏈畨瑁�   68
 						    <li class="el-icon-caret-bottom" style="color: #409eff">
 						</span>
 					</div>
@@ -170,9 +170,6 @@
 		<el-row>
 			<el-col :span="16">
 				<el-card class="box-card">
-<!--					<div slot="header">-->
-<!--						-->
-<!--					</div>-->
 					<div style="height: 200px;">
 						<h3>鏉愭枡缁熻</h3>
 					</div>
@@ -197,59 +194,24 @@
 						<h3>鍦哄湴璇︾粏杩涘害(%)</h3>
 					</div>
 					<div style="width: 100%;height: 500px;overflow: auto">
-<!--						<div id="Chart2" style="width: 100%;height: 1500px;"></div>-->
 
-						<el-row class="rankrow">
-							<el-col :span="2">
-								<div class="active-red">1</div>
-							</el-col>
+<!--						<el-row class="rankrow" v-for='entity in stationProcessData'>-->
+<!--							<el-col :span="2">-->
+<!--								<div class="active-red">{{entity.ranking}}</div>-->
+<!--							</el-col>-->
 
-							<el-col :span="4">
-								<div style="font-size: 16px">鍦哄湴001</div>
-							</el-col >
+<!--							<el-col :span="4">-->
+<!--								<div style="font-size: 16px">{{entity.station}}</div>-->
+<!--							</el-col >-->
 
-							<el-col :span="4">
-								<div style="font-size: 16px">鍗忚皟涓�</div>
-							</el-col>
+<!--							<el-col :span="4">-->
+<!--								<div style="font-size: 16px">{{entity.status}}</div>-->
+<!--							</el-col>-->
 
-							<el-col :span="12">
-								<div><el-progress :stroke-width="12" :percentage="50"></el-progress></div>
-							</el-col>
-						</el-row>
-						<el-row class="rankrow">
-							<el-col :span="2">
-								<div class="active-red">1</div>
-							</el-col>
-
-							<el-col :span="4">
-								<div style="font-size: 16px">鍦哄湴002</div>
-							</el-col >
-
-							<el-col :span="4">
-								<div style="font-size: 16px">鍗忚皟涓�</div>
-							</el-col>
-
-							<el-col :span="12">
-								<div><el-progress :stroke-width="12" :percentage="50"></el-progress></div>
-							</el-col>
-						</el-row>
-						<el-row class="rankrow">
-							<el-col :span="2">
-								<div class="active-red">1</div>
-							</el-col>
-
-							<el-col :span="4">
-								<div style="font-size: 16px">鍦哄湴003</div>
-							</el-col >
-
-							<el-col :span="4">
-								<div style="font-size: 16px">鍗忚皟涓�</div>
-							</el-col>
-
-							<el-col :span="12">
-								<div><el-progress :stroke-width="12" :percentage="50"></el-progress></div>
-							</el-col>
-						</el-row>
+<!--							<el-col :span="12">-->
+<!--								<div><el-progress :stroke-width="12" :percentage="{{entity.status}}"></el-progress></div>-->
+<!--							</el-col>-->
+<!--						</el-row>-->
 
 					</div>
 
@@ -282,12 +244,39 @@
 		loadMap();
 		getReallyData();
 		totalProcess();
-		stationProcess();
+		//stationProcess();
+		indexCount();
 	})
+
+	function indexCount() {
+		let url = ctx + "/system/indexDataCount";
+		$.ajaxSettings.async = false;
+		$.get(url,{},function(res){
+			console.log(res);
+			//vm.indexDataCount = res.projectData;
+		})
+		$.ajaxSettings.async = false;
+		console.log(vm.stationProcessData);
+	}
+
+	function stationProcess() {
+		let url = ctx + "/system/projectProcess";
+		$.ajaxSettings.async = false;
+		$.get(url,{},function(res){
+			console.log(res.projectData);
+			vm.stationProcessData = res.projectData;
+		})
+		$.ajaxSettings.async = false;
+		console.log(vm.stationProcessData);
+
+	}
 	var vm = new Vue({
 		el: "#app",
 		data() {
-			return {};
+			return {
+				stationProcessData: [],
+				indexDataCount :"",
+			};
 		},
 		methods: {
 		}
@@ -562,298 +551,6 @@
 		Chart1.setOption(option);
 	}
 
-	var datas = [
-		{ ranking: 1, station: '鍦哄湴001    鍗忚皟涓�', value: 85 },
-		{ ranking: 2, station: '鍦哄湴002    鍗忚皟涓�', value: 22 },
-		{ ranking: 3, station: '鍦哄湴003', value: 33 },
-		{ ranking: 4, station: '鍦哄湴004', value: 40 },
-		{ ranking: 5, station: '鍦哄湴005', value: 33 },
-		{ ranking: 6, station: '鍦哄湴006', value: 14.97 },
-		{ ranking: 7, station: '鍦哄湴007', value: 13.03 },
-		{ ranking: 8, station: '鍦哄湴008', value: 18.48 },
-		{ ranking: 9, station: '鍦哄湴009', value: 16.74 },
-		{ ranking: 10, station: '鍦哄湴010', value: 14.97 },
-
-		{ ranking: 11, station: '鍦哄湴011', value: 13.03 },
-		{ ranking: 12, station: '鍦哄湴012', value: 18.48 },
-
-		{ ranking: 13, station: '鍦哄湴013', value: 16.74 },
-		{ ranking: 14, station: '鍦哄湴014', value: 14.97 },
-		{ ranking: 15, station: '鍦哄湴015', value: 13.03 },
-		{ ranking: 16, station: '鍦哄湴016', value: 18.48 },
-
-		{ ranking: 17, station: '鍦哄湴017', value: 16.74 },
-		{ ranking: 18, station: '鍦哄湴018', value: 14.97 },
-		{ ranking: 19, station: '鍦哄湴019', value: 13.03 },
-		{ ranking: 20, station: '鍦哄湴020', value: 18.48 },
-
-		{ ranking: 21, station: '鍦哄湴021', value: 16.74 },
-		{ ranking: 22, station: '鍦哄湴022', value: 14.97 },
-		{ ranking: 23, station: '鍦哄湴023', value: 13.03 },
-		{ ranking: 24, station: '鍦哄湴024', value: 18.48 },
-
-		{ ranking: 25, station: '鍦哄湴025', value: 16.74 },
-		{ ranking: 26, station: '鍦哄湴026', value: 14.97 },
-		{ ranking: 27, station: '鍦哄湴027', value: 13.03 },
-		{ ranking: 28, station: '鍦哄湴028', value: 18.48 },
-
-		{ ranking: 29, station: '鍦哄湴029', value: 13.03 },
-		{ ranking: 30, station: '鍦哄湴030', value: 18.48 },
-		{ ranking: 31, station: '鍦哄湴031', value: 13.03 },
-		{ ranking: 32, station: '鍦哄湴032', value: 18.48 },
-		{ ranking: 33, station: '鍦哄湴033', value: 13.03 },
-		{ ranking: 34, station: '鍦哄湴034', value: 18.48 },
-	];
-
-
-	var seriesName = ['宸插畬鎴愯繘搴�','鎬昏繘搴�'];
-	var attackSourcesColor1 = ['#FF557F','#FFAA00','#5470C6','#1E9FFF'];
-
-	var attackSourcesColor = [
-		new echarts.graphic.LinearGradient(0, 1, 1, 1, [
-			{ offset: 0, color: 'rgba(255,85,127,1)' },
-			{ offset: 1, color: 'rgba(255,85,127,1)' },
-		]),
-		new echarts.graphic.LinearGradient(0, 1, 1, 1, [
-			{ offset: 0, color: 'rgba(255,170,0,1)' },
-			{ offset: 1, color: 'rgba(255,170,0,1)' },
-		]),
-		new echarts.graphic.LinearGradient(0, 1, 1, 1, [
-			{ offset: 0, color: 'rgba(84,112,198,1)' },
-			{ offset: 1, color: 'rgba(84,112,198,1)' },
-		]),
-		new echarts.graphic.LinearGradient(0, 1, 1, 1, [
-			{ offset: 0, color: 'rgba(30,159,255,.82)' },
-			{ offset: 1, color: 'rgba(30,159,255,.82)' },
-		]),
-	];
-	
-	function stationProcess() {
-
-		let url = ctx + "/system/projectProcess";
-		$.ajaxSettings.async = false;
-		$.get(url,{},function(res){
-			console.log(res.projectData);
-			datas = res.projectData;
-		})
-		$.ajaxSettings.async = false;
-
-
-		var Chart2 = echarts.init(document.getElementById('Chart2'));
-		var rankings = [];
-		var stationData = [];
-		var values = [];
-
-		datas.forEach(function (it, index) {
-			rankings.push(it.ranking);
-			stationData.push(it.station);
-			values.push(it.value);
-		});
-
-		option = {
-			// backgroundColor: '#000',
-			tooltip: {
-				trigger: 'axis',
-				axisPointer: {
-					type: 'shadow',
-				},
-			},
-
-			grid: {
-				left: '-8%',
-				right: '2%',
-				bottom: '3%',
-				top:'2%',
-				containLabel: true,
-			},
-			xAxis: {
-				type: 'value',
-				splitLine: {
-					show: false,
-				},
-				axisLabel: {
-					show: false,
-				},
-				axisTick: {
-					show: false,
-				},
-				axisLine: {
-					show: false,
-				},
-			},
-			yAxis: [
-				{
-					type: 'category',
-					inverse: true,
-					axisLine: {
-						show: false,
-					},
-					axisTick: {
-						show: false,
-					},
-					data: stationData,
-					axisLabel: {
-						margin: 30,
-						fontSize: 14,
-						align: 'left',
-						padding: [3, 0, 0, 0],
-						color: '#000',
-						rich: {
-							nt1: {
-								color: '#fff',
-								backgroundColor: attackSourcesColor1[0],
-								width: 20,
-								height: 18,
-								fontSize: 12,
-								align: 'center',
-								borderRadius: 50,
-								lineHeight: '5',
-								padding: [2, 0, 0, 0],
-								// padding:[0,0,2,0],
-							},
-							nt2: {
-								color: '#fff',
-								backgroundColor: attackSourcesColor1[1],
-								width: 20,
-								height: 18,
-								fontSize: 12,
-								align: 'center',
-								borderRadius: 50,
-								padding: [2, 0, 0, 0],
-							},
-							nt3: {
-								color: '#fff',
-								backgroundColor: attackSourcesColor1[2],
-								width: 20,
-								height: 18,
-								fontSize: 12,
-								align: 'center',
-								borderRadius: 50,
-								padding: [2, 0, 0, 0],
-							},
-							nt: {
-								color: '#fff',
-								backgroundColor: attackSourcesColor1[3],
-								width: 20,
-								height: 18,
-								fontSize: 12,
-								align: 'center',
-								borderRadius: 50,
-								padding: [2, 0, 0, 0],
-							},
-						},
-						formatter: function (value, index) {
-							index = contains(stationData, value) + 1;
-							if (index - 1 < 3) {
-								return ['{nt' + index + '|' + index + '}'].join('\n');
-							} else {
-								return ['{nt|' + index + '}'].join('\n');
-							}
-						},
-					},
-				},
-
-				{
-					type: 'category',
-					inverse: true,
-					axisTick: 'none',
-					axisLine: 'none',
-					show: true,
-					axisLabel: {
-						textStyle: {
-							color: '#666',
-							fontSize: '12',
-						},
-					},
-					data: dataFormat(values),
-				},
-
-				{  // 鏉$姸鏍囬
-					type: 'category',
-					inverse: true,
-					offset: -10,
-					position: 'left',
-					axisTick: 'none',
-					axisLine: 'none',
-					show: true,
-					axisLabel: {
-						interval: 0,
-						color: ['#666'],
-						align: 'left',
-						verticalAlign: 'bottom',
-						lineHeight: 42,
-						fontSize: 14,
-					},
-					data: dataFormat(stationData),
-				},
-			],
-			series: [
-				{
-					zlevel: 1,
-					name: seriesName[0],
-					type: 'bar',
-					barWidth: 15,
-					data: dataFormat(values),
-					align: 'center',
-					itemStyle: {
-						normal: {
-							barBorderRadius: 10,
-						},
-					},
-					label: {   //鏉$姸涓殑鏍峰紡
-						show: true,
-						fontSize: 10,
-						color: '#fff', //鏉¤涓瓧浣撻鑹�
-						textBorderWidth: 2,
-						padding: [2, 0, 0, 0],
-					},
-				},
-				{
-					name: seriesName[1],
-					type: 'bar',
-					barWidth: 15,
-					barGap: '-100%',
-					data: [100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
-						100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
-						100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
-						100, 100, 100, 100],
-					itemStyle: {
-						normal: {
-							color: 'rgba(200,200,200,.3)',
-							//width:"100%",
-							fontSize: 12,
-							barBorderRadius: 30,
-						},
-					},
-				},
-			],
-		};
-		Chart2.setOption(option);
-	}
-
-	function dataFormat(data) {
-		var arr = [];
-		data.forEach(function (item, i) {
-			let itemStyle = {
-				color: i > 3 ? attackSourcesColor[3] : attackSourcesColor[i],
-			};
-			arr.push({
-				value: item,
-				itemStyle: itemStyle,
-			});
-		});
-		return arr;
-	}
-
-	function contains(arr, dst) {
-		var i = arr.length;
-		while ((i -= 1)) {
-			if (arr[i] == dst) {
-				return i;
-			}
-		}
-		return false;
-	}
 
 
 
diff --git a/javaweb-plus/javaweb-admin/src/main/resources/templates/main2.html b/javaweb-plus/javaweb-admin/src/main/resources/templates/main2.html
deleted file mode 100644
index fd3f76a..0000000
--- a/javaweb-plus/javaweb-admin/src/main/resources/templates/main2.html
+++ /dev/null
@@ -1,153 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org">
-<head>
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<title>缁熻</title>
-<link rel="shortcut icon" href="favicon.ico">
-<link href="../static/css/bootstrap.min.css"
-	th:href="@{/css/bootstrap.min.css}" rel="stylesheet" />
-<link href="../static/css/font-awesome.min.css"
-	th:href="@{/css/font-awesome.min.css}" rel="stylesheet" />
-<link href="../static/css/main/animate.min.css"
-	th:href="@{/css/main/animate.min.css}" rel="stylesheet" />
-<link href="../static/css/main/style.min862f.css"
-	th:href="@{/css/main/style.min862f.css}" rel="stylesheet" />
-<link rel="stylesheet" th:href="@{/css/custom/main.css}" />
-</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/info_1.png}" class="left text01_img">
-					<div class="left text01_div">
-						<p>鍦ㄦ柦椤圭洰鏁伴噺</p>
-						<p class="project-num">12356</p>
-					</div>
-				</div>
-				<div class="con_div_text01 right">
-					<img th:src="@{/images/main/info_2.png}" class="left text01_img">
-					<div class="left text01_div">
-						<p>鍏ㄩ儴椤圭洰鏁伴噺</p>
-						<p class="all-project-num">12356</p>
-					</div>
-				</div>
-			</div>
-			<div class="con_div_text left">
-				<div class="con_div_text01 left">
-					<img th:src="@{/images/main/info_4.png}" class="left text01_img">
-					<div class="left text01_div">
-						<p>鍦ㄦ柦浼佷笟鏁伴噺</p>
-						<p class="enterprise-num sky">12356</p>
-					</div>
-				</div>
-				<div class="con_div_text01 right">
-					<img th:src="@{/images/main/info_5.png}" class="left text01_img">
-					<div class="left text01_div">
-						<p>鍏ㄩ儴浼佷笟鏁伴噺</p>
-						<p class="all-enterprise-num sky">12356</p>
-					</div>
-				</div>
-			</div>
-			<div class="con_div_text left">
-				<div class="con_div_text01 left">
-					<img th:src="@{/images/main/info_6.png}" class="left text01_img">
-					<div class="left text01_div">
-						<p>鍦ㄦ柦鍕樻帰鐐规暟閲�</p>
-						<p class="exploration-num org">12356</p>
-					</div>
-				</div>
-				<div class="con_div_text01 right">
-					<img th:src="@{/images/main/info_7.png}" class="left text01_img">
-					<div class="left text01_div">
-						<p>鍏ㄩ儴鍕樻帰鐐规暟閲�</p>
-						<p class="all-exploration-num org">12356</p>
-					</div>
-				</div>
-			</div>
-			<div class="con_div_text left">
-				<div class="con_div_text01 left">
-					<img th:src="@{/images/main/info_4.png}" class="left text01_img">
-					<div class="left text01_div">
-						<p>鍦ㄦ柦杩涘昂鎬婚噺</p>
-						<p class="jinchi-num sky">12356</p>
-					</div>
-				</div>
-				<div class="con_div_text01 right">
-					<img th:src="@{/images/main/info_5.png}" class="left text01_img">
-					<div class="left text01_div">
-						<p>鍏ㄩ儴杩涘昂鎬婚噺</p>
-						<p class="all-jinchi-num sky">12356</p>
-					</div>
-				</div>
-			</div>
-			<div class="con_div_text left">
-				<div class="con_div_text01 left">
-					<img th:src="@{/images/main/info_6.png}" class="left text01_img">
-					<div class="left text01_div">
-						<p>鍦ㄦ柦寮傚父鎬婚噺</p>
-						<p class="abnormal-num org">12356</p>
-					</div>
-				</div>
-				<div class="con_div_text01 right">
-					<img th:src="@{/images/main/info_7.png}" class="left text01_img">
-					<div class="left text01_div">
-						<p>鍏ㄩ儴寮傚父鎬婚噺</p>
-						<p class="all-abnormal-num org">12356</p>
-					</div>
-				</div>
-			</div>
-		</div>
-		<!--缁熻鍒嗘瀽鍥�-->
-		<div class="div_any">
-			<div class="left div_any01">
-				<div class="div_any_child">
-					<div class="div_any_title">
-						<img th:src="@{/images/main/title_1.png}">椤圭洰鏁伴噺缁熻
-					</div>
-					<p id="char1" class="p_chart"></p>
-				</div>
-				<div class="div_any_child">
-					<div class="div_any_title">
-						<img th:src="@{/images/main/title_2.png}">浼佷笟鏁伴噺缁熻
-					</div>
-					<p id="char2" class="p_chart"></p>
-				</div>
-			</div>
-			<div class="div_any02 left ">
-				<div class="div_any_child div_height">
-					<div class="div_any_title any_title_width">
-						<img th:src="@{/images/main/title_3.png}">鍕樻帰鍒嗗竷鍦板浘
-					</div>
-					<div id="map_div"></div>
-				</div>
-			</div>
-			<div class="right div_any01">
-				<div class="div_any_child">
-					<div class="div_any_title">
-						<img th:src="@{/images/main/title_4.png}">鍕樻帰鐐规暟閲忕粺璁�
-					</div>
-					<p id="char3" class="p_chart"></p>
-				</div>
-				<div class="div_any_child">
-					<div class="div_any_title">
-						<img th:src="@{/images/main/title_5.png}">杩涘昂鎬婚噺缁熻
-					</div>
-					<p id="char4" class="p_chart"></p>
-				</div>
-			</div>
-		</div>
-	</div>
-	<script th:src="@{/js/jquery.min.js}"></script>
-	<script th:src="@{/js/bootstrap.min.js}"></script>
-	<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 th:src="@{/js/custom/main.js}"></script>
-	<th:block th:include="include :: sparkline-js" />
-
-</body>
-</html>
diff --git a/javaweb-plus/javaweb-admin/src/main/resources/templates/main3.html b/javaweb-plus/javaweb-admin/src/main/resources/templates/main3.html
deleted file mode 100644
index ce0adc3..0000000
--- a/javaweb-plus/javaweb-admin/src/main/resources/templates/main3.html
+++ /dev/null
@@ -1,652 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org">
-<head>
-<th:block th:include="include :: header('寮瑰眰缁勪欢')" />
-<link href="../static/css/bootstrap.min.css"
-	th:href="@{/css/bootstrap.min.css}" rel="stylesheet" />
-<link href="../static/css/font-awesome.min.css"
-	th:href="@{/css/font-awesome.min.css}" rel="stylesheet" />
-<link href="../static/css/main/animate.min.css"
-	th:href="@{/css/main/animate.min.css}" rel="stylesheet" />
-<link href="../static/css/main/style.min862f.css"
-	th:href="@{/css/main/style.min862f.css}" rel="stylesheet" />
-<link rel="stylesheet" th:href="@{/css/custom/main.css}" />
-	<th:block th:include="include :: datetimepicker-css" />
-	<style type="text/css">
-		.content {
-			width: 100%;
-			background-color: rgba(0,0,0,0.01) !important;
-		}
-	</style>
-</head>
-
-<body class="gray-bg">
-	<div class="content">
-		<div class="col-sm-12">
-			<div class="ibox float-e-margins">
-				<div class="ibox-title">
-					<h3>娌夐檷鐩戞祴缃戝缓璁惧伐绋嬮」鐩垎甯�</h3>
-				</div>
-				<div class="ibox-content">
-
-					<div class="row">
-						<div class="col-sm-8">
-							<div id="map_div" style="width: 100%;height: 750px;"></div>
-						</div>
-
-						<div class="col-sm-4">
-							<div >
-								<div style="width: 100%;height: 20px;">
-									<h3>椤圭洰鎬讳綋杩涘害(%)</h3>
-								</div>
-								<div id="Chart1" style="width: 80%;height: 250px;margin-left: 10%;"></div>
-							</div>
-
-							<div >
-								<div style="width: 100%;height: 20px;">
-									<h3>鍦哄湴璇︾粏杩涘害(%)</h3>
-								</div>
-								<div style="width: 100%;height: 500px;overflow: auto">
-									<div id="Chart2" style="width: 100%;height: 1500px;"></div>
-								</div>
-
-							</div>
-
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-
-	</div>
-
-	<script th:src="@{/js/jquery.min.js}"></script>
-	<script th:src="@{/js/bootstrap.min.js}"></script>
-	<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" />
-
-	<script th:inline="javascript">
-
-	$(function() {
-		loadMap();
-		getReallyData();
-		totalProcess();
-		stationProcess();
-
-	})
-	// 鍔犺浇鍦板浘
-	let map=null;
-	var countries = [];
-	var countriesOverlay = new T.D3Overlay(init,redraw);
-	var countriesOverlay1 = new T.D3Overlay(init1,redraw1);
-	function loadMap() {
-		map = new T.Map('map_div');
-		map.centerAndZoom(new T.LngLat(116.38, 40.2), 9);
-
-		var control = new T.Control.Zoom();
-		control.setPosition(T_ANCHOR_TOP_RIGHT);
-		map.addControl(control);// 娣诲姞缂╂斁骞崇Щ鎺т欢
-		var scale = new T.Control.Scale();// 鍒涘缓姣斾緥灏烘帶浠跺璞�
-		d3.json("/bjfw/js/custom/beijing.json", function (data) {
-			countries = data.features;
-			map.addOverLay(countriesOverlay)
-			countriesOverlay.bringToBack();
-			map.addOverLay(countriesOverlay1)
-			countriesOverlay.bringToBack();
-		});
-	}
-
-	function init(sel, transform) {
-		var upd = sel.selectAll('path.geojson').data(countries);
-		upd.enter()
-				.append('path')
-				.attr("class", "geojson")
-				.attr('stroke', 'grey')
-				.attr('fill', function (d, i) {
-					//return d3.hsl(Math.random() * 360, 0.9, 0.5)
-					return "transparent"
-				})
-				.attr('fill-opacity', '0')
-	}
-	function redraw(sel, transform) {
-		sel.selectAll('path.geojson').each(
-				function (d, i) {
-					d3.select(this).attr('d', transform.pathFromGeojson)
-				}
-		)
-	}
-	function init1(sel, transform) {
-		var upd = sel.selectAll('path.geojson1').data(countries);
-		upd.enter()
-				.append('path')
-				.attr("class", "geojson1")
-				.attr('stroke', 'grey')
-				.attr('fill', function (d, i) {
-					return d3.hsl(Math.random() * 360, 0.9, 0.5)
-				})
-				.attr('fill-opacity', '0.1')
-	}
-
-	function redraw1(sel, transform) {
-		sel.selectAll('path.geojson1').each(
-				function (d, i) {
-					d3.select(this).attr('d', transform.pathFromGeojson)
-				}
-		)
-	}
-
-	// 鑾峰彇鏁版嵁搴撶湡瀹炴暟鎹�
-	function getReallyData() {
-		let url = window.location.protocol + "//" + window.location.host + "/bjfw/system/project";
-		$.get(url,function(res){
-			var data = res.projects;
-			showProjectPoint(data);
-		})
-	}
-	//鍦板浘涓婂睍绀洪」鐩偣
-	function showProjectPoint(data){
-		var projectIcon = new T.Icon({
-			iconUrl: '/bjfw/images/icon/6.png',
-			iconSize: new T.Point(30, 30),
-			iconAnchor: new T.Point(6, 40),
-		});
-		for(let i =0;i<data.length;i++){
-			let lng = data[i].lng;
-			let lat = data[i].lat;
-			let marker = new T.Marker(new T.LngLat(lng, lat), { title: "鍦哄湴浣嶇疆",icon:projectIcon});
-			let proj = infoWindowProject(data[i]);
-			addClickHandler(proj, marker);
-			map.addOverLay(marker);
-		}
-
-	}
-
-	function infoWindowProject(e){
-
-		let ids = e.ids + "";
-		var sContent =
-				"<div style='margin:0px;'>" +
-				"<div>" +
-				"<div style='margin:1px 0px 1px 2px;width: 200px;'>" +
-				"<font style='font-weight: bolder;'>鍦哄湴缂栧彿 :</font>" + e.code + "<br>" +
-				"<font style='font-weight: bolder;'>鍦哄湴鍚嶅瓧 :</font>" + e.fullName + "<br>" +
-				"<font style='font-weight: bolder;'>璐熻矗浜� :</font>" + e.leader + "<br>" +
-				"<a class='btn' onclick=viewdata(" +"'" + ids+ "'" + ")>鍦哄湴鏁版嵁</a>" +
-				"</div>" +
-				"</div>" +
-				"</div>";
-		return sContent;
-	}
-	function viewdata (id) {
-		$.modal.openTab("鍦哄湴瀵艰埅",ctx+ "/geo/project/navigate?ids="+id);
-	}
-
-	function addClickHandler(content, marker) {
-		marker.addEventListener("click", function (e) {
-			openInfo(content, e)
-		});
-	}
-
-	function openInfo(content, e) {
-		var point = e.lnglat;
-		var markerInfoWin = new T.InfoWindow(content, { offset: new T.Point(0, -30) }); // 鍒涘缓淇℃伅绐楀彛瀵硅薄
-		map.openInfoWindow(markerInfoWin, point); //寮�鍚俊鎭獥鍙�
-	}
-
-	//鎬昏繘搴︿华琛ㄧ洏
-	function totalProcess() {
-		var Chart1 = echarts.init(document.getElementById('Chart1'));
-		var pointerData = 0; // 浠〃鎸囬拡鏁版嵁
-		let url = ctx + "/system/totalProcess";
-		$.ajaxSettings.async = false;
-		$.get(url,{},function(res){
-			pointerData = res.pointerData;
-			pointerData = (pointerData*100).toFixed(0);
-		})
-		$.ajaxSettings.async = false;
-		var option = {
-			backgroundColor: "#fff",
-			series: [
-				{
-					type: "gauge",
-					radius: 120,
-					z: 1,
-					startAngle: 225,
-					endAngle: -45,
-					splitNumber: 50,
-					title: {
-						color: "red",
-					},
-					splitLine: {
-						show: true,
-						length: 15,
-						distance: -10,
-						lineStyle: {
-							color: "#fff",
-							width: 1,
-						},
-					},
-					detail: {
-						show: true,
-						offsetCenter: [0, 60],
-						fontSize: 22,
-						formatter: (val) => [`{a|${val}}`, `{b|%}`].join(""),
-						rich: {
-							a: {
-								fontSize: 20,
-								color: "rgba(84, 108, 198, 0.65)",
-							},
-							b: {
-								fontSize: 24,
-								color: "rgba(84, 108, 198, 0.65)",
-							},
-						},
-					},
-					// 浠〃鐩樼殑绾匡紝棰滆壊鍊间负涓�涓暟缁�
-					axisLine: {
-						show: true,
-						// 涓ょ鏄惁璁剧疆涓哄渾瑙掞紱鍦�5.0涔嬪悗鐨勭増鏈湁鏁�
-						roundCap: false,
-						lineStyle: {
-							width: 15,
-							shadowColor: "#0093ee", //榛樿閫忔槑
-							shadowOffsetX: 0,
-							shadowOffsetY: 0,
-							shadowBlur: 20,
-							opacity: 1,
-							color: [
-								[
-									pointerData / 100,
-									{
-										x: 0,
-										y: 0,
-										x1: 1,
-										y1: 0,
-										colorStops: [
-											{
-												offset: 0,
-												color: "rgba(0, 255, 255, 0.6)",
-											},
-											{
-												offset: 1,
-												color: "rgba(0, 0, 255, .6)",
-											},
-										],
-									},
-								],
-								[1, "rgba(0,0,0,0.15)"],
-							],
-						},
-					},
-					// 浠〃鐩樺埢搴︽爣绛�
-					axisLabel: {
-						show: true,
-						color: "rgba(84, 108, 198, 0.65)",
-						fontSize: 14,
-						distance: 20,
-						formatter: (val) => {
-							const num = Math.floor(val);
-							return num % 20 === 0 ? num : "";
-						},
-					},
-					// 鍒诲害
-					axisTick: {
-						show: false,
-					},
-					// 鎸囬拡锛屾璁剧疆浠呭5.0浠ヤ笂鐨勭増鏈敓鏁�
-					anchor: {
-						show: true,
-						icon: "circle",
-						showAbove: true,
-						size: 20,
-						itemStyle: {
-							borderWidth: 6,
-							borderColor: "rgba(84, 108, 198, 0.85)",
-						},
-					},
-					data: [pointerData],
-				},
-				{
-					// 鑳屾櫙娓愬彉鑹�
-					type: "pie",
-					radius: "80%",
-					// 涓嶅搷搴斿強瑙﹀彂榧犳爣浜嬩欢
-					silent: true,
-					// 鍏抽棴鑳屾櫙鍔ㄧ敾
-					animation: false,
-					z: 0,
-					itemStyle: {
-						color: {
-							type: "radial", // 寰勫悜娓愬彉
-							x: 0.5,
-							y: 0.5,
-							r: 0.25,
-							colorStops: [
-								{
-									offset: 0,
-									color: "rgba(84, 103, 198, 0.6)",
-								},
-								{
-									offset: 0.1,
-									color: "rgba(84, 103, 198, 0.35)",
-								},
-								{
-									offset: 1,
-									color: "rgba(84, 103, 198, 0)",
-								},
-							],
-						},
-					},
-					data: [pointerData],
-				},
-			],
-		};
-		Chart1.setOption(option);
-	}
-
-	var datas = [
-		{ ranking: 1, station: '鍦哄湴001', value: 85 },
-		{ ranking: 2, station: '鍦哄湴002', value: 22 },
-		{ ranking: 3, station: '鍦哄湴003', value: 33 },
-		{ ranking: 4, station: '鍦哄湴004', value: 40 },
-		{ ranking: 5, station: '鍦哄湴005', value: 33 },
-		{ ranking: 6, station: '鍦哄湴006', value: 14.97 },
-		{ ranking: 7, station: '鍦哄湴007', value: 13.03 },
-		{ ranking: 8, station: '鍦哄湴008', value: 18.48 },
-		{ ranking: 9, station: '鍦哄湴009', value: 16.74 },
-		{ ranking: 10, station: '鍦哄湴010', value: 14.97 },
-
-		{ ranking: 11, station: '鍦哄湴011', value: 13.03 },
-		{ ranking: 12, station: '鍦哄湴012', value: 18.48 },
-
-		{ ranking: 13, station: '鍦哄湴013', value: 16.74 },
-		{ ranking: 14, station: '鍦哄湴014', value: 14.97 },
-		{ ranking: 15, station: '鍦哄湴015', value: 13.03 },
-		{ ranking: 16, station: '鍦哄湴016', value: 18.48 },
-
-		{ ranking: 17, station: '鍦哄湴017', value: 16.74 },
-		{ ranking: 18, station: '鍦哄湴018', value: 14.97 },
-		{ ranking: 19, station: '鍦哄湴019', value: 13.03 },
-		{ ranking: 20, station: '鍦哄湴020', value: 18.48 },
-
-		{ ranking: 21, station: '鍦哄湴021', value: 16.74 },
-		{ ranking: 22, station: '鍦哄湴022', value: 14.97 },
-		{ ranking: 23, station: '鍦哄湴023', value: 13.03 },
-		{ ranking: 24, station: '鍦哄湴024', value: 18.48 },
-
-		{ ranking: 25, station: '鍦哄湴025', value: 16.74 },
-		{ ranking: 26, station: '鍦哄湴026', value: 14.97 },
-		{ ranking: 27, station: '鍦哄湴027', value: 13.03 },
-		{ ranking: 28, station: '鍦哄湴028', value: 18.48 },
-
-		{ ranking: 29, station: '鍦哄湴029', value: 13.03 },
-		{ ranking: 30, station: '鍦哄湴030', value: 18.48 },
-		{ ranking: 31, station: '鍦哄湴031', value: 13.03 },
-		{ ranking: 32, station: '鍦哄湴032', value: 18.48 },
-		{ ranking: 33, station: '鍦哄湴033', value: 13.03 },
-		{ ranking: 34, station: '鍦哄湴034', value: 18.48 },
-	];
-
-
-	var seriesName = ['宸插畬鎴愯繘搴�','鎬昏繘搴�'];
-	var attackSourcesColor1 = ['#FF557F','#FFAA00','#5470C6','#1E9FFF'];
-
-	var attackSourcesColor = [
-		new echarts.graphic.LinearGradient(0, 1, 1, 1, [
-			{ offset: 0, color: 'rgba(255,85,127,1)' },
-			{ offset: 1, color: 'rgba(255,85,127,1)' },
-		]),
-		new echarts.graphic.LinearGradient(0, 1, 1, 1, [
-			{ offset: 0, color: 'rgba(255,170,0,1)' },
-			{ offset: 1, color: 'rgba(255,170,0,1)' },
-		]),
-		new echarts.graphic.LinearGradient(0, 1, 1, 1, [
-			{ offset: 0, color: 'rgba(84,112,198,1)' },
-			{ offset: 1, color: 'rgba(84,112,198,1)' },
-		]),
-		new echarts.graphic.LinearGradient(0, 1, 1, 1, [
-			{ offset: 0, color: 'rgba(30,159,255,.82)' },
-			{ offset: 1, color: 'rgba(30,159,255,.82)' },
-		]),
-	];
-	
-	function stationProcess() {
-
-		let url = ctx + "/system/projectProcess";
-		$.ajaxSettings.async = false;
-		$.get(url,{},function(res){
-			console.log(res.projectData);
-			datas = res.projectData;
-		})
-		$.ajaxSettings.async = false;
-
-
-		var Chart2 = echarts.init(document.getElementById('Chart2'));
-		var rankings = [];
-		var stationData = [];
-		var values = [];
-
-		datas.forEach(function (it, index) {
-			rankings.push(it.ranking);
-			stationData.push(it.station);
-			values.push(it.value);
-		});
-
-		option = {
-			// backgroundColor: '#000',
-			tooltip: {
-				trigger: 'axis',
-				axisPointer: {
-					type: 'shadow',
-				},
-			},
-
-			grid: {
-				left: '-8%',
-				right: '2%',
-				bottom: '3%',
-				top:'2%',
-				containLabel: true,
-			},
-			xAxis: {
-				type: 'value',
-				splitLine: {
-					show: false,
-				},
-				axisLabel: {
-					show: false,
-				},
-				axisTick: {
-					show: false,
-				},
-				axisLine: {
-					show: false,
-				},
-			},
-			yAxis: [
-				{
-					type: 'category',
-					inverse: true,
-					axisLine: {
-						show: false,
-					},
-					axisTick: {
-						show: false,
-					},
-					data: stationData,
-					axisLabel: {
-						margin: 30,
-						fontSize: 14,
-						align: 'left',
-						padding: [3, 0, 0, 0],
-						color: '#000',
-						rich: {
-							nt1: {
-								color: '#fff',
-								backgroundColor: attackSourcesColor1[0],
-								width: 20,
-								height: 18,
-								fontSize: 12,
-								align: 'center',
-								borderRadius: 50,
-								lineHeight: '5',
-								padding: [2, 0, 0, 0],
-								// padding:[0,0,2,0],
-							},
-							nt2: {
-								color: '#fff',
-								backgroundColor: attackSourcesColor1[1],
-								width: 20,
-								height: 18,
-								fontSize: 12,
-								align: 'center',
-								borderRadius: 50,
-								padding: [2, 0, 0, 0],
-							},
-							nt3: {
-								color: '#fff',
-								backgroundColor: attackSourcesColor1[2],
-								width: 20,
-								height: 18,
-								fontSize: 12,
-								align: 'center',
-								borderRadius: 50,
-								padding: [2, 0, 0, 0],
-							},
-							nt: {
-								color: '#fff',
-								backgroundColor: attackSourcesColor1[3],
-								width: 20,
-								height: 18,
-								fontSize: 12,
-								align: 'center',
-								borderRadius: 50,
-								padding: [2, 0, 0, 0],
-							},
-						},
-						formatter: function (value, index) {
-							index = contains(stationData, value) + 1;
-							if (index - 1 < 3) {
-								return ['{nt' + index + '|' + index + '}'].join('\n');
-							} else {
-								return ['{nt|' + index + '}'].join('\n');
-							}
-						},
-					},
-				},
-
-				{
-					type: 'category',
-					inverse: true,
-					axisTick: 'none',
-					axisLine: 'none',
-					show: true,
-					axisLabel: {
-						textStyle: {
-							color: '#666',
-							fontSize: '12',
-						},
-					},
-					data: dataFormat(values),
-				},
-
-				{  // 鏉$姸鏍囬
-					type: 'category',
-					inverse: true,
-					offset: -10,
-					position: 'left',
-					axisTick: 'none',
-					axisLine: 'none',
-					show: true,
-					axisLabel: {
-						interval: 0,
-						color: ['#666'],
-						align: 'left',
-						verticalAlign: 'bottom',
-						lineHeight: 42,
-						fontSize: 14,
-					},
-					data: dataFormat(stationData),
-				},
-			],
-			series: [
-				{
-					zlevel: 1,
-					name: seriesName[0],
-					type: 'bar',
-					barWidth: 15,
-					data: dataFormat(values),
-					align: 'center',
-					itemStyle: {
-						normal: {
-							barBorderRadius: 10,
-						},
-					},
-					label: {   //鏉$姸涓殑鏍峰紡
-						show: true,
-						fontSize: 10,
-						color: '#fff', //鏉¤涓瓧浣撻鑹�
-						textBorderWidth: 2,
-						padding: [2, 0, 0, 0],
-					},
-				},
-				{
-					name: seriesName[1],
-					type: 'bar',
-					barWidth: 15,
-					barGap: '-100%',
-					data: [100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
-						100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
-						100, 100, 100, 100, 100, 100, 100, 100, 100, 100,
-						100, 100, 100, 100],
-					itemStyle: {
-						normal: {
-							color: 'rgba(200,200,200,.3)',
-							//width:"100%",
-							fontSize: 12,
-							barBorderRadius: 30,
-						},
-					},
-				},
-			],
-		};
-		Chart2.setOption(option);
-	}
-
-	function dataFormat(data) {
-		var arr = [];
-		data.forEach(function (item, i) {
-			let itemStyle = {
-				color: i > 3 ? attackSourcesColor[3] : attackSourcesColor[i],
-			};
-			arr.push({
-				value: item,
-				itemStyle: itemStyle,
-			});
-		});
-		return arr;
-	}
-
-	function contains(arr, dst) {
-		var i = arr.length;
-		while ((i -= 1)) {
-			if (arr[i] == dst) {
-				return i;
-			}
-		}
-		return false;
-	}
-
-
-
-
-</script>
-
-</body>
-</html>

--
Gitblit v1.9.1