From 819c0b6478fb3385c8457cd03e04fdf0d3b90a70 Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期二, 21 五月 2024 10:11:44 +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 | 157 ++++++++++++++++++++++++----------------------------
1 files changed, 72 insertions(+), 85 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 c1b5faa..76d285e 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
@@ -16,14 +16,7 @@
<div class="select-list">
<ul>
<li>
- <p>鍕樻帰鐐圭被鍨嬶細</p>
- <select name="type" th:with="type=${@dict.getType('hole_type')}">
- <option value="">鎵�鏈�</option>
- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
- </select>
- </li>
- <li>
- <p>鍕樻帰鐐圭紪鍙凤細</p>
+ <p>閽诲瓟缂栧彿锛�</p>
<input type="text" name="code"/>
</li>
<li>
@@ -43,8 +36,17 @@
</div>
<div class="btn-group-sm" id="toolbar" role="group">
+ <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="geo:hole:add">
+ <i class="fa fa-plus"></i> 娣诲姞
+ </a>
+ <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="geo:hole:edit">
+ <i class="fa fa-edit"></i> 淇敼
+ </a>
<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">
@@ -60,13 +62,15 @@
var statusDatas = [[${@dict.getType('hole_status')}]];
var prefix = ctx + "geo/hole";
var projectId=[[${projectId}]];
+
$(function() {
var options = {
url: prefix + "/list?projectId="+projectId,
- createUrl: prefix + "/add",
+ createUrl: prefix + "/add?projectId="+projectId,
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
+ importUrl: prefix + "/importHole/"+projectId,
modalName: "閽诲瓟",
columns: [{
checkbox: true
@@ -78,104 +82,64 @@
},
{
field : 'code',
- title : '鍕樻帰鐐圭紪鍙�'
- },
- {
- field : 'description',
- title : '鎻忚堪銆佹妧鏈姹�',
- visible: false
- },
- {
- field : 'type',
- title : '鍕樻帰鐐圭被鍨�',
- formatter: function(value, row, index) {
- return $.table.selectDictLabel(typeDatas, value);
- }
- },
+ title : '閽诲瓟缂栧彿',
+ sortable:true
+ }, {
+ field : 'type',
+ title : '閽诲瓟绫诲瀷',
+ sortable:true
+ },
{
field : 'elevation',
- title : '瀛斿彛楂樼▼'
+ title : '瀛斿彛楂樼▼锛坢锛�'
},
{
field : 'depth',
- title : '璁捐瀛旀繁'
+ title : '璁捐瀛旀繁锛坢锛�'
},
{
field : 'longitude',
- title : '鍕樻帰鐐圭粡搴�',
+ title : '閽诲瓟缁忓害',
visible: false
},
{
field : 'latitude',
- title : '鍕樻帰鐐圭含搴�',
- visible: false
- },
- {
- field : 'surveyX',
- title : '鐩稿鍧愭爣X',
- visible: false
- },
- {
- field : 'surveyY',
- title : '鐩稿鍧愭爣Y',
- visible: false
- },
- {
- field : 'surveyZ',
- title : '鐩稿鍧愭爣Z',
- visible: false
- },
- {
- field : 'surveyLatitude',
- title : '娴嬮噺鍧愭爣绾害',
- visible: false
- },
- {
- field : 'surveyLongitude',
- title : '娴嬮噺鍧愭爣缁忓害',
- visible: false
- },
- {
- field : 'mapLatitude',
- title : '閽诲瓟瀹氫綅绾害'
- },
- {
- field : 'mapLongitude',
- title : '閽诲瓟瀹氫綅缁忓害'
- },
- {
- field : 'mapTime',
- title : '閽诲瓟瀹氫綅鏃堕棿',
- visible: false
- },
- {
- field : 'position',
- title : '鏃犳硶瀹氫綅鐨勫湴鐐�',
- visible: false
- },
- {
- field : 'locateTime',
- title : '鏃犳硶瀹氫綅鐨勬椂闂�',
- visible: false
- },
- {
- field : 'reason',
- title : '鏃犳硶瀹氫綅鐨勫師鍥�',
+ title : '閽诲瓟绾害',
visible: false
},
{
field : 'status',
- title : '閽诲瓟鐘舵��',
- formatter: function(value, row, index) {
- return $.table.selectDictLabel(statusDatas, value);
- }
+ title : '閽诲瓟鐘舵��'
+ },
+ {
+ field : 'footage',
+ title : '鎬昏繘灏猴紙m锛�',
+ },
+ {
+ field : 'footageCpl',
+ title : '宸插畬鎴愯繘灏猴紙m锛�',
+
+ },
+ {
+ field : 'rate',
+ title : '瀹屾垚杩涘害(%)',
+ sortable:true,
+ formatter: function(value, row, index) {
+ var proc =0;
+ if (row.rate !=null){
+ proc= (row.rate*100).toFixed(0) ;
+ }
+ return `<div class="progress" style="margin-bottom: 0px;">
+ <div class="progress-bar bg-danger" role="progressbar" style="width: ${proc}%;" aria-valuenow="${proc}" aria-valuemin="0" aria-valuemax="100">${proc}%</div>
+ </div>`
+ }
},
{
title: '鎿嶄綔',
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.ids + '\')"><i class="fa fa-edit"></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('');
}
@@ -184,6 +148,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