From 5606efe6f2778ad09d8b35280d6360cfe8f34d91 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期三, 03 七月 2024 16:19:28 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/TubLog.html | 60 +++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 47 insertions(+), 13 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/TubLog.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/TubLog.html
index ace4a6f..381b34c 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/TubLog.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/TubLog.html
@@ -41,9 +41,12 @@
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="geo:TubLog:remove">
<i class="fa fa-remove"></i> 鍒犻櫎
</a>
- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:TubLog:export">
- <i class="fa fa-download"></i> 瀵煎嚭
- </a>
+<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:TubLog:export">-->
+<!-- <i class="fa fa-download"></i> 瀵煎嚭-->
+<!-- </a>-->
+ <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="geo:TubLog:import">
+ <i class="fa fa-upload"></i> 瀵煎叆
+ </a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
@@ -55,14 +58,16 @@
var editFlag = [[${@permission.hasPermi('geo:TubLog:edit')}]];
var removeFlag = [[${@permission.hasPermi('geo:TubLog:remove')}]];
var prefix = ctx + "geo/TubLog";
+ var projectId=[[${projectId}]];
$(function() {
var options = {
- url: prefix + "/list",
- createUrl: prefix + "/add",
+ url: prefix + "/list?projectId="+projectId,
+ createUrl: prefix + "/add?projectId="+projectId,
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
+ importUrl: prefix + "/importTubLog/"+projectId,
modalName: "鏉愭枡鍑哄叆搴撹褰�",
columns: [{
checkbox: true
@@ -79,10 +84,6 @@
{
field : 'tubName',
title : '绠℃潗鍚嶇О'
- },
- {
- field : 'type',
- title : '绫诲瀷'
},
{
field : 'outboundDate',
@@ -108,10 +109,13 @@
field : 'unit',
title : '鏁版嵁鍗曚綅'
},
- {
- field : 'createDate',
- title : '鏃堕棿'
- },
+ {
+ field : 'documentPath',
+ title : '鍥剧墖/鎵弿浠�',
+ formatter: function(value, row, index) {
+ return `<a onclick="viewTubLogFile('${row.fileUrl}')" href="#">鍥剧墖/鎵弿浠�</a>`;
+ }
+ },
{
field : 'remark',
title : '澶囨敞'
@@ -129,6 +133,36 @@
};
$.table.init(options);
});
+
+ //涓嬭浇
+ function importTemplate() {
+ var filename="绠℃潗鍑哄叆搴撹褰曟ā鏉�.xls";
+ window.location.href = ctx + "common/download?fileName=" + encodeURI(filename) + "&delete=" + false;
+ }
+
+ //鏌ョ湅璇佷欢鐓х墖
+ function viewTubLogFile(path) {
+ var filepath = "/bjfw/"+path;
+ window.open(filepath)
+ }
</script>
</body>
+
+
+<!-- 瀵煎叆鍖哄煙 -->
+<script id="importTpl" type="text/template">
+ <form enctype="multipart/form-data" class="mt20 mb10">
+ <div class="col-xs-offset-1">
+ <input type="file" id="file" name="file"/>
+ <div class="mt10 pt5">
+ <input type="checkbox" id="updateSupport" name="updateSupport" title="瀵煎叆璁惧鍑哄叆搴撲俊鎭�"> 鏄惁鏇存柊宸茬粡瀛樺湪鐨勬暟鎹�
+ <a onclick="importTemplate()" class="btn btn-default btn-xs"><i class="fa fa-file-excel-o"></i> 涓嬭浇妯℃澘</a>
+ </div>
+ <font color="red" class="pull-left mt10">
+ 鎻愮ず锛氫粎鍏佽瀵煎叆鈥渪ls鈥濇垨鈥渪lsx鈥濇牸寮忔枃浠讹紒
+ </font>
+ </div>
+ </form>
+</script>
+
</html>
\ No newline at end of file
--
Gitblit v1.9.1