From c6f79f5720c5d4a700b8b759a93393559409fd1c Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期一, 20 五月 2024 15:11:58 +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/projectData.html | 58 +++++++++++++++++++++++-----------------------------------
1 files changed, 23 insertions(+), 35 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData.html
index bb97ca8..5896ff9 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData.html
@@ -15,20 +15,6 @@
<input type="text" name="name"/>
</li>
<li>
- <p>璧勬枡绫诲瀷锛�</p>
- <select name="dataType" th:with="type=${@dict.getType('project_data_type')}">
- <option value="">鎵�鏈�</option>
- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
- </select>
- </li>
- <li>
- <p>鏂囦欢绫诲瀷锛�</p>
- <select name="fileType" th:with="type=${@dict.getType('project_data_file_type')}">
- <option value="">鎵�鏈�</option>
- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
- </select>
- </li>
- <li>
<p>鏍囩锛�</p>
<input type="text" name="labels"/>
</li>
@@ -38,6 +24,7 @@
</li>
</ul>
</div>
+
</form>
</div>
@@ -51,9 +38,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>
+
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
@@ -69,11 +54,12 @@
var projectId=[[${projectId}]];
var type=[[${type}]];
var prefix = ctx + "geo/projectData";
+ console.log("type",type);
$(function() {
var options = {
- url: prefix + "/list?projectId="+projectId + "&dataType=" + type,
- createUrl: prefix + "/add",
+ url: prefix + "/list?projectId=" + projectId + "&dataType=" + type,
+ createUrl: prefix + "/add?projectId=" + projectId + "&dataType=" + type,
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
@@ -87,22 +73,8 @@
visible: false
},
{
- field : 'name',
+ field : 'name',
title : '璧勬枡鍚嶇О'
- },
- {
- field : 'dataType',
- title : '璧勬枡绫诲瀷',
- formatter: function(value, row, index) {
- return $.table.selectDictLabel(dataTypeDatas, value);
- }
- },
- {
- field : 'fileType',
- title : '鏂囦欢绫诲瀷',
- formatter: function(value, row, index) {
- return $.table.selectDictLabel(fileTypeDatas, value);
- }
},
{
field : 'labels',
@@ -117,14 +89,30 @@
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.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-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 ' + 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('');
}
}]
};
$.table.init(options);
});
+
+ // 涓婁紶闄勪欢
+ function uploadZIP(id){
+ $.modal.open('涓婁紶闄勪欢', prefix + "/importImg?projectDataId="+id);
+ }
+
+
+ //鏌ョ湅璧勬枡
+ function viewResource(id){
+ $.modal.open("璧勬枡鍒楄〃", prefix + "/projectDataFileList?id=" + id, 800, 600);
+ }
</script>
</body>
+
</html>
\ No newline at end of file
--
Gitblit v1.9.1