From 332c5fad486879deb725bf67d06b92c55408c398 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期三, 22 五月 2024 10:04:00 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/hole.html | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/hole.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/hole.html
index 76d285e..45a6a9f 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/hole.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/hole.html
@@ -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() {
@@ -87,7 +89,12 @@
}, {
field : 'type',
title : '閽诲瓟绫诲瀷',
- sortable:true
+ 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',
@@ -139,6 +146,7 @@
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('');
@@ -154,6 +162,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, 750);
+ }
</script>
</body>
--
Gitblit v1.9.1