From 7fe5fb39e00749e4e412ced5703a61036752c874 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期二, 25 六月 2024 18:49:02 +0800
Subject: [PATCH] 提交代码
---
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/deviceLog.html | 43 ++++++++++++++-----------------------------
1 files changed, 14 insertions(+), 29 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..97f26b9 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,20 +11,10 @@
<div class="select-list">
<ul>
<li>
- <p>鍑哄叆搴撳崟瀛愬彿锛�</p>
- <input type="text" name="code"/>
- </li>
- <li>
<p>鍚嶇О锛�</p>
<input type="text" name="deviceName"/>
</li>
- <li>
- <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>
- </select>
- </li>
+
<li>
<p>缁忓姙浜猴細</p>
<input type="text" name="optUser"/>
@@ -91,13 +81,10 @@
},
{
field : 'code',
- title : '鍑哄叆搴撳崟瀛愬彿'
+ title : '宸ュ崟鍙�',
+ sortable:true
},
- {
- field : 'projectName',
- title : '鍦哄湴鍚嶇О',
- visible: false
- },
+
{
field : 'deviceCode',
title : '缂栧彿',
@@ -107,28 +94,26 @@
field : 'deviceName',
title : '鍚嶇О'
},
- {
- field : 'type',
- title : '璁惧/鏉愭枡绫诲瀷',
- 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 +151,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