From 854bb992352772d3c69b47549a709ff57b4944bb Mon Sep 17 00:00:00 2001
From: suerwei <18810552194@163.com>
Date: 星期四, 23 五月 2024 10:31:30 +0800
Subject: [PATCH] 管材管理_1
---
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/TubLogController.java | 63 ++++++----
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/add.html | 45 +++----
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/ITubLogService.java | 13 ++
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/TubLogServiceImpl.java | 85 ++++++++++++++
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html | 5
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java | 1
javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/TubLogMapper.xml | 6
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/deviceLog.html | 4
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/edit.html | 37 ++---
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/TubLogMapper.java | 8 +
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/TubLog.html | 48 +++++--
11 files changed, 224 insertions(+), 91 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/TubLogController.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/TubLogController.java
index 585292e..34882bc 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/TubLogController.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/TubLogController.java
@@ -1,15 +1,13 @@
package com.javaweb.geo.controller;
import java.util.List;
+
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
import com.javaweb.common.annotation.Log;
import com.javaweb.common.enums.BusinessType;
import com.javaweb.geo.domain.TubLog;
@@ -18,17 +16,17 @@
import com.javaweb.common.core.domain.AjaxResult;
import com.javaweb.common.utils.poi.ExcelUtil;
import com.javaweb.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
/**
* 鏉愭枡鍑哄叆搴撹褰旵ontroller
- *
+ *
* @author cxy
* @date 2024-05-22
*/
@Controller
@RequestMapping("/geo/TubLog")
-public class TubLogController extends BaseController
-{
+public class TubLogController extends BaseController {
private String prefix = "geo/TubLog";
@Autowired
@@ -36,8 +34,8 @@
@RequiresPermissions("geo:TubLog:view")
@GetMapping()
- public String TubLog()
- {
+ public String TubLog(String id, ModelMap mmap) {
+ mmap.put("projectId", id);
return prefix + "/TubLog";
}
@@ -47,8 +45,7 @@
@RequiresPermissions("geo:TubLog:list")
@PostMapping("/list")
@ResponseBody
- public TableDataInfo list(TubLog tubLog)
- {
+ public TableDataInfo list(TubLog tubLog) {
startPage();
List<TubLog> list = tubLogService.selectTubLogList(tubLog);
return getDataTable(list);
@@ -61,8 +58,7 @@
@Log(title = "鏉愭枡鍑哄叆搴撹褰�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ResponseBody
- public AjaxResult export(TubLog tubLog)
- {
+ public AjaxResult export(TubLog tubLog) {
List<TubLog> list = tubLogService.selectTubLogList(tubLog);
ExcelUtil<TubLog> util = new ExcelUtil<TubLog>(TubLog.class);
return util.exportExcel(list, "TubLog");
@@ -72,8 +68,17 @@
* 鏂板鏉愭枡鍑哄叆搴撹褰�
*/
@GetMapping("/add")
- public String add()
- {
+ public String add(String projectId, ModelMap mmap) {
+ Integer number = tubLogService.selectMaxTubLogId(projectId);
+ if (ObjectUtils.isEmpty(number)){
+ number = 1;
+ }else {
+ number++;
+ }
+ String formattedNumber = String.format("%06d", number);
+ String code = "ZTCJ" + formattedNumber;
+ mmap.put("projectId", projectId);
+ mmap.put("code", code);
return prefix + "/add";
}
@@ -84,8 +89,7 @@
@Log(title = "鏉愭枡鍑哄叆搴撹褰�", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
- public AjaxResult addSave(TubLog tubLog)
- {
+ public AjaxResult addSave(TubLog tubLog) {
return toAjax(tubLogService.insertTubLog(tubLog));
}
@@ -93,8 +97,7 @@
* 淇敼鏉愭枡鍑哄叆搴撹褰�
*/
@GetMapping("/edit/{id}")
- public String edit(@PathVariable("id") Integer id, ModelMap mmap)
- {
+ public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
TubLog tubLog = tubLogService.selectTubLogById(id);
mmap.put("tubLog", tubLog);
return prefix + "/edit";
@@ -107,8 +110,7 @@
@Log(title = "鏉愭枡鍑哄叆搴撹褰�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
- public AjaxResult editSave(TubLog tubLog)
- {
+ public AjaxResult editSave(TubLog tubLog) {
return toAjax(tubLogService.updateTubLog(tubLog));
}
@@ -117,10 +119,21 @@
*/
@RequiresPermissions("geo:TubLog:remove")
@Log(title = "鏉愭枡鍑哄叆搴撹褰�", businessType = BusinessType.DELETE)
- @PostMapping( "/remove")
+ @PostMapping("/remove")
@ResponseBody
- public AjaxResult remove(String ids)
- {
+ public AjaxResult remove(String ids) {
return toAjax(tubLogService.deleteTubLogByIds(ids));
}
+
+ /**
+ * 瀵煎叆绠℃潗鍑哄叆搴撹褰�
+ */
+ @RequiresPermissions("geo:deviceLog:import")
+ @Log(title = "瀵煎叆绠℃潗鍑哄叆搴撹褰�")
+ @PostMapping( "/importTubLog/{projectId}")
+ @ResponseBody
+ public AjaxResult importTubLog(@PathVariable("projectId") String projectId, @RequestParam("file") MultipartFile file, boolean updateSupport){
+ String message = tubLogService.importTubLog(projectId,file,updateSupport);
+ return AjaxResult.success(message);
+ }
}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/TubLogMapper.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/TubLogMapper.java
index 5c1b128..05a884c 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/TubLogMapper.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/TubLogMapper.java
@@ -1,6 +1,8 @@
package com.javaweb.geo.mapper;
import com.javaweb.geo.domain.TubLog;
+import org.apache.ibatis.annotations.Param;
+
import java.util.List;
/**
@@ -58,4 +60,10 @@
* @return 缁撴灉
*/
public int deleteTubLogByIds(String[] ids);
+
+ /**
+ * 鏌ヨ鏁版嵁搴撲腑id鏈�澶у��
+ * @return
+ */
+ Integer selectMaxTubLogId(@Param("projectId") String projectId);
}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/ITubLogService.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/ITubLogService.java
index 428c1e8..3dae239 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/ITubLogService.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/ITubLogService.java
@@ -1,6 +1,8 @@
package com.javaweb.geo.service;
import com.javaweb.geo.domain.TubLog;
+import org.springframework.web.multipart.MultipartFile;
+
import java.util.List;
/**
@@ -58,4 +60,15 @@
* @return 缁撴灉
*/
public int deleteTubLogById(Integer id);
+
+ /**
+ * 鏌ヨ鏁版嵁搴撲腑id鏈�澶у��
+ * @return
+ */
+ Integer selectMaxTubLogId(String projectId);
+
+ /**
+ * 瀵煎叆绠℃潗鍑哄叆搴撹褰�
+ */
+ String importTubLog(String projectId, MultipartFile file, boolean updateSupport);
}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java
index 5b1692d..b996cdd 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java
@@ -176,7 +176,6 @@
private List<DeviceLog> readData(String filepath) {
ExcelReader reader = ExcelUtil.getReader(filepath, 0);
reader.addHeaderAlias("璁惧鍚嶇О", "deviceName");
- reader.addHeaderAlias("绫诲瀷", "type");
reader.addHeaderAlias("鍏ュ簱鏃堕棿", "inboundDate");
reader.addHeaderAlias("鍑哄簱鏃堕棿", "outboundDate");
reader.addHeaderAlias("缁忓姙浜�", "optUser");
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/TubLogServiceImpl.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/TubLogServiceImpl.java
index c9ffa19..448f9b1 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/TubLogServiceImpl.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/TubLogServiceImpl.java
@@ -1,14 +1,20 @@
package com.javaweb.geo.service.impl;
+import java.io.File;
import java.util.List;
+import cn.hutool.poi.excel.ExcelReader;
+import cn.hutool.poi.excel.ExcelUtil;
+import com.javaweb.common.config.Global;
import com.javaweb.common.utils.DateUtils;
+import com.javaweb.geo.domain.TubLog;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.javaweb.geo.mapper.TubLogMapper;
-import com.javaweb.geo.domain.TubLog;
import com.javaweb.geo.service.ITubLogService;
import com.javaweb.common.core.text.Convert;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.multipart.MultipartFile;
/**
* 鏉愭枡鍑哄叆搴撹褰昐ervice涓氬姟灞傚鐞�
@@ -18,8 +24,11 @@
*/
@Service
public class TubLogServiceImpl implements ITubLogService {
+
@Autowired
private TubLogMapper tubLogMapper;
+
+ private String fileSaveDir = Global.getProfile() + "\\template\\" ;
/**
* 鏌ヨ鏉愭枡鍑哄叆搴撹褰�
@@ -87,4 +96,78 @@
public int deleteTubLogById(Integer id) {
return tubLogMapper.deleteTubLogById(id);
}
+
+ /**
+ * 鏌ヨ鏁版嵁搴撲腑id鏈�澶у��
+ * @return
+ */
+ @Override
+ public Integer selectMaxTubLogId(String projectId) {
+ return tubLogMapper.selectMaxTubLogId(projectId);
+ }
+
+ /**
+ * 瀵煎叆绠℃潗鍑哄叆搴撹褰�
+ */
+ @Override
+ public String importTubLog(String projectId, MultipartFile file, boolean updateSupport) {
+ // 鍏宠仈code
+ Integer number = tubLogMapper.selectMaxTubLogId(projectId);
+
+ try {
+ String dest = saveExcel(file);
+ List<TubLog> list = readData(dest);
+ for (TubLog item : list) {
+ // 杞崲椤圭洰淇℃伅
+ item.setProjectId(projectId);
+
+ // 杞崲number淇℃伅
+ if (ObjectUtils.isEmpty(number)){
+ number = 1;
+ }else {
+ number++;
+ }
+ String code = "ZTCJ" + String.format("%06d", number);
+ item.setCode(code);
+
+ item.setCreateDate(DateUtils.getNowDate());
+ insertTubLog(item);
+ }
+ } catch (Exception e) {
+ return e.toString();
+ }
+ return "瀵煎叆瀹屾瘯" ;
+ }
+
+
+ private String saveExcel(MultipartFile file) {
+ String filename = file.getOriginalFilename();
+ File dir = new File(fileSaveDir);
+ if (!dir.exists()) {
+ dir.mkdir();
+ }
+ String addr = fileSaveDir + filename;
+ try {
+ File dest = new File(addr);
+ file.transferTo(dest);
+ } catch (Exception e) {
+ return null;
+ }
+ return addr;
+ }
+
+ private List<TubLog> readData(String filepath) {
+ ExcelReader reader = ExcelUtil.getReader(filepath, 0);
+ reader.addHeaderAlias("绠℃潗鍚嶇О", "tubName");
+ reader.addHeaderAlias("鍏ュ簱鏃堕棿", "inboundDate");
+ reader.addHeaderAlias("鍑哄簱鏃堕棿", "outboundDate");
+ reader.addHeaderAlias("缁忓姙浜�", "optUser");
+ reader.addHeaderAlias("璐熻矗浜�", "applyUser");
+ reader.addHeaderAlias("鍑哄叆搴撴暟閲�", "number");
+ reader.addHeaderAlias("鏁版嵁鍗曚綅", "unit");
+ reader.addHeaderAlias("澶囨敞", "remark");
+
+ List<TubLog> list = reader.readAll(TubLog.class);
+ return list;
+ }
}
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/TubLogMapper.xml b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/TubLogMapper.xml
index fd32d2b..90e8385 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/TubLogMapper.xml
+++ b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/TubLogMapper.xml
@@ -45,7 +45,11 @@
<include refid="selectTubLogVo"/>
where id = #{id}
</select>
-
+
+ <select id="selectMaxTubLogId" resultType="java.lang.Integer">
+ SELECT MAX(id) FROM js_tub_log where project_id = #{projectId}
+ </select>
+
<insert id="insertTubLog" parameterType="TubLog" useGeneratedKeys="true" keyProperty="id">
insert into js_tub_log
<trim prefix="(" suffix=")" suffixOverrides=",">
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/TubLog.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/TubLog.html
index ace4a6f..434ae3e 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/TubLog.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/TubLog.html
@@ -41,9 +41,12 @@
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="geo:TubLog:remove">
<i class="fa fa-remove"></i> 鍒犻櫎
</a>
- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:TubLog:export">
- <i class="fa fa-download"></i> 瀵煎嚭
- </a>
+<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="geo:TubLog:export">-->
+<!-- <i class="fa fa-download"></i> 瀵煎嚭-->
+<!-- </a>-->
+ <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="geo:TubLog:import">
+ <i class="fa fa-upload"></i> 瀵煎叆
+ </a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
@@ -55,14 +58,16 @@
var editFlag = [[${@permission.hasPermi('geo:TubLog:edit')}]];
var removeFlag = [[${@permission.hasPermi('geo:TubLog:remove')}]];
var prefix = ctx + "geo/TubLog";
+ var projectId=[[${projectId}]];
$(function() {
var options = {
- url: prefix + "/list",
- createUrl: prefix + "/add",
+ url: prefix + "/list?projectId="+projectId,
+ createUrl: prefix + "/add?projectId="+projectId,
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
+ importUrl: prefix + "/importTubLog/"+projectId,
modalName: "鏉愭枡鍑哄叆搴撹褰�",
columns: [{
checkbox: true
@@ -79,10 +84,6 @@
{
field : 'tubName',
title : '绠℃潗鍚嶇О'
- },
- {
- field : 'type',
- title : '绫诲瀷'
},
{
field : 'outboundDate',
@@ -109,10 +110,6 @@
title : '鏁版嵁鍗曚綅'
},
{
- field : 'createDate',
- title : '鏃堕棿'
- },
- {
field : 'remark',
title : '澶囨敞'
},
@@ -129,6 +126,31 @@
};
$.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
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/add.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/add.html
index 10d7fcb..3d70b97 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/add.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/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="${code}" class="form-control" type="text" disabled="disabled">
</div>
</div>
<div class="form-group">
@@ -19,15 +19,15 @@
<input name="tubName" class="form-control" type="text">
</div>
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">绫诲瀷锛�</label>
- <div class="col-sm-8">
- <select name="type" class="form-control m-b">
- <option value="">鎵�鏈�</option>
- </select>
- <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 浠ｇ爜鐢熸垚璇烽�夋嫨瀛楀吀灞炴��</span>
- </div>
- </div>
+<!-- <div class="form-group"> -->
+<!-- <label class="col-sm-3 control-label">绫诲瀷锛�</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <select name="type" class="form-control m-b">-->
+<!-- <option value="">鎵�鏈�</option>-->
+<!-- </select>-->
+<!-- <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 浠ｇ爜鐢熸垚璇烽�夋嫨瀛楀吀灞炴��</span>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label">鍑哄簱鏃堕棿锛�</label>
<div class="col-sm-8">
@@ -70,28 +70,31 @@
<input name="unit" class="form-control" type="text">
</div>
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">鏃堕棿锛�</label>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">澶囨敞锛�</label>
<div class="col-sm-8">
- <div class="input-group date">
- <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
- <input name="createDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
- </div>
+ <textarea id="remark" name="remark" class="form-control"></textarea>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
- <script type="text/javascript">
+ <script th:inline="javascript">
var prefix = ctx + "geo/TubLog"
+ var projectId = [[${projectId}]];
+ var code = [[${code}]];
+
+
$("#form-TubLog-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
- $.operate.save(prefix + "/add", $('#form-TubLog-add').serialize());
+ let formData = $('#form-TubLog-add').serialize();
+ let data = formData + "&projectId=" + projectId + "&code=" + code;
+ $.operate.save(prefix + "/add", data);
}
}
@@ -102,12 +105,6 @@
});
$("input[name='inboundDate']").datetimepicker({
- format: "yyyy-mm-dd",
- minView: "month",
- autoclose: true
- });
-
- $("input[name='createDate']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/edit.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/edit.html
index 837a610..442f7bf 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/edit.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/TubLog/edit.html
@@ -11,7 +11,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">鍑哄叆搴撳崟瀛愬彿锛�</label>
<div class="col-sm-8">
- <input name="code" th:field="*{code}" class="form-control" type="text">
+ <input name="code" th:field="*{code}" class="form-control" type="text" disabled="disabled">
</div>
</div>
<div class="form-group">
@@ -20,15 +20,15 @@
<input name="tubName" th:field="*{tubName}" class="form-control" type="text">
</div>
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">绫诲瀷锛�</label>
- <div class="col-sm-8">
- <select name="type" class="form-control m-b">
- <option value="">鎵�鏈�</option>
- </select>
- <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 浠ｇ爜鐢熸垚璇烽�夋嫨瀛楀吀灞炴��</span>
- </div>
- </div>
+<!-- <div class="form-group"> -->
+<!-- <label class="col-sm-3 control-label">绫诲瀷锛�</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <select name="type" class="form-control m-b">-->
+<!-- <option value="">鎵�鏈�</option>-->
+<!-- </select>-->
+<!-- <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 浠ｇ爜鐢熸垚璇烽�夋嫨瀛楀吀灞炴��</span>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label">鍑哄簱鏃堕棿锛�</label>
<div class="col-sm-8">
@@ -71,21 +71,20 @@
<input name="unit" th:field="*{unit}" class="form-control" type="text">
</div>
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">鏃堕棿锛�</label>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">澶囨敞锛�</label>
<div class="col-sm-8">
- <div class="input-group date">
- <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
- <input name="createDate" th:value="${#dates.format(tubLog.createDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
- </div>
+ <textarea id="remark" th:field="*{remark}" name="remark" class="form-control"></textarea>
</div>
</div>
+
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<script type="text/javascript">
var prefix = ctx + "geo/TubLog";
+
$("#form-TubLog-edit").validate({
focusCleanup: true
});
@@ -103,12 +102,6 @@
});
$("input[name='inboundDate']").datetimepicker({
- format: "yyyy-mm-dd",
- minView: "month",
- autoclose: true
- });
-
- $("input[name='createDate']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
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 202b4ad..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,10 +11,6 @@
<div class="select-list">
<ul>
<li>
- <p>宸ュ崟鍙凤細</p>
- <input type="text" name="code"/>
- </li>
- <li>
<p>鍚嶇О锛�</p>
<input type="text" name="deviceName"/>
</li>
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html
index 66ef6ae..5c4fb2d 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/navigate.html
@@ -46,6 +46,11 @@
</div>
<div class="box-header ">
<div class="box-title">
+ <i class="glyphicon glyphicon-retweet"></i> <a class="afont" th:href="@{/geo/TubLog(id=${project.ids})}" target="mainFrame" onclick="selected(this)">鏉愭枡绠＄悊</a>
+ </div>
+ </div>
+ <div class="box-header ">
+ <div class="box-title">
<i class="glyphicon glyphicon-object-align-horizontal"></i> <a class="afont" th:href="@{/geo/projectData(id=${project.ids},type='1')}" target="mainFrame" onclick="selected(this)">璐ㄩ噺绠＄悊</a>
</div>
</div>
--
Gitblit v1.9.1