Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang

chenhuan

2024-05-22 bf8d8aaf62190e0d49bbd34e3bb2aa7707d86537

 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/holeLog/holeLog.html

@@ -15,7 +15,7 @@
                                <input type="text" name="code"/>
                            </li>
                            <li class="select-time">
                                <p>记录保存时间：</p>
                                <p>日期：</p>
                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
                                <span>-</span>
                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
@@ -58,11 +58,12 @@
        var removeFlag = [[${@permission.hasPermi('geo:holeLog:remove')}]];
        var prefix = ctx + "geo/holeLog";
        var projectId=[[${projectId}]];
        var holeCode = "";

        $(function() {
            var options = {
                url: prefix + "/list?projectId=" + projectId,
                createUrl: prefix + "/add?projectId=" + projectId,
                createUrl: prefix + "/add?projectId=" + projectId + "&holeCode=" + holeCode,
                updateUrl: prefix + "/edit/{id}",
                removeUrl: prefix + "/remove",
                exportUrl: prefix + "/export",
@@ -77,30 +78,32 @@
                },
                {
                    field : 'code', 
                    title : '钻孔编号'
                    title : '钻孔编号',
                    sortable:true,
                },
                {
                    field : 'beginDepth', 
                    title : '起始深度',
                    title : '记录起始深度(m)',
                    sortable: true
                },
                {
                    field : 'endDepth', 
                    title : '终止深度',
                    title : '记录终止深度(m)',
                    sortable: true
                },
                {
                    field : 'createTime', 
                    title : '记录保存时间',
                    title : '日期',
                    sortable:true,
                    sortable: true
                },
                {
                    field : 'recordPerson', 
                    title : '描述员'
                    title : '记录人'
                },
                {
                    field : 'description', 
                    title : '描述备注'
                    title : '备注信息'
                },
                {
                    title: '操作',