Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang

zmk

2024-05-23 80125173e0051ffdd9914d33586b739e80362e78

 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 {
@@ -31,12 +31,22 @@
            </div>
            <div class="box-header ">
                <div class="box-title">
                    <i class="glyphicon glyphicon-list-alt"></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">
                    <i class="glyphicon glyphicon-user"></i> <a class="afont" th:href="@{/geo/projectPerson(id=${project.ids})}" target="mainFrame" onclick="selected(this)">人员管理</a>
                </div>
            </div>
            <div class="box-header ">
                <div class="box-title">
                    <i class="glyphicon glyphicon-retweet"></i> <a class="afont" th:href="@{/geo/deviceLog(id=${project.ids})}" target="mainFrame" onclick="selected(this)">进出库管理</a>
                    <i class="glyphicon glyphicon-retweet"></i> <a class="afont" th:href="@{/geo/deviceLog(id=${project.ids})}" target="mainFrame" onclick="selected(this)">设备管理</a>
                </div>
            </div>
            <div class="box-header ">
                <div class="box-title">
                    <i class="glyphicon glyphicon-random"></i> <a class="afont" th:href="@{/geo/TubLog(id=${project.ids})}" target="mainFrame" onclick="selected(this)">材料管理</a>
                </div>
            </div>
            <div class="box-header ">
@@ -51,7 +61,7 @@
            </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 ">