From 332c5fad486879deb725bf67d06b92c55408c398 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期三, 22 五月 2024 10:04:00 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/hole.html | 22 +++++++
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/holeLog/holeLog.html | 3
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/holeLog/add.html | 3
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleLogController.java | 11 +++
javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HoleLogMapper.xml | 4
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/holeLog/holeLog2.html | 84 ++++++++++++++++++++++++++++
6 files changed, 121 insertions(+), 6 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleLogController.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleLogController.java
index 583fcb9..952af09 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleLogController.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/HoleLogController.java
@@ -41,6 +41,14 @@
return prefix + "/holeLog";
}
+ @RequiresPermissions("geo:holeLog:view")
+ @GetMapping("/viewHoleLog")
+ public String holeLog2(String projectId, String holeCode, ModelMap mmap) {
+ mmap.put("projectId", projectId);
+ mmap.put("holeCode", holeCode);
+ return prefix + "/holeLog2";
+ }
+
/**
* 鏌ヨ閽诲瓟鏃ュ織鍒楄〃
*/
@@ -70,8 +78,9 @@
* 鏂板閽诲瓟鏃ュ織
*/
@GetMapping("/add")
- public String add(String projectId, ModelMap mmap) {
+ public String add(String projectId, String holeCode, ModelMap mmap) {
mmap.put("projectId", projectId);
+ mmap.put("holeCode", holeCode);
return prefix + "/add";
}
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HoleLogMapper.xml b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HoleLogMapper.xml
index 5dd1238..0ff552b 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HoleLogMapper.xml
+++ b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HoleLogMapper.xml
@@ -32,11 +32,11 @@
<if test="recordPerson != null and recordPerson != ''"> and record_person = #{recordPerson}</if>
<if test="description != null and description != ''"> and description = #{description}</if>
<!-- 寮�濮嬫椂闂存绱� -->
- <if test="params.beginTime != null and params.beginTime != ''">
+ <if test="params.beginCreateTime != null and params.beginCreateTime != ''">
and date_format(create_time,'%y%m%d') >= date_format(#{params.beginCreateTime},'%y%m%d')
</if>
<!-- 缁撴潫鏃堕棿妫�绱� -->
- <if test="params.endTime != null and params.endTime != ''">
+ <if test="params.endCreateTime != null and params.endCreateTime != ''">
and date_format(create_time,'%y%m%d') <= date_format(#{params.endCreateTime},'%y%m%d')
</if>
</where>
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 76d285e..45a6a9f 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
@@ -58,9 +58,11 @@
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('geo:hole:edit')}]];
var removeFlag = [[${@permission.hasPermi('geo:hole:remove')}]];
+ var holeLogAddFlag = [[${@permission.hasPermi('geo:holeLog:add')}]];
var typeDatas = [[${@dict.getType('hole_type')}]];
var statusDatas = [[${@dict.getType('hole_status')}]];
var prefix = ctx + "geo/hole";
+ var prefix2 = ctx + "geo/holeLog";
var projectId=[[${projectId}]];
$(function() {
@@ -87,7 +89,12 @@
}, {
field : 'type',
title : '閽诲瓟绫诲瀷',
- sortable:true
+ sortable:true,
+ formatter: function (value, row, index) {
+ var actions=[];
+ actions.push('<a href="javascript:void(0)" style="color:#1E9FFF;" onclick="preview(\'' + row.code + '\')">'+value+'</a>');
+ return actions.join('');
+ }
},
{
field : 'elevation',
@@ -139,6 +146,7 @@
align: 'center',
formatter: function(value, row, index) {
var actions = [];
+ actions.push('<a class="btn btn-info btn-xs ' + holeLogAddFlag + '" href="javascript:void(0)" onclick="holeLogSave(\'' + row.code + '\')"><i class="glyphicon glyphicon-th-list"></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('');
@@ -154,6 +162,18 @@
var filename="閽诲瓟妯℃澘.xls";
window.location.href = ctx + "common/download?fileName=" + encodeURI(filename) + "&delete=" + false;
}
+
+ //淇濆瓨璁板綍
+ function holeLogSave(holeCode) {
+ const url = prefix2 + "/add?projectId=" + projectId + "&holeCode=" + holeCode;
+ $.modal.open("閽诲瓟杩涘害璁板綍",url);
+ }
+
+ //鏌ョ湅閽诲瓟鍒楄〃
+ function preview(code) {
+ const url = prefix2 + "/viewHoleLog?projectId=" + projectId + "&holeCode=" + code;
+ $.modal.open("閽诲瓟杩涘害璁板綍鍒楄〃", url , 1100, 750);
+ }
</script>
</body>
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/holeLog/add.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/holeLog/add.html
index e4a58e8..5e635de 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/holeLog/add.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/holeLog/add.html
@@ -10,7 +10,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">閽诲瓟缂栧彿锛�</label>
<div class="col-sm-8">
- <input name="code" class="form-control" type="text">
+ <input name="code" th:value="${holeCode}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
@@ -53,6 +53,7 @@
<script th:inline="javascript">
var prefix = ctx + "geo/holeLog"
var projectId = [[${projectId}]];
+ var holeCode = [[${holeCode}]];
$("#form-holeLog-add").validate({
focusCleanup: true
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/holeLog/holeLog.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/holeLog/holeLog.html
index 7b0a059..7423cb3 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/holeLog/holeLog.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/holeLog/holeLog.html
@@ -58,11 +58,12 @@
var removeFlag = [[${@permission.hasPermi('geo:holeLog:remove')}]];
var prefix = ctx + "geo/holeLog";
var projectId=[[${projectId}]];
+ var holeCode = "";
$(function() {
var options = {
url: prefix + "/list?projectId=" + projectId,
- createUrl: prefix + "/add?projectId=" + projectId,
+ createUrl: prefix + "/add?projectId=" + projectId + "&holeCode=" + holeCode,
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/holeLog/holeLog2.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/holeLog/holeLog2.html
new file mode 100644
index 0000000..fd399df
--- /dev/null
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/holeLog/holeLog2.html
@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+ <th:block th:include="include :: header('閽诲瓟鏃ュ織鍒楄〃')" />
+</head>
+<body class="gray-bg">
+ <div class="container-div">
+ <div class="row">
+ <div class="col-sm-12 search-collapse">
+ <form id="formId">
+ <div class="select-list">
+ <ul>
+<!-- <li>-->
+<!-- <p>閽诲瓟缂栧彿锛�</p>-->
+<!-- <input type="text" name="code"/>-->
+<!-- </li>-->
+ <li class="select-time">
+ <p>璁板綍淇濆瓨鏃堕棿锛�</p>
+ <input type="text" class="time-input" id="startTime" placeholder="寮�濮嬫椂闂�" name="params[beginCreateTime]"/>
+ <span>-</span>
+ <input type="text" class="time-input" id="endTime" placeholder="缁撴潫鏃堕棿" name="params[endCreateTime]"/>
+ </li>
+ <li>
+
+ <p>鎻忚堪鍛橈細</p>
+ <input type="text" name="recordPerson"/>
+ </li>
+ <li>
+ <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 鎼滅储</a>
+ <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 閲嶇疆</a>
+ </li>
+ </ul>
+ </div>
+ </form>
+ </div>
+
+ <div class="col-sm-12 select-table table-striped">
+ <table id="bootstrap-table"></table>
+ </div>
+ </div>
+ </div>
+ <th:block th:include="include :: footer" />
+ <script th:inline="javascript">
+ var prefix = ctx + "geo/holeLog";
+ var projectId=[[${projectId}]];
+ var holeCode = [[${holeCode}]];
+
+ $(function() {
+ var options = {
+ url: prefix + "/list?projectId=" + projectId + "&code=" + holeCode,
+ modalName: "閽诲瓟鏃ュ織",
+ columns: [{
+ field : 'code',
+ title : '閽诲瓟缂栧彿'
+ },
+ {
+ field : 'beginDepth',
+ title : '璧峰娣卞害',
+ sortable: true
+ },
+ {
+ field : 'endDepth',
+ title : '缁堟娣卞害',
+ sortable: true
+ },
+ {
+ field : 'createTime',
+ title : '璁板綍淇濆瓨鏃堕棿',
+ sortable: true
+ },
+ {
+ field : 'recordPerson',
+ title : '鎻忚堪鍛�'
+ },
+ {
+ field : 'description',
+ title : '鎻忚堪澶囨敞'
+ }]
+ };
+ $.table.init(options);
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
--
Gitblit v1.9.1