dkyChenJiang.git

			@@ -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,6 +36,12 @@
			</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>
			@@ -60,10 +59,11 @@
			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",
			@@ -78,19 +78,7 @@
			},
			{
			field : 'code',
			title : '勘探点编号'
			},
			{
			field : 'description',
			title : '描述、技术要求',
			visible: false
			},
			{
			field : 'type',
			title : '勘探点类型',
			formatter: function(value, row, index) {
			return $.table.selectDictLabel(typeDatas, value);
			}
			title : '钻孔编号'
			},
			{
			field : 'elevation',
			@@ -102,65 +90,12 @@
			},
			{
			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 +105,16 @@
			return $.table.selectDictLabel(statusDatas, value);
			}
			},
			{
			field : 'pic1',
			title : '进度',
			},
			{
			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('');
			}