From 880c8f54cddc8533f00f674da3f14c2cf0d34340 Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期二, 25 六月 2024 17:58:17 +0800
Subject: [PATCH] Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData2.html | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData2.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData2.html
index cd45369..f5683e3 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData2.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData2.html
@@ -15,6 +15,10 @@
<input type="text" name="name"/>
</li>
<li>
+ <p>閽诲瓟缂栧彿锛�</p>
+ <input type="text" name="holeCode"/>
+ </li>
+ <li>
<p>涓氬姟绫诲瀷锛�</p>
<select name="fileType" th:with="type=${@dict.getType('project_data_file_type')}">
<option value="">鎵�鏈�</option>
@@ -44,12 +48,7 @@
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="geo:projectData:remove">
<i class="fa fa-remove"></i> 鍒犻櫎
</a>
-<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:projectData:export">-->
-<!-- <i class="fa fa-download"></i> 瀵煎嚭-->
-<!-- </a>-->
- <a class="btn btn-danger" data-toggle="modal" onclick="uploadZIP();">
- <i class="fa fa-upload"></i>涓婁紶闄勪欢
- </a>
+
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
@@ -79,27 +78,31 @@
checkbox: true
},
{
- field : 'id',
+ field : 'id',
title : '涓婚敭',
visible: false
},
{
- field : 'name',
+ field : 'name',
title : '璧勬枡鍚嶇О'
},
+ {
+ field : 'holeCode',
+ title : '閽诲瓟缂栧彿'
+ },
{
- field : 'fileType',
+ field : 'fileType',
title : '涓氬姟绫诲瀷',
formatter: function(value, row, index) {
return $.table.selectDictLabel(fileTypeDatas, value);
}
},
{
- field : 'labels',
+ field : 'labels',
title : '鏍囩'
},
{
- field : 'remark',
+ field : 'remark',
title : '澶囨敞'
},
{
@@ -109,7 +112,9 @@
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><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.id + '\')"><i class="fa fa-remove"></i>鍒犻櫎</a> ');
- actions.push('<a class="btn btn-info btn-xs ' + '" href="javascript:void(0)" onclick="viewImg(\'' + row.dataUrl + '\' , \'' + row.id + '\')"><i class="glyphicon glyphicon-menu-hamburger"></i>鏌ョ湅闄勪欢</a>');
+ actions.push('<a class="btn btn-info btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="uploadZIP(\'' + row.id + '\')"><i class="fa fa-upload"></i>涓婁紶</a> ');
+ actions.push('<a class="btn btn-info btn-xs ' + '" href="javascript:void(0)" onclick="viewResource(\'' + row.id + '\' , \'' + row.id + '\')"><i class="glyphicon glyphicon-menu-hamburger"></i>鏌ョ湅闄勪欢</a>');
+
return actions.join('');
}
}]
@@ -118,20 +123,16 @@
});
// 涓婁紶闄勪欢
- function uploadZIP(){
- $.modal.open('涓婁紶闄勪欢', prefix + "/importImg");
+ function uploadZIP(id){
+ $.modal.open('涓婁紶闄勪欢', prefix + "/importImg?projectDataId="+id);
}
- // 鏌ョ湅鍥剧墖璇︽儏
- function viewImg(path, id) {
- if(path === null || path === '' || path === 'null'){
- $.modal.alertSuccess("鏂囦欢鏃犳硶鎵撳紑锛�");
- return;
- }
- var url = prefix + "/viewImage?id=" + id;
- $.modal.open("鏌ョ湅鍥剧墖", url, 800, 600);
+ //鏌ョ湅璧勬枡
+ function viewResource(id){
+ $.modal.open("璧勬枡鍒楄〃", prefix + "/projectDataFileList?id=" + id, 800, 600);
}
+
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1