From bf8d8aaf62190e0d49bbd34e3bb2aa7707d86537 Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期三, 22 五月 2024 10:05:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html | 36 +++++++++++++-----------------------
1 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html
index b0a4c4a..e8367e0 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html
@@ -6,7 +6,7 @@
<th:block th:include="include :: ztree-css" />
<style>
.active {
- background: #3c8dbc;
+ background: #41aae7;
}
.active a {
@@ -21,13 +21,18 @@
<div class="box-header active">
<div class="box-title">
- <i class="fa fa-desktop"></i> <a class="afont" th:href="@{/geo/project/info(id=${project.ids})}" target="mainFrame" onclick="selected(this)">椤圭洰璇︽儏</a>
+ <i class="fa fa-desktop"></i> <a class="afont" th:href="@{/geo/project/info(id=${project.ids})}" target="mainFrame" onclick="selected(this)">鍦哄湴璇︽儏</a>
</div>
</div>
<div class="box-header ">
<div class="box-title">
- <i class="glyphicon glyphicon-map-marker"></i> <a class="afont" th:href="@{/geo/hole(id=${project.ids})}" target="mainFrame" onclick="selected(this)">鍕樻帰鐐�</a>
- </div>
+ <i class="glyphicon glyphicon-map-marker"></i> <a class="afont" th:href="@{/geo/hole(id=${project.ids})}" target="mainFrame" onclick="selected(this)">閽诲瓟</a>
+ </div>
+ </div>
+ <div class="box-header ">
+ <div class="box-title">
+ <i class="glyphicon glyphicon-map-marker"></i> <a class="afont" th:href="@{/geo/holeLog(id=${project.ids})}" target="mainFrame" onclick="selected(this)">閽诲瓟杩涘害鏃ュ織</a>
+ </div>
</div>
<div class="box-header ">
<div class="box-title">
@@ -51,27 +56,12 @@
</div>
<div class="box-header ">
<div class="box-title">
- <i class="glyphicon glyphicon-th-list"></i> <a class="afont" th:href="@{/geo/projectData(id=${project.ids},type='3')}" target="mainFrame" onclick="selected(this)">娴嬩簳</a>
+ <i class="glyphicon glyphicon-th-list"></i> <a class="afont" th:href="@{/geo/projectData/2(id=${project.ids},type='3')}" target="mainFrame" onclick="selected(this)">鏂藉伐鐜板満绠＄悊</a>
</div>
</div>
<div class="box-header ">
<div class="box-title">
- <i class="glyphicon glyphicon-align-justify"></i> <a class="afont" th:href="@{/geo/projectData(id=${project.ids},type='4')}" target="mainFrame" onclick="selected(this)">鏂滄祴</a>
- </div>
- </div>
- <div class="box-header ">
- <div class="box-title">
- <i class="glyphicon glyphicon-home"></i> <a class="afont" th:href="@{/geo/projectData(id=${project.ids},type='5')}" target="mainFrame" onclick="selected(this)">瀹ゅ唴璇曢獙</a>
- </div>
- </div>
- <div class="box-header ">
- <div class="box-title">
- <i class="glyphicon glyphicon-object-align-left"></i> <a class="afont" th:href="@{/geo/projectData(id=${project.ids},type='6')}" target="mainFrame" onclick="selected(this)">宸ョ▼娴嬬粯</a>
- </div>
- </div>
- <div class="box-header ">
- <div class="box-title">
- <i class="glyphicon glyphicon-tint"></i> <a class="afont" th:href="@{/geo/projectData(id=${project.ids},type='7')}" target="mainFrame" onclick="selected(this)">姘磋川鍒嗘瀽</a>
+ <i class="glyphicon glyphicon-facetime-video"></i> <a class="afont" th:href="@{/geo/projectCamera(id=${project.ids})}" target="mainFrame" onclick="selected(this)">鐜板満鐩戞帶璁惧</a>
</div>
</div>
</div>
@@ -81,8 +71,8 @@
<iframe id="mainFrame" name="mainFrame" class="ui-layout-content p0"
th:src="@{/geo/project/info(id=${project.ids})}"></iframe>
</div>
-
-
+
+
<th:block th:include="include :: footer" />
<th:block th:include="include :: layout-latest-js" />
<th:block th:include="include :: ztree-js" />
--
Gitblit v1.9.1