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

chenhuan

2024-05-20 c6f79f5720c5d4a700b8b759a93393559409fd1c

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

@@ -16,14 +16,7 @@
                    <div class="select-list">
                        <ul>
                            <li>
                                <p>勘探点类型：</p>
                                <select name="type" th:with="type=${@dict.getType('hole_type')}">
                                    <option value="">所有</option>
                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                </select>
                            </li>
                            <li>
                                <p>勘探点编号：</p>
                                <p>钻孔编号：</p>
                                <input type="text" name="code"/>
                            </li>
                            <li>
@@ -43,8 +36,17 @@
            </div>

             <div class="btn-group-sm" id="toolbar" role="group">
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="geo:hole:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
                 <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="geo:hole:edit">
                     <i class="fa fa-edit"></i> 修改
                 </a>
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="geo:hole:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
                 <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="geo:hole:import">
                     <i class="fa fa-upload"></i> 导入
                 </a>
             </div>
            <div class="col-sm-12 select-table table-striped">
@@ -60,13 +62,15 @@
        var statusDatas = [[${@dict.getType('hole_status')}]];
        var prefix = ctx + "geo/hole";
        var projectId=[[${projectId}]];

        $(function() {
            var options = {
                url: prefix + "/list?projectId="+projectId,
                createUrl: prefix + "/add",
                createUrl: prefix + "/add?projectId="+projectId,
                updateUrl: prefix + "/edit/{id}",
                removeUrl: prefix + "/remove",
                exportUrl: prefix + "/export",
                importUrl: prefix + "/importHole/"+projectId,
                modalName: "钻孔",
                columns: [{
                    checkbox: true
@@ -78,89 +82,24 @@
                },
                {
                    field : 'code', 
                    title : '勘探点编号'
                },
                {
                    field : 'description', 
                    title : '描述、技术要求',
                    visible: false
                },
                {
                    field : 'type', 
                    title : '勘探点类型',
                    formatter: function(value, row, index) {
                        return $.table.selectDictLabel(typeDatas, value);
                    }
                    title : '钻孔编号'
                },
                {
                    field : 'elevation', 
                    title : '孔口高程'
                    title : '孔口高程（m）'
                },
                {
                    field : 'depth', 
                    title : '设计孔深'
                    title : '设计孔深（m）'
                },
                {
                    field : 'longitude',
                    title : '勘探点经度',
                    title : '钻孔经度',
                    visible: false
                },
                {
                    field : 'latitude', 
                    title : '勘探点纬度',
                    visible: false
                },
                {
                    field : 'surveyX', 
                    title : '相对坐标X',
                    visible: false
                },
                {
                    field : 'surveyY', 
                    title : '相对坐标Y',
                    visible: false
                },
                {
                    field : 'surveyZ', 
                    title : '相对坐标Z',
                    visible: false
                },
                {
                    field : 'surveyLatitude', 
                    title : '测量坐标纬度',
                    visible: false
                },
                {
                    field : 'surveyLongitude', 
                    title : '测量坐标经度',
                    visible: false
                },
                {
                    field : 'mapLatitude', 
                    title : '钻孔定位纬度'
                },
                {
                    field : 'mapLongitude', 
                    title : '钻孔定位经度'
                },
                {
                    field : 'mapTime', 
                    title : '钻孔定位时间',
                    visible: false
                },
                {
                    field : 'position', 
                    title : '无法定位的地点',
                    visible: false
                },
                {
                    field : 'locateTime', 
                    title : '无法定位的时间',
                    visible: false
                },
                {
                    field : 'reason', 
                    title : '无法定位的原因',
                    title : '钻孔纬度',
                    visible: false
                },
                {
@@ -170,12 +109,31 @@
                        return $.table.selectDictLabel(statusDatas, value);
                    }
                },
                    {
                        field : 'footage',
                        title : '总进尺（m）',
                    },
                    {
                        field : 'footageCpl',
                        title : '已完成进尺（m）',
                    },
                    {
                        field : 'rate',
                        title : '完成进度(%)',
                        formatter: function(value, row, index) {
                            if (row.rate !=null){
                                return (row.rate*100).toFixed(2) + "%";
                            }else{
                                return "0%";
                            }
                        }
                    },
                {
                    title: '操作',
                    align: 'center',
                    formatter: function(value, row, index) {
                        var actions = [];
                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.ids + '\')"><i class="fa fa-edit"></i>详情</a> ');
                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.ids + '\')"><i class="fa fa-edit"></i>修改</a> ');
                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.ids + '\')"><i class="fa fa-remove"></i>删除</a>');
                        return actions.join('');
                    }
@@ -184,6 +142,29 @@
            };
            $.table.init(options);
        });

        //下载
        function importTemplate() {
            var filename="钻孔模板.xls";
            window.location.href = ctx + "common/download?fileName=" + encodeURI(filename) + "&delete=" + false;
        }
    </script>
</body>

<!-- 导入区域 -->
<script id="importTpl" type="text/template">
    <form enctype="multipart/form-data" class="mt20 mb10">
        <div class="col-xs-offset-1">
            <input type="file" id="file" name="file"/>
            <div class="mt10 pt5">
                <input type="checkbox" id="updateSupport" name="updateSupport" title="导入钻孔信息"> 是否更新已经存在的数据
                <a onclick="importTemplate()" class="btn btn-default btn-xs"><i class="fa fa-file-excel-o"></i> 下载模板</a>
            </div>
            <font color="red" class="pull-left mt10">
                提示：仅允许导入“xls”或“xlsx”格式文件！
            </font>
        </div>
    </form>
</script>

</html>