dkyChenJiang.git

			@@ -58,9 +58,11 @@
			<script th:inline="javascript">
			var editFlag = [[${@permission.hasPermi('geo:hole:edit')}]];
			var removeFlag = [[${@permission.hasPermi('geo:hole:remove')}]];
			var holeLogAddFlag = [[${@permission.hasPermi('geo:holeLog:add')}]];
			var typeDatas = [[${@dict.getType('hole_type')}]];
			var statusDatas = [[${@dict.getType('hole_status')}]];
			var prefix = ctx + "geo/hole";
			var prefix2 = ctx + "geo/holeLog";
			var projectId=[[${projectId}]];

			$(function() {
			@@ -72,6 +74,7 @@
			exportUrl: prefix + "/export",
			importUrl: prefix + "/importHole/"+projectId,
			modalName: "钻孔",
			pageSize:50,
			columns: [{
			checkbox: true
			},
			@@ -82,15 +85,25 @@
			},
			{
			field : 'code',
			title : '钻孔编号'
			},
			title : '钻孔编号',
			sortable:true
			}, {
			field : 'type',
			title : '钻孔类型',
			sortable:true,
			formatter: function (value, row, index) {
			var actions=[];
			actions.push('<a href="javascript:void(0)" style="color:#1E9FFF;" onclick="preview(\'' + row.code + '\')">'+value+'</a>');
			return actions.join('');
			}
			},
			{
			field : 'elevation',
			title : '孔口高程'
			title : '孔口高程（m）'
			},
			{
			field : 'depth',
			title : '设计孔深'
			title : '设计孔深（m）'
			},
			{
			field : 'longitude',
			@@ -104,20 +117,37 @@
			},
			{
			field : 'status',
			title : '钻孔状态',
			formatter: function(value, row, index) {
			return $.table.selectDictLabel(statusDatas, value);
			}
			title : '钻孔状态'
			},
			{
			field : 'pic1',
			title : '进度',
			},
			{
			field : 'footage',
			title : '总进尺（m）',
			},
			{
			field : 'footageCpl',
			title : '已完成进尺（m）',

			},
			{
			field : 'rate',
			title : '完成进度(%)',
			sortable:true,
			formatter: function(value, row, index) {
			var proc =0;
			if (row.rate !=null){
			proc= (row.rate*100).toFixed(0) ;
			}
			return `<div class="progress" style="margin-bottom: 0px;">
			<div class="progress-bar bg-danger" role="progressbar" style="width: ${proc}%;" aria-valuenow="${proc}" aria-valuemin="0" aria-valuemax="100">${proc}%</div>
			</div>`
			}
			},
			{
			title: '操作',
			align: 'center',
			formatter: function(value, row, index) {
			var actions = [];
			actions.push('<a class="btn btn-info btn-xs ' + holeLogAddFlag + '" href="javascript:void(0)" onclick="holeLogSave(\'' + row.code + '\')"><i class="glyphicon glyphicon-th-list"></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('');
			@@ -133,6 +163,18 @@
			var filename="钻孔模板.xls";
			window.location.href = ctx + "common/download?fileName=" + encodeURI(filename) + "&delete=" + false;
			}

			//保存记录
			function holeLogSave(holeCode) {
			const url = prefix2 + "/add?projectId=" + projectId + "&holeCode=" + holeCode;
			$.modal.open("钻孔进度记录",url);
			}

			//查看钻孔列表
			function preview(code) {
			const url = prefix2 + "/viewHoleLog?projectId=" + projectId + "&holeCode=" + code;
			$.modal.open("钻孔进度记录列表", url , 1100, 700);
			}
			</script>
			</body>