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/deviceLog/deviceLog.html | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/deviceLog.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/deviceLog.html
index a801b86..28915a7 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/deviceLog.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/deviceLog.html
@@ -11,7 +11,7 @@
<div class="select-list">
<ul>
<li>
- <p>鍑哄叆搴撳崟瀛愬彿锛�</p>
+ <p>宸ュ崟鍙凤細</p>
<input type="text" name="code"/>
</li>
<li>
@@ -19,7 +19,7 @@
<input type="text" name="deviceName"/>
</li>
<li>
- <p>璁惧/鏉愭枡绫诲瀷锛�</p>
+ <p>绫诲瀷锛�</p>
<select name="type" th:with="type=${@dict.getType('device_log_type')}">
<option value="">鎵�鏈�</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
@@ -91,7 +91,8 @@
},
{
field : 'code',
- title : '鍑哄叆搴撳崟瀛愬彿'
+ title : '宸ュ崟鍙�',
+ sortable:true
},
{
field : 'projectName',
@@ -109,26 +110,31 @@
},
{
field : 'type',
- title : '璁惧/鏉愭枡绫诲瀷',
+ title : '璁惧/鏉愭枡',
+ sortable:true,
formatter: function(value, row, index) {
return $.table.selectDictLabel(typeDatas, value);
}
},
{
field : 'inboundDate',
- title : '鍏ュ簱鏃堕棿'
+ title : '鍏ュ簱鏃堕棿',
+ sortable:true
},
{
field : 'outboundDate',
- title : '鍑哄簱鏃堕棿'
+ title : '鍑哄簱鏃堕棿',
+ sortable:true
},
{
field : 'optUser',
- title : '缁忓姙浜�'
+ title : '缁忓姙浜�',
+ sortable:true
},
{
field : 'applyUser',
- title : '璐熻矗浜�'
+ title : '璐熻矗浜�',
+ sortable:true
},
{
field : 'number',
@@ -166,7 +172,7 @@
<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="瀵煎叆璁惧鍑哄叆搴撲俊鎭俊鎭�"> 鏄惁鏇存柊宸茬粡瀛樺湪鐨勬暟鎹�
+ <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">
--
Gitblit v1.9.1