增加 选择数据

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 
 {
     /**

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;
     }

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}
     </select>
 
-    <insert id="insertRecordTestReport" parameterType="RecordTestReport">
+    <insert id="insertRecordTestReport" parameterType="RecordTestReport" useGeneratedKeys="true" keyProperty="objid">
         insert into record_test_report
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="objid != null">objid,</if>

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();
+        var rows = $("#bootstrap-table").bootstrapTable('getSelections');
-        if (rows.length == 0) {
+        console.log(rows.length)
+
+        if (rows[0].recordTime==null) {
             $.modal.alertWarning("请至少选择一条记录");
             return;
         }
         $.modal.close();
         // 父页面的方法
-        parent.selectUsers();
+        parent.selectUsers(rows);
-        // 父页面的变量
+        // // 父页面的变量
-        parent.$('#userids').html(rows.join());
+        // parent.$('#userids').html(rows.join());
     }
     <!-- laydate示例 -->
     layui.use('laydate', function () {

haiwei-manage/src/main/resources/templates/manage/record_report/add.html

@@ -68,7 +68,7 @@
 
                 <button type="button" class="btn btn-white btn-sm" onclick="addColumn()"><i class="fa fa-plus"> 增加</i>
                 </button>
-                <button type="button" class="btn btn-white btn-sm" onclick=""><i class="fa fa-minus">
+                <button type="button" class="btn btn-white btn-sm" onclick="sub.delColumn()"><i class="fa fa-minus">
                     删除</i></button>
                 <div class="col-sm-12 select-table table-striped">
                     <table id="bootstrap-table"></table>
@@ -224,6 +224,18 @@
                         return html;
                     }
 
+                },
+                {
+
+                    title: '操作',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-danger btn-xs  " href="javascript:void(0)" ' +
+                            'onclick="removeRow(\''+row.index+'\')"><i class="fa fa-remove"></i>删除</a>');
+
+                        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();
+
-        //
+    function selectUsers(rows) {
-        // $("#" + table.options.id).bootstrapTable('insertRow', {
+        for (var i = 0; i < rows.length; i++) {
-        //     index: count,
+            var count = $("#" + table.options.id).bootstrapTable('getData').length;
-        //     row: {
+            console.log('添加 id = '+count)
-        //         index: $.table.serialNumber(count),
+            sub.editColumn();
-        //         recordTime: "",
+            $("#" + table.options.id).bootstrapTable('insertRow', {
-        //         temp: "",
+                index: count,
-        //         openNumber: "",
+                row: {
-        //         aperture: "",
+                    index: $.table.serialNumber(count),
-        //         nozzleNumber: "",
+                    recordTime: rows[i].recordTime,
-        //         middleTemp: "",
+                    temp: "",
-        //         outTemp: "",
+                    openNumber: "",
-        //         headPressure: "",
+                    aperture: "",
-        //         screwSpeed: "",
+                    nozzleNumber: "",
-        //         motorCurrent: "",
+                    middleTemp: "",
-        //         cutterSpeed: "",
+                    outTemp: rows[i].tempHead,
-        //         waterContent: ""
+                    headPressure: rows[i].pressureHead,
-        //     }
+                    screwSpeed: rows[i].speedA,
-        // });
+                    motorCurrent: rows[i].currentA,
+                    cutterSpeed: rows[i].speedCutter,
+                    waterContent: ""
+                }
+            });
         }
-    function callback(index, layero) {
-        console.log("进入了回调函数提交方法"+layero.toString());
-        // $.modal.close();
     }
-    function selectUsers() {
+    function removeRow(ids) {
-        alert("进入了回调函数提交方法")
+        console.log('删除的ID='+ids)
+        ("#" + table.options.id).bootstrapTable('remove', { field: subColumn, values: ids });
+        $("#" + table.options.id).bootstrapTable('remove', {
+            field: 'index',
+            values: ids
+        })
     }
 </script>
 </body>