wangh
/
dlts_device_cockpit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改 样式

Browse Source
master
wangh 1 year ago
parent dd1bc029d9
commit 7edabfd39c
6 changed files with 71 additions and 67 deletions
Show Stats Download Patch File Download Diff File

2
haiwei-admin/src/main/resources/templates/index.html
Unescape Escape View File

@ -235,7 +235,7 @@
th:src="@{/system/main}" frameborder="0" seamless></iframe> th:src="@{/system/main}" frameborder="0" seamless></iframe>
</div> </div>
<div class="footer"> <div class="footer">
<div class="pull-right">© [[${copyrightYear}]] RuoYi Copyright </div> <div class="pull-right">© [[${copyrightYear}]] highway Copyright </div>
</div> </div>
</div> </div>
<!--右侧部分结束--> <!--右侧部分结束-->

3
haiwei-manage/src/main/java/com/haiwei/manage/domain/RecordTestReport.java
Unescape Escape View File

@ -2,6 +2,8 @@ package com.haiwei.manage.domain;
import java.util.List; import java.util.List;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.haiwei.common.annotation.Excel; import com.haiwei.common.annotation.Excel;
@ -22,6 +24,7 @@ public class RecordTestReport extends BaseEntity
/** 实验日期 */ /** 实验日期 */
@Excel(name = "实验日期", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "实验日期", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date testData; private Date testData;
/** 样品名称 */ /** 样品名称 */

125
haiwei-manage/src/main/resources/templates/manage/record_piont_data/edit.html
Unescape Escape View File

@ -1,79 +1,80 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" > <html lang="zh" xmlns:th="http://www.thymeleaf.org">
<head> <head>
<th:block th:include="include :: header('修改历史数据记录')" /> <th:block th:include="include :: header('修改历史数据记录')"/>
<th:block th:include="include :: datetimepicker-css" /> <th:block th:include="include :: datetimepicker-css"/>
</head> </head>
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-record_piont_data-edit" th:object="${recordPiontData}"> <form class="form-horizontal m" id="form-record_piont_data-edit" th:object="${recordPiontData}">
<input name="objid" th:field="*{objid}" type="hidden"> <input name="objid" th:field="*{objid}" type="hidden">
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">采集时间：</label> <label class="col-sm-3 control-label">采集时间：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="input-group date"> <div class="input-group date" style="width: 150px">
<input name="recordTime" th:value="${#dates.format(recordPiontData.recordTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text"> <input name="recordTime" th:value="${#dates.format(recordPiontData.recordTime, 'yyyy-MM-dd HH:mm:ss')}"
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" type="text" >
</div> <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div> </div>
</div> </div>
<div class="form-group"> </div>
<label class="col-sm-3 control-label">一体机A转速：</label> <div class="form-group">
<div class="col-sm-8"> <label class="col-sm-3 control-label">一体机A转速：</label>
<input name="speedA" th:field="*{speedA}" class="form-control" type="text"> <div class="col-sm-8">
</div> <input name="speedA" th:field="*{speedA}" class="form-control" type="text">
</div> </div>
<div class="form-group"> </div>
<label class="col-sm-3 control-label">一体机A电流：</label> <div class="form-group">
<div class="col-sm-8"> <label class="col-sm-3 control-label">一体机A电流：</label>
<input name="currentA" th:field="*{currentA}" class="form-control" type="text"> <div class="col-sm-8">
</div> <input name="currentA" th:field="*{currentA}" class="form-control" type="text">
</div> </div>
<div class="form-group"> </div>
<label class="col-sm-3 control-label">一体机A切刀转速：</label> <div class="form-group">
<div class="col-sm-8"> <label class="col-sm-3 control-label">一体机A切刀转速：</label>
<input name="speedCutter" th:field="*{speedCutter}" class="form-control" type="text"> <div class="col-sm-8">
</div> <input name="speedCutter" th:field="*{speedCutter}" class="form-control" type="text">
</div> </div>
<div class="form-group"> </div>
<label class="col-sm-3 control-label">一体机A切刀电流：</label> <div class="form-group">
<div class="col-sm-8"> <label class="col-sm-3 control-label">一体机A切刀电流：</label>
<input name="currentCutter" th:field="*{currentCutter}" class="form-control" type="text"> <div class="col-sm-8">
</div> <input name="currentCutter" th:field="*{currentCutter}" class="form-control" type="text">
</div> </div>
<div class="form-group"> </div>
<label class="col-sm-3 control-label">一体机A机头温度：</label> <div class="form-group">
<div class="col-sm-8"> <label class="col-sm-3 control-label">一体机A机头温度：</label>
<input name="tempHead" th:field="*{tempHead}" class="form-control" type="text"> <div class="col-sm-8">
</div> <input name="tempHead" th:field="*{tempHead}" class="form-control" type="text">
</div> </div>
<div class="form-group"> </div>
<label class="col-sm-3 control-label">一体机A机头压力：</label> <div class="form-group">
<div class="col-sm-8"> <label class="col-sm-3 control-label">一体机A机头压力：</label>
<input name="pressureHead" th:field="*{pressureHead}" class="form-control" type="text"> <div class="col-sm-8">
</div> <input name="pressureHead" th:field="*{pressureHead}" class="form-control" type="text">
</div> </div>
</form> </div>
</div> </form>
<th:block th:include="include :: footer" /> </div>
<th:block th:include="include :: datetimepicker-js" /> <th:block th:include="include :: footer"/>
<script th:inline="javascript"> <th:block th:include="include :: datetimepicker-js"/>
var prefix = ctx + "manage/record_piont_data"; <script th:inline="javascript">
$("#form-record_piont_data-edit").validate({ var prefix = ctx + "manage/record_piont_data";
focusCleanup: true $("#form-record_piont_data-edit").validate({
}); focusCleanup: true
});
function submitHandler() { function submitHandler() {
if ($.validate.form()) { if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-record_piont_data-edit').serialize()); $.operate.save(prefix + "/edit", $('#form-record_piont_data-edit').serialize());
}
} }
}
$("input[name='recordTime']").datetimepicker({ $("input[name='recordTime']").datetimepicker({
format: "yyyy-mm-dd", format: "yyyy-mm-dd",
minView: "month", minView: "month",
autoclose: true autoclose: true
}); });
</script> </script>
</body> </body>
</html> </html>

2
haiwei-manage/src/main/resources/templates/manage/record_piont_data/record_piont_data.html
Unescape Escape View File

@ -74,7 +74,7 @@
{ {
field: 'recordTime', field: 'recordTime',
title: '采集时间' title: '采集时间',
}, },
{ {
field: 'speedA', field: 'speedA',

4
haiwei-manage/src/main/resources/templates/manage/record_report/add.html
Unescape Escape View File

@ -121,7 +121,7 @@
align: 'center', align: 'center',
title: '采样时间', title: '采样时间',
formatter: function (value, row, index) { formatter: function (value, row, index) {
var html = $.common.sprintf("<input class='form-control' type='text' name='recordTestParamList[%s].recordTime' value='%s'>", index, value); var html = $.common.sprintf("<input class='form-control' type='text' name='recordTestParamList[%s].recordTime' value='%s' style='width: 150px'>", index, value);
return html; return html;
} }
}, },
@ -273,7 +273,7 @@
} }
function removeRow(ids) { function removeRow(ids) {
console.log('删除的ID='+ids) console.log('删除的ID='+ids)
("#" + table.options.id).bootstrapTable('remove', { field: subColumn, values: ids }); sub.editColumn();
$("#" + table.options.id).bootstrapTable('remove', { $("#" + table.options.id).bootstrapTable('remove', {
field: 'index', field: 'index',
values: ids values: ids

2
haiwei-manage/src/main/resources/templates/manage/record_report/record_report.html
Unescape Escape View File

@ -29,7 +29,7 @@
<a class="btn btn-success" onclick="$.operate.addFull()" shiro:hasPermission="manage:record_report:add"> <a class="btn btn-success" onclick="$.operate.addFull()" shiro:hasPermission="manage:record_report:add">
<i class="fa fa-plus"></i> 添加 <i class="fa fa-plus"></i> 添加
</a> </a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="manage:record_report:edit"> <a class="btn btn-primary single disabled" onclick="$.operate.editFull()" shiro:hasPermission="manage:record_report:edit">
<i class="fa fa-edit"></i> 修改 <i class="fa fa-edit"></i> 修改
</a> </a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="manage:record_report:remove"> <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="manage:record_report:remove">

Write Preview
Loading…
Cancel
Save