修改样式

1 year ago · 7edabfd39c
parent dd1bc029d9
commit 7edabfd39c
6 changed files with 71 additions and 67 deletions
--- 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></iframe>
        </div>
        <div class="footer">
-            <div class="pull-right">© [[${copyrightYear}]] RuoYi Copyright </div>
+            <div class="pull-right">© [[${copyrightYear}]] highway Copyright </div>
        </div>
    </div>
    <!--右侧部分结束-->
--- 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;

    /** 样品名称 */
--- 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,18 +1,19 @@
 <!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
 <head>
-    <th:block th:include="include :: header('修改历史数据记录')" />
-    <th:block th:include="include :: datetimepicker-css" />
+    <th:block th:include="include :: header('修改历史数据记录')"/>
+    <th:block th:include="include :: datetimepicker-css"/>
 </head>
 <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}">
        <input name="objid" th:field="*{objid}" type="hidden">
        <div class="form-group">
            <label class="col-sm-3 control-label">采集时间：</label>
            <div class="col-sm-8">
-                    <div class="input-group date">
-                        <input name="recordTime" th:value="${#dates.format(recordPiontData.recordTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                <div class="input-group date" style="width: 150px">
+                    <input name="recordTime" th:value="${#dates.format(recordPiontData.recordTime, 'yyyy-MM-dd HH:mm:ss')}"
+                           class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" type="text" >
                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                </div>
            </div>
@ -54,10 +55,10 @@
            </div>
        </div>
    </form>
-    </div>
-    <th:block th:include="include :: footer" />
-    <th:block th:include="include :: datetimepicker-js" />
-    <script th:inline="javascript">
+</div>
+<th:block th:include="include :: footer"/>
+<th:block th:include="include :: datetimepicker-js"/>
+<script th:inline="javascript">
    var prefix = ctx + "manage/record_piont_data";
    $("#form-record_piont_data-edit").validate({
        focusCleanup: true
@ -74,6 +75,6 @@
        minView: "month",
        autoclose: true
    });
-    </script>
+</script>
 </body>
 </html>
--- 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',
--- 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("<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;
                    }
                },
@ -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
--- 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 @@
                <a class="btn btn-success" onclick="$.operate.addFull()" shiro:hasPermission="manage:record_report:add">
                    <i class="fa fa-plus"></i> 添加
                </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> 修改
                </a>
                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="manage:record_report:remove">