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/hole/hole.html | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 46 insertions(+), 4 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 d8f0e22..7665a41 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
@@ -45,6 +45,9 @@
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="geo:hole:remove">
<i class="fa fa-remove"></i> 鍒犻櫎
</a>
+ <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="geo:hole:import">
+ <i class="fa fa-upload"></i> 瀵煎叆
+ </a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
@@ -67,6 +70,7 @@
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
+ importUrl: prefix + "/importHole/"+projectId,
modalName: "閽诲瓟",
columns: [{
checkbox: true
@@ -82,11 +86,11 @@
},
{
field : 'elevation',
- title : '瀛斿彛楂樼▼'
+ title : '瀛斿彛楂樼▼锛坢锛�'
},
{
field : 'depth',
- title : '璁捐瀛旀繁'
+ title : '璁捐瀛旀繁锛坢锛�'
},
{
field : 'longitude',
@@ -106,8 +110,23 @@
}
},
{
- field : 'pic1',
- title : '杩涘害',
+ field : 'footage',
+ title : '鎬昏繘灏猴紙m锛�',
+ },
+ {
+ field : 'footageCpl',
+ title : '宸插畬鎴愯繘灏猴紙m锛�',
+ },
+ {
+ field : 'rate',
+ title : '瀹屾垚杩涘害(%)',
+ formatter: function(value, row, index) {
+ if (row.rate !=null){
+ return (row.rate*100).toFixed(2) + "%";
+ }else{
+ return "0%";
+ }
+ }
},
{
title: '鎿嶄綔',
@@ -123,6 +142,29 @@
};
$.table.init(options);
});
+
+ //涓嬭浇
+ function importTemplate() {
+ var filename="閽诲瓟妯℃澘.xls";
+ window.location.href = ctx + "common/download?fileName=" + encodeURI(filename) + "&delete=" + false;
+ }
</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