From 0c4e75550eac69d7859a8adc9fc87eaace8a380c Mon Sep 17 00:00:00 2001 From: wangh <123456> Date: Thu, 2 Nov 2023 10:56:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/mapper/RecordTestReportMapper.java | 2 + .../impl/RecordTestReportServiceImpl.java | 1 + .../mapper/manage/RecordTestReportMapper.xml | 2 +- .../record_piont_data/record_piont_data.html | 18 ++--- .../templates/manage/record_report/add.html | 74 ++++++++++++------- 5 files changed, 58 insertions(+), 39 deletions(-) diff --git a/haiwei-manage/src/main/java/com/haiwei/manage/mapper/RecordTestReportMapper.java b/haiwei-manage/src/main/java/com/haiwei/manage/mapper/RecordTestReportMapper.java index 30b299d..7591e5f 100644 --- a/haiwei-manage/src/main/java/com/haiwei/manage/mapper/RecordTestReportMapper.java +++ b/haiwei-manage/src/main/java/com/haiwei/manage/mapper/RecordTestReportMapper.java @@ -3,6 +3,7 @@ package com.haiwei.manage.mapper; import java.util.List; import com.haiwei.manage.domain.RecordTestReport; import com.haiwei.manage.domain.RecordTestParam; +import org.springframework.stereotype.Repository; /** * 实验报告Mapper接口 @@ -10,6 +11,7 @@ import com.haiwei.manage.domain.RecordTestParam; * @author wangh * @date 2023-10-30 */ +@Repository public interface RecordTestReportMapper { /** diff --git a/haiwei-manage/src/main/java/com/haiwei/manage/service/impl/RecordTestReportServiceImpl.java b/haiwei-manage/src/main/java/com/haiwei/manage/service/impl/RecordTestReportServiceImpl.java index 8a26749..3dbea34 100644 --- a/haiwei-manage/src/main/java/com/haiwei/manage/service/impl/RecordTestReportServiceImpl.java +++ b/haiwei-manage/src/main/java/com/haiwei/manage/service/impl/RecordTestReportServiceImpl.java @@ -62,6 +62,7 @@ public class RecordTestReportServiceImpl implements IRecordTestReportService { recordTestReport.setUpdateBy(ShiroUtils.getLoginName()); recordTestReport.setUpdateTime(DateUtils.getNowDate()); int rows = recordTestReportMapper.insertRecordTestReport(recordTestReport); + insertRecordTestParam(recordTestReport); return rows; } diff --git a/haiwei-manage/src/main/resources/mapper/manage/RecordTestReportMapper.xml b/haiwei-manage/src/main/resources/mapper/manage/RecordTestReportMapper.xml index 1cf0009..bddb991 100644 --- a/haiwei-manage/src/main/resources/mapper/manage/RecordTestReportMapper.xml +++ b/haiwei-manage/src/main/resources/mapper/manage/RecordTestReportMapper.xml @@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where a.objid = #{objid} - + insert into record_test_report objid, 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 23bff7a..4393c0e 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 @@ -71,11 +71,7 @@ columns: [{ checkbox: true }, - { - field: 'objid', - title: '主键', - visible: false - }, + { field: 'recordTime', title: '采集时间' @@ -124,16 +120,18 @@ /* 添加用户-选择用户-提交 */ function submitHandler(index, layero) { - var rows = $.table.selectFirstColumns(); - if (rows.length == 0) { + var rows = $("#bootstrap-table").bootstrapTable('getSelections'); + console.log(rows.length) + + if (rows[0].recordTime==null) { $.modal.alertWarning("请至少选择一条记录"); return; } $.modal.close(); // 父页面的方法 - parent.selectUsers(); - // 父页面的变量 - parent.$('#userids').html(rows.join()); + parent.selectUsers(rows); + // // 父页面的变量 + // parent.$('#userids').html(rows.join()); } layui.use('laydate', function () { 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 18ab258..606f448 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 @@ -68,7 +68,7 @@ -
@@ -224,6 +224,18 @@ return html; } + }, + { + + title: '操作', + align: 'center', + formatter: function (value, row, index) { + var actions = []; + actions.push('删除'); + + return actions.join(''); + } }] }; $.table.init(options); @@ -231,35 +243,41 @@ function addColumn() { $.modal.open('选择数据', prefix + "/selectData", '900', '620'); - // - // var count = $("#" + table.options.id).bootstrapTable('getData').length; - // sub.editColumn(); - // - // $("#" + table.options.id).bootstrapTable('insertRow', { - // index: count, - // row: { - // index: $.table.serialNumber(count), - // recordTime: "", - // temp: "", - // openNumber: "", - // aperture: "", - // nozzleNumber: "", - // middleTemp: "", - // outTemp: "", - // headPressure: "", - // screwSpeed: "", - // motorCurrent: "", - // cutterSpeed: "", - // waterContent: "" - // } - // }); + } - function callback(index, layero) { - console.log("进入了回调函数提交方法"+layero.toString()); - // $.modal.close(); + + function selectUsers(rows) { + for (var i = 0; i < rows.length; i++) { + var count = $("#" + table.options.id).bootstrapTable('getData').length; + console.log('添加 id = '+count) + sub.editColumn(); + $("#" + table.options.id).bootstrapTable('insertRow', { + index: count, + row: { + index: $.table.serialNumber(count), + recordTime: rows[i].recordTime, + temp: "", + openNumber: "", + aperture: "", + nozzleNumber: "", + middleTemp: "", + outTemp: rows[i].tempHead, + headPressure: rows[i].pressureHead, + screwSpeed: rows[i].speedA, + motorCurrent: rows[i].currentA, + cutterSpeed: rows[i].speedCutter, + waterContent: "" + } + }); + } } - function selectUsers() { - alert("进入了回调函数提交方法") + function removeRow(ids) { + console.log('删除的ID='+ids) + ("#" + table.options.id).bootstrapTable('remove', { field: subColumn, values: ids }); + $("#" + table.options.id).bootstrapTable('remove', { + field: 'index', + values: ids + }) }