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/holeLog/holeLog.html | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
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 9f655cf..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
@@ -15,7 +15,7 @@
<input type="text" name="code"/>
</li>
<li class="select-time">
- <p>璁板綍淇濆瓨鏃堕棿锛�</p>
+ <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]"/>
@@ -78,30 +78,32 @@
},
{
field : 'code',
- title : '閽诲瓟缂栧彿'
+ title : '閽诲瓟缂栧彿',
+ sortable:true,
},
{
field : 'beginDepth',
- title : '璧峰娣卞害',
+ title : '璁板綍璧峰娣卞害(m)',
sortable: true
},
{
field : 'endDepth',
- title : '缁堟娣卞害',
+ title : '璁板綍缁堟娣卞害(m)',
sortable: true
},
{
field : 'createTime',
- title : '璁板綍淇濆瓨鏃堕棿',
+ title : '鏃ユ湡',
+ sortable:true,
sortable: true
},
{
field : 'recordPerson',
- title : '鎻忚堪鍛�'
+ title : '璁板綍浜�'
},
{
field : 'description',
- title : '鎻忚堪澶囨敞'
+ title : '澶囨敞淇℃伅'
},
{
title: '鎿嶄綔',
--
Gitblit v1.9.1