diff --git a/haiwei-admin/src/main/resources/templates/index.html b/haiwei-admin/src/main/resources/templates/index.html index e661f41..5ba86f2 100644 --- a/haiwei-admin/src/main/resources/templates/index.html +++ b/haiwei-admin/src/main/resources/templates/index.html @@ -235,7 +235,7 @@ th:src="@{/system/main}" frameborder="0" seamless>
-
© [[${copyrightYear}]] RuoYi Copyright
+
© [[${copyrightYear}]] highway Copyright
diff --git a/haiwei-manage/src/main/java/com/haiwei/manage/domain/RecordTestReport.java b/haiwei-manage/src/main/java/com/haiwei/manage/domain/RecordTestReport.java index 1311119..9a94dd6 100644 --- a/haiwei-manage/src/main/java/com/haiwei/manage/domain/RecordTestReport.java +++ b/haiwei-manage/src/main/java/com/haiwei/manage/domain/RecordTestReport.java @@ -2,6 +2,8 @@ package com.haiwei.manage.domain; import java.util.List; import java.util.Date; + +import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.haiwei.common.annotation.Excel; @@ -22,6 +24,7 @@ public class RecordTestReport extends BaseEntity /** 实验日期 */ @Excel(name = "实验日期", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") private Date testData; /** 样品名称 */ diff --git a/haiwei-manage/src/main/resources/templates/manage/record_piont_data/edit.html b/haiwei-manage/src/main/resources/templates/manage/record_piont_data/edit.html index 47860ab..508695a 100644 --- a/haiwei-manage/src/main/resources/templates/manage/record_piont_data/edit.html +++ b/haiwei-manage/src/main/resources/templates/manage/record_piont_data/edit.html @@ -1,79 +1,80 @@ - + - - + + -
-
- -
- -
-
- - -
+
+ + +
+ +
+
+ +
-
- -
- -
+
+
+ +
+
-
- -
- -
+
+
+ +
+
-
- -
- -
+
+
+ +
+
-
- -
- -
+
+
+ +
+
-
- -
- -
+
+
+ +
+
-
- -
- -
+
+
+ +
+
- -
- - - + $("input[name='recordTime']").datetimepicker({ + format: "yyyy-mm-dd", + minView: "month", + autoclose: true + }); + \ No newline at end of file diff --git a/haiwei-manage/src/main/resources/templates/manage/record_piont_data/record_piont_data.html b/haiwei-manage/src/main/resources/templates/manage/record_piont_data/record_piont_data.html index 4393c0e..44b62fa 100644 --- a/haiwei-manage/src/main/resources/templates/manage/record_piont_data/record_piont_data.html +++ b/haiwei-manage/src/main/resources/templates/manage/record_piont_data/record_piont_data.html @@ -74,7 +74,7 @@ { field: 'recordTime', - title: '采集时间' + title: '采集时间', }, { field: 'speedA', diff --git a/haiwei-manage/src/main/resources/templates/manage/record_report/add.html b/haiwei-manage/src/main/resources/templates/manage/record_report/add.html index 606f448..f000ae3 100644 --- a/haiwei-manage/src/main/resources/templates/manage/record_report/add.html +++ b/haiwei-manage/src/main/resources/templates/manage/record_report/add.html @@ -121,7 +121,7 @@ align: 'center', title: '采样时间', formatter: function (value, row, index) { - var html = $.common.sprintf("", index, value); + var html = $.common.sprintf("", index, value); return html; } }, @@ -273,7 +273,7 @@ } function removeRow(ids) { console.log('删除的ID='+ids) - ("#" + table.options.id).bootstrapTable('remove', { field: subColumn, values: ids }); + sub.editColumn(); $("#" + table.options.id).bootstrapTable('remove', { field: 'index', values: ids diff --git a/haiwei-manage/src/main/resources/templates/manage/record_report/record_report.html b/haiwei-manage/src/main/resources/templates/manage/record_report/record_report.html index 1fdad9f..dbf148d 100644 --- a/haiwei-manage/src/main/resources/templates/manage/record_report/record_report.html +++ b/haiwei-manage/src/main/resources/templates/manage/record_report/record_report.html @@ -29,7 +29,7 @@ 添加 - + 修改