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

@@ -31,7 +31,7 @@
            </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>
                    <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 ">
@@ -46,7 +46,7 @@
            </div>
            <div class="box-header ">
                <div class="box-title">
                    <i class="glyphicon glyphicon-retweet"></i> <a class="afont" th:href="@{/geo/TubLog(id=${project.ids})}" target="mainFrame" onclick="selected(this)">材料管理</a>
                    <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 ">