update

meas-common/src/main/java/com/meas/common/utils/file/FileUploadUtils.java

@@ -25,7 +25,7 @@ public class FileUploadUtils {
     /**
      * 默认大小 50M
      */
-    public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024;
+    public static final long DEFAULT_MAX_SIZE = 1024 * 1024 * 1024;
 
     /**
      * 默认的文件名最大长度 100

meas-system/src/main/java/com/meas/system/controller/MeasBatchController.java

@@ -100,4 +100,12 @@ public class MeasBatchController extends BaseController {
     public AjaxResult getOption(@PathVariable Long engineId){
         return success(measBatchService.getOption(engineId));
     }
+    /**
+     * 获取所有测量批次
+     */
+    @GetMapping("/measurementBatchList")
+    public AjaxResult getMeasurementBatchList() {
+        return success(measBatchService.selectMeasurementBatchList());
+    }
+
 }

meas-system/src/main/java/com/meas/system/controller/MeasEngineModelController.java

@@ -100,4 +100,10 @@ public class MeasEngineModelController extends BaseController {
     public AjaxResult getOption(){
         return success(measEngineModelService.getOption());
     }
+
+    /**
+     * 获取所有发动机型号
+     */
+    @GetMapping("/engineModelList")
+    public AjaxResult engineModelList(){return success(measEngineModelService.selectengineModelList());}
 }

meas-system/src/main/java/com/meas/system/controller/MeasSpectralRadiationController.java

@@ -1,19 +1,26 @@
 package com.meas.system.controller;
 
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import com.meas.common.annotation.Log;
 import com.meas.common.core.controller.BaseController;
 import com.meas.common.core.domain.AjaxResult;
-import com.meas.common.core.page.TableDataInfo;
 import com.meas.common.enums.BusinessType;
-import com.meas.common.utils.poi.ExcelUtil;
 import com.meas.system.domain.MeasSpectralRadiation;
 import com.meas.system.service.IMeasSpectralRadiationService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
+import com.meas.common.utils.poi.ExcelUtil;
+import com.meas.common.core.page.TableDataInfo;
 
 /**
  * 光谱辐射Controller

meas-system/src/main/java/com/meas/system/domain/MeasSpectralRadiation.java

@@ -71,7 +71,7 @@ public class MeasSpectralRadiation extends BaseEntity {
      * 增益
      */
     @Excel(name = "增益")
-    private Long gain;
+    private double gain;
 
     private Long radianceId;
 
@@ -232,11 +232,11 @@ public class MeasSpectralRadiation extends BaseEntity {
         this.lensFView = lensFView;
     }
 
-    public Long getGain() {
+    public double getGain() {
         return gain;
     }
 
-    public void setGain(Long gain) {
+    public void setGain(double gain) {
         this.gain = gain;
     }
 

meas-system/src/main/java/com/meas/system/domain/MeasSpectralRadiationRadiance.java

@@ -33,7 +33,7 @@ private static final long serialVersionUID = 1L;
 
         /** 光阑 */
                 @Excel(name = "光阑")
-        private BigDecimal gain;
+        private double gain;
 
         /** 标定温度 */
                 @Excel(name = "标定温度")
@@ -75,11 +75,11 @@ private static final long serialVersionUID = 1L;
         public BigDecimal getLensFView() {
             return lensFView;
         }
-        public void setGain(BigDecimal gain) {
+        public void setGain(double gain) {
             this.gain = gain;
         }
 
-        public BigDecimal getGain() {
+        public double getGain() {
             return gain;
         }
         public void setCalTemp(String calTemp) {

meas-system/src/main/java/com/meas/system/mapper/MeasBatchMapper.java

@@ -61,4 +61,6 @@ public interface MeasBatchMapper {
     public int deleteMeasBatchByIds(Long[] ids);
 
     List<Map> getOption(Long engineId);
+
+    List<MeasBatch> measurementBatchList();
 }

meas-system/src/main/java/com/meas/system/mapper/MeasEngineModelMapper.java

@@ -61,4 +61,6 @@ public interface MeasEngineModelMapper {
     public int deleteMeasEngineModelByIds(Long[] ids);
 
     List<Map> getOption();
+
+    List<Map> engineModelList();
 }

meas-system/src/main/java/com/meas/system/service/IMeasBatchService.java

@@ -62,4 +62,5 @@ public interface IMeasBatchService {
 
     List<Map> getOption(Long engineId);
 
+    List<MeasBatch> selectMeasurementBatchList();
 }

meas-system/src/main/java/com/meas/system/service/IMeasEngineModelService.java

@@ -61,4 +61,6 @@ public interface IMeasEngineModelService {
     public int deleteMeasEngineModelById(Long id);
 
     List<Map> getOption();
+
+    List<Map> selectengineModelList();
 }

meas-system/src/main/java/com/meas/system/service/impl/MeasBatchServiceImpl.java

@@ -93,4 +93,9 @@ public class MeasBatchServiceImpl implements IMeasBatchService {
     public List<Map> getOption(Long engineId) {
         return measBatchMapper.getOption(engineId);
     }
+
+    @Override
+    public List<MeasBatch> selectMeasurementBatchList() {
+        return measBatchMapper.measurementBatchList();
+    }
 }

meas-system/src/main/java/com/meas/system/service/impl/MeasEngineModelServiceImpl.java

@@ -93,4 +93,8 @@ public class MeasEngineModelServiceImpl implements IMeasEngineModelService {
     public List<Map> getOption() {
         return measEngineModelMapper.getOption();
     }
+    public List<Map> selectengineModelList() {
+        return measEngineModelMapper.engineModelList();
+    }
+
 }

meas-system/src/main/java/com/meas/system/service/impl/MeasSpectralRadiationServiceImpl.java

@@ -7,6 +7,7 @@ import com.meas.system.domain.MeasSpectralRadiationRadiance;
 import com.meas.system.mapper.MeasSpectralRadiationMapper;
 import com.meas.system.service.IMeasSpectralRadiationRadianceService;
 import com.meas.system.service.IMeasSpectralRadiationService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -58,13 +59,25 @@ public class MeasSpectralRadiationServiceImpl implements IMeasSpectralRadiationS
         measSpectralRadiation.setCreateTime(DateUtils.getNowDate());
 
         MeasSpectralRadiationRadiance measSpectralRadiationRadiance = new MeasSpectralRadiationRadiance();
-        BeanUtils.copyProperties(measSpectralRadiationRadiance, measSpectralRadiation);
+        BeanUtils.copyProperties(measSpectralRadiation, measSpectralRadiationRadiance);
         measSpectralRadiationRadiance.setId(null);
         MeasSpectralRadiationRadiance infoByCondition = measSpectralRadiationRadianceService.getInfoByCondition(measSpectralRadiationRadiance);
+        Long radianceId = null;
         if (infoByCondition == null) {
             measSpectralRadiationRadianceService.insertMeasSpectralRadiationRadiance(measSpectralRadiationRadiance);
+            radianceId = measSpectralRadiationRadiance.getId();
+        } else if(infoByCondition.getId() != null
+                && (!StringUtils.equals(measSpectralRadiationRadiance.getCalTemp(), infoByCondition.getCalTemp())
+                || !StringUtils.equals(measSpectralRadiationRadiance.getCalCurve(), infoByCondition.getCalCurve())
+                || !StringUtils.equals(measSpectralRadiationRadiance.getCalCurve2(), infoByCondition.getCalCurve2()))){
+            measSpectralRadiationRadiance.setId(infoByCondition.getId());
+            measSpectralRadiationRadianceService.updateMeasSpectralRadiationRadiance(measSpectralRadiationRadiance);
+            radianceId = infoByCondition.getId();
+        } else {
+            radianceId = infoByCondition.getId();
         }
-        measSpectralRadiation.setRadianceId(infoByCondition.getId());
+
+        measSpectralRadiation.setRadianceId(radianceId);
         measSpectralRadiation.setCalTemp("");
         measSpectralRadiation.setCalCurve("");
         measSpectralRadiation.setCalCurve2("");
@@ -85,6 +98,29 @@ public class MeasSpectralRadiationServiceImpl implements IMeasSpectralRadiationS
     @Override
     public int updateMeasSpectralRadiation(MeasSpectralRadiation measSpectralRadiation) {
         measSpectralRadiation.setUpdateTime(DateUtils.getNowDate());
+        MeasSpectralRadiationRadiance measSpectralRadiationRadiance = new MeasSpectralRadiationRadiance();
+        BeanUtils.copyProperties(measSpectralRadiation, measSpectralRadiationRadiance);
+        measSpectralRadiationRadiance.setId(null);
+        MeasSpectralRadiationRadiance infoByCondition = measSpectralRadiationRadianceService.getInfoByCondition(measSpectralRadiationRadiance);
+        Long radianceId = null;
+        if (infoByCondition == null) {
+            measSpectralRadiationRadianceService.insertMeasSpectralRadiationRadiance(measSpectralRadiationRadiance);
+            radianceId = measSpectralRadiationRadiance.getId();
+        } else if(infoByCondition.getId() != null
+                && (!StringUtils.equals(measSpectralRadiationRadiance.getCalTemp(), infoByCondition.getCalTemp())
+                || !StringUtils.equals(measSpectralRadiationRadiance.getCalCurve(), infoByCondition.getCalCurve())
+                || !StringUtils.equals(measSpectralRadiationRadiance.getCalCurve2(), infoByCondition.getCalCurve2()))){
+            measSpectralRadiationRadiance.setId(infoByCondition.getId());
+            measSpectralRadiationRadianceService.updateMeasSpectralRadiationRadiance(measSpectralRadiationRadiance);
+            radianceId = infoByCondition.getId();
+        } else {
+            radianceId = infoByCondition.getId();
+        }
+
+        measSpectralRadiation.setRadianceId(radianceId);
+        measSpectralRadiation.setCalTemp("");
+        measSpectralRadiation.setCalCurve("");
+        measSpectralRadiation.setCalCurve2("");
         return measSpectralRadiationMapper.updateMeasSpectralRadiation(measSpectralRadiation);
     }
 

meas-system/src/main/resources/mapper/meas/MeasBatchMapper.xml

@@ -96,4 +96,8 @@
     <select id="getOption" resultType="Map">
         select id,measurement_batch from meas_batch where engine_id = #{engineId} order by id asc
     </select>
+
+    <select id="measurementBatchList" resultType="Map">
+        select id,measurement_batch as label from meas_batch order by id asc
+    </select>
 </mapper>

meas-system/src/main/resources/mapper/meas/MeasDataResultsMapper.xml

@@ -51,8 +51,8 @@
     <select id="selectMeasDataResultsList" parameterType="MeasDataResults" resultMap="MeasDataResultsResult">
         <include refid="selectMeasDataResultsVo"/>
         <where>
-            <if test="measurementBatch != null  and measurementBatch != ''">and mb.measurement_batch = #{measurementBatch}</if>
-            <if test="engineModel != null  and engineModel != ''">and mem.model =
+            <if test="measurementBatch != null  and measurementBatch != ''">and mb.id = #{measurementBatch}</if>
+            <if test="engineModel != null  and engineModel != ''">and mem.id =
                 #{engineModel}
             </if>
             <if test="engineStatus != null  and engineStatus != ''">and med.engine_status = #{engineStatus}</if>
@@ -147,4 +147,16 @@
         <include refid="selectMeasDataResultsVo"/>
         where med.id = #{id}
     </select>
+    <!-- 获取所有测量批次 -->
+    <select id="selectMeasurementBatchList" resultType="com.meas.system.domain.MeasDataResults">
+        SELECT DISTINCT measurement_batch AS name, measurement_batch AS value
+        FROM meas_data_results
+    </select>
+
+    <!-- 获取所有发动机型号 -->
+    <select id="selectEngineModelList" resultType="com.meas.system.domain.MeasDataResults">
+        SELECT DISTINCT engine_model AS name, engine_model AS value
+        FROM meas_data_results
+    </select>
+
 </mapper>

meas-system/src/main/resources/mapper/meas/MeasEngineModelMapper.xml

@@ -87,4 +87,8 @@
     <select id="getOption" resultType="Map">
         select id,model from meas_engine_model order by id asc
     </select>
+    <select id="engineModelList" resultType="Map">
+        select id,model as label from meas_engine_model order by id asc
+    </select>
+
 </mapper>

meas-system/src/main/resources/mapper/meas/MeasSpectralRadiationMapper.xml

@@ -16,6 +16,7 @@
         <result property="model" column="model"/>
         <result property="lensFView" column="lens_f_view"/>
         <result property="gain" column="gain"/>
+        <result property="radianceId" column="radiance_id"/>
         <result property="backgroundData" column="background_data"/>
         <result property="calTemp" column="cal_temp"/>
         <result property="calCurve" column="cal_curve"/>
@@ -52,9 +53,10 @@
             msr.lens_f_view,
             msr.gain,
             msr.background_data,
-            msr.cal_temp,
-            msr.cal_curve,
-            msr.cal_curve2,
+            msr.radiance_id,
+            srr.cal_temp,
+            srr.cal_curve,
+            srr.cal_curve2,
             msr.raw_data,
             msr.radiance_1,
             msr.radiance_2,
@@ -76,6 +78,7 @@
         LEFT JOIN meas_spectral_radiation msr ON msr.measurement_batch_id = med.id
         LEFT JOIN meas_batch mb ON med.measurement_batch_id = mb.id
         LEFT JOIN meas_engine_model mem ON mb.engine_id = mem.id
+        LEFT JOIN meas_spectral_radiation_radiance srr ON srr.id = msr.radiance_id
     </sql>
 
     <select id="selectMeasSpectralRadiationList" parameterType="MeasSpectralRadiation"
@@ -94,10 +97,8 @@
             <if test="lensFView != null ">and lens_f_view = #{lensFView}</if>
             <if test="gain != null ">and gain = #{gain}</if>
             <if test="backgroundData != null  and backgroundData != ''">and background_data = #{backgroundData}</if>
-            <if test="calTemp != null ">and cal_temp = #{calTemp}</if>
-            <if test="calCurve != null  and calCurve != ''">and cal_curve = #{calCurve}</if>
-            <if test="calCurve2 != null  and calCurve2 != ''">and cal_curve2 = #{calCurve2}</if>
-            <if test="rawData != null  and rawData != ''">and raw_data = #{rawData}</if>
+            <if test="radianceId != null  and radianceId != ''">and radiance_id = #{radianceId}</if>
+            <if test="rawData != null and rawData != ''">and raw_data = #{rawData}</if>
             <if test="radiance1 != null  and radiance1 != ''">and radiance_1 = #{radiance1}</if>
             <if test="radiance2 != null  and radiance2 != ''">and radiance_2 = #{radiance2}</if>
             <if test="calTempEk != null  and calTempEk != ''">
@@ -163,9 +164,7 @@
             <if test="lensFView != null">lens_f_view,</if>
             <if test="gain != null">gain,</if>
             <if test="backgroundData != null">background_data,</if>
-            <if test="calTemp != null">cal_temp,</if>
-            <if test="calCurve != null">cal_curve,</if>
-            <if test="calCurve2 != null">cal_curve2,</if>
+            <if test="radianceId != null">radiance_id,</if>
             <if test="rawData != null">raw_data,</if>
             <if test="radiance1 != null">radiance_1,</if>
             <if test="radiance2 != null">radiance_2,</if>
@@ -190,9 +189,7 @@
             <if test="lensFView != null">#{lensFView},</if>
             <if test="gain != null">#{gain},</if>
             <if test="backgroundData != null">#{backgroundData},</if>
-            <if test="calTemp != null">#{calTemp},</if>
-            <if test="calCurve != null">#{calCurve},</if>
-            <if test="calCurve2 != null">#{calCurve2},</if>
+            <if test="radianceId != null">#{radianceId},</if>
             <if test="rawData != null">#{rawData},</if>
             <if test="radiance1 != null">#{radiance1},</if>
             <if test="radiance2 != null">#{radiance2},</if>
@@ -220,9 +217,7 @@
             <if test="lensFView != null">lens_f_view = #{lensFView},</if>
             <if test="gain != null">gain = #{gain},</if>
             <if test="backgroundData != null">background_data = #{backgroundData},</if>
-            <if test="calTemp != null">cal_temp = #{calTemp},</if>
-            <if test="calCurve != null">cal_curve = #{calCurve},</if>
-            <if test="calCurve2 != null">cal_curve2 = #{calCurve2},</if>
+            <if test="radianceId != null">radiance_id = #{radianceId},</if>
             <if test="rawData != null">raw_data = #{rawData},</if>
             <if test="radiance1 != null">radiance_1 = #{radiance1},</if>
             <if test="radiance2 != null">radiance_2 = #{radiance2},</if>

meas-system/src/main/resources/mapper/system/MeasSpectralRadiationRadianceMapper.xml

@@ -85,7 +85,8 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
                     <if test="id != null">#{id},
                     </if>
-                    <if test="measurementBatchId != null">#{measurementBatchId},
+                    <if test="measurementBatchId != null">
+                        (select measurement_batch_id from meas_env_data where id = #{measurementBatchId} limit 1),
                     </if>
                     <if test="model != null and model != ''">#{model},
                     </if>
@@ -114,7 +115,7 @@
         update meas_spectral_radiation_radiance
         <trim prefix="SET" suffixOverrides=",">
                     <if test="measurementBatchId != null">measurement_batch_id =
-                        #{measurementBatchId},
+                        (select measurement_batch_id from meas_env_data where id = #{measurementBatchId} limit 1),
                     </if>
                     <if test="model != null and model != ''">model =
                         #{model},
@@ -125,15 +126,9 @@
                     <if test="gain != null">gain =
                         #{gain},
                     </if>
-                    <if test="calTemp != null">cal_temp =
-                        #{calTemp},
-                    </if>
-                    <if test="calCurve != null">cal_curve =
-                        #{calCurve},
-                    </if>
-                    <if test="calCurve2 != null">cal_curve2 =
-                        #{calCurve2},
-                    </if>
+                    cal_temp = #{calTemp},
+                    cal_curve = #{calCurve},
+                    cal_curve2 = #{calCurve2},
                     <if test="createBy != null">create_by =
                         #{createBy},
                     </if>
@@ -166,7 +161,7 @@
             resultMap="MeasSpectralRadiationRadianceResult">
         <include refid="selectMeasSpectralRadiationRadianceVo"/>
         WHERE
-            measurement_batch_id = #{measurementBatchId}
+            measurement_batch_id = (select measurement_batch_id from meas_env_data where id = #{measurementBatchId} limit 1)
             AND model = #{model}
             AND lens_f_view = #{lensFView}
             AND gain = #{gain}

meas_web/src/api/meas/engineModel.js

@@ -49,3 +49,10 @@ export function delEngineModel(id) {
     method: 'delete'
   })
 }
+// 查询发动机型号
+export function getEngineModelList(){
+  return request({
+    url: '/meas/engineModel/engineModelList',
+    method: 'get'
+  })
+}

meas_web/src/api/meas/measBatch.js

@@ -51,3 +51,11 @@ export function getZipInfo(query) {
     params: query
   })
 }
+// 获取测量批次列表
+export function getMeasurementBatchList() {
+  return request({
+    url: '/meas/measBatch/measurementBatchList',
+    method: 'get'
+  });
+}
+

meas_web/src/views/meas/components/dialogContent.vue

@@ -162,9 +162,9 @@
           <el-form ref="radiationRef" :disabled="checkShow || addBtn" size="mini" :rules="radiationRules"
             :validate-on-rule-change="false" :model="radiationData" label-width="80px">
             <el-row type="flex" justify="space-around">
-              <el-form-item label="标定温度" prop="calTempEk">
+              <el-form-item label="标定温度" prop="calTemp">
                 <file-upload :isCheck="isCheck" :fileSize="0" :limit="5" :fileType="['Igm','rar','zip']"
-                  v-model="radiationData.calTempEk" />
+                  v-model="radiationData.calTemp" />
               </el-form-item>
               <el-form-item label="3 ~ 5μm 标定曲线" prop="calCurve">
                 <file-upload :isCheck="isCheck" :fileSize="0" :limit="5" :fileType="['txt']" :isShowViev="true"
@@ -211,64 +211,7 @@
         </div>
         <!-- lhp_end -->
 
-        <!-- <el-row type="flex" justify="space-around">
-          <el-form-item label="背景数据" prop="backgroundData">
-            <file-upload :isCheck="isCheck" :fileSize="0" :limit="1" :fileType="['Igm']"
-              v-model="radiationData.backgroundData" />
-          </el-form-item>
-          <el-form-item label="标定曲线" prop="calCurve">
-            <file-upload :isCheck="isCheck" :fileSize="0" :limit="5" :fileType="['txt']" :isShowViev="true"
-              v-model="radiationData.calCurve" v-on:fileView="fileView" />
-          </el-form-item>
-          <el-form-item>
-            <div style="width: 200px;"></div>
-          </el-form-item>
-        </el-row>
-        <el-row style="margin-left: 2%;" class="calTempTabel" type="flex">
-          <el-form-item label="标定温度" prop="calTemp">
-            <el-table :data="calTempData" size="mini" border style="width: 600px">
-              <el-table-column prop="temp" label="温度" width="100px" align="center">
-              </el-table-column>
-              <el-table-column prop="calTempFile" label="文件" align="center">
-                <template slot-scope="scope">
-                  <el-link @click="$download.resource(scope.row.calTempFile,false)"  :underline="false">
-                    <span class="el-icon-document"> {{ getFileName(scope.row.calTempFile) }} </span>
-                  </el-link>
-                </template>
-              </el-table-column>
-              <el-table-column label="操作" width="100px" align="center" class-name="small-padding fixed-width">
-                <template slot-scope="scope">
-                  <el-button size="mini" type="text" icon="el-icon-delete" @click="delCalTemp(scope.row)">删除</el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-form-item>
-          <el-form-item label="" label-width="10px">
-            <i style="font-size: 1.5rem;margin-top: 10px;" class="el-icon-circle-plus-outline" @click="addCalTemp"
-              v-if="!(checkShow || addBtn)"></i>
-          </el-form-item>
-        </el-row> -->
       </el-form>
-      <!-- <div class="box" style="margin-bottom: 15px">
-        <span class="title">目标数据</span>
-        <el-form ref="radiationRef" :disabled="checkShow || addBtn" size="mini" :rules="radiationRules"
-          :validate-on-rule-change="false" :model="radiationData" label-width="80px">
-          <el-row type="flex" justify="space-around">
-            <el-form-item label="原始数据" prop="rawData">
-              <file-upload :isCheck="isCheck" :fileSize="0" :limit="5" :fileType="['txt']"
-                v-model="radiationData.rawData" />
-            </el-form-item>
-            <el-form-item label="辐射亮度3~5μm" label-width="130px" prop="radiance1">
-              <file-upload :isCheck="isCheck" :fileSize="0" :limit="1" :fileType="['txt']"
-                v-model="radiationData.radiance1" :isShowViev="true" v-on:fileView="fileView" />
-            </el-form-item>
-            <el-form-item label="辐射亮度8~14μm" label-width="130px" prop="radiance2">
-              <file-upload :isCheck="isCheck" :fileSize="0" :limit="1" :fileType="['txt']"
-                v-model="radiationData.radiance2" :isShowViev="true" v-on:fileView="fileView" />
-            </el-form-item>
-          </el-row>
-        </el-form>
-      </div> -->
     </div>
     <div class="box" v-if="TIData && Object.keys(TIData).length > 0">
       <span class="title">热像仪测量数据</span>
@@ -658,7 +601,7 @@ export default {
         ],
         gain: [
           { required: true, message: '光阑不能为空' },
-          { required: true, pattern: /^(10\.0|([0-9]\.[0-9]))$/, message: '请输入0.0-10.0之间的数字,最多可保留一位小数', trigger: 'blur' }
+          { required: true, pattern: /^(([0-9](\.\d)?)|10(\.0)?)$/, message: '请输入0.0-10.0之间的数字,最多可保留一位小数', trigger: 'blur' }
         ],
 
       },
@@ -922,11 +865,11 @@ export default {
       this.calTempData = []
     },
     getcalTempData(val) {
-      if (val) {
-        this.calTempData = JSON.parse(val)
-      } else {
-        this.calTempData = []
-      }
+    //  if (val) {
+    //    this.calTempData = JSON.parse(val)
+    //  } else {
+    //    this.calTempData = []
+    //  }
     },
     handleCloseBeforeTI() {
       this.tempCalData = []
@@ -1058,7 +1001,7 @@ export default {
       this.validateAll()
         .then(() => {
           if (this.radiationForm) {
-            this.radiationForm.calTemp = this.calTempData.length > 0 ? JSON.stringify(this.calTempData) : null;
+           // this.radiationForm.calTemp = this.calTempData.length > 0 ? JSON.stringify(this.calTempData) : null;
             this.calTempData = []
           }
           if (this.TIData) {
@@ -1312,24 +1255,24 @@ export default {
       let lensFView = this.radiationData.lensFView
       let gain = this.radiationData.gain
       if( model || lensFView || gain ){
-        let data = {model,lensFView,gain}
+        let data = {'measurementBatchId':this.formData.measurementBatchId,model,lensFView,gain}
         getRadianceByCondition(data).then(response => {
           let _data = response.data
           if(_data){
             this.radiationData.radianceId = _data.id;
-            this.radiationData.calTempEk = _data.calTempEk;
+            this.radiationData.calTemp = _data.calTemp;
             this.radiationData.calCurve = _data.calCurve;
             this.radiationData.calCurve2 = _data.calCurve2;
           } else {
             this.radiationData.radianceId = null;
-            this.radiationData.calTempEk = '';
+            this.radiationData.calTemp = '';
             this.radiationData.calCurve = '';
             this.radiationData.calCurve2 = '';
           }
         })
       } else {
        this.radiationData.radianceId = null;
-       this.radiationData.calTempEk = '';
+       this.radiationData.calTemp = '';
        this.radiationData.calCurve = '';
        this.radiationData.calCurve2 = '';
      }

meas_web/src/views/meas/dataResults/index.vue

@@ -2,11 +2,14 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
       <el-form-item label="测量批次" prop="measurementBatch">
-        <el-input v-model="queryParams.measurementBatch" placeholder="请输入测量批次" clearable
-          @keyup.enter.native="handleQuery" />
+          <el-select v-model="queryParams.measurementBatch" placeholder="请选择测量批次" clearable>
+            <el-option v-for="item in measurementBatchOptions" :key="item.id" :label="item.label" :value="item.id" />
+          </el-select>
       </el-form-item>
-      <el-form-item label="发动机型号" prop="model">
-        <el-input v-model="queryParams.engineModel" placeholder="请输入发动机型号" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item label="发动机型号" prop="engineModel">
+        <el-select v-model="queryParams.engineModel" placeholder="请选择发动机型号" clearable>
+          <el-option v-for="item in engineModelOptions" :key="item.id" :label="item.label" :value="item.id" />
+        </el-select>
       </el-form-item>
       <el-form-item label="发动机状态" prop="engineStatus">
         <el-select v-model="queryParams.engineStatus" placeholder="请选择发动机状态" clearable>
@@ -46,7 +49,7 @@
         <el-tooltip style="margin: 4px;" effect="dark" content="正在开发中..." placement="bottom">
           <el-button type="danger" plain icon="el-icon-view" size="mini" :disabled="single" v-hasPermi="['meas:dataResults:edit']">波段可视化</el-button>
         </el-tooltip>
-        
+
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -93,7 +96,8 @@ import { angleOption } from "@/api/meas/angle";
 import { statusOption } from "@/api/meas/status";
 import dialogContent from "@/views/meas/components/dialogContent";
 import { getEnvData, updateEnvData, addEnvData } from "@/api/meas/envData";
-
+import { getMeasurementBatchList } from "@/api/meas/measBatch";
+import {getEngineModelList} from "@/api/meas/engineModel";
 export default {
   name: "DataResults",
   components: { dialogContent },
@@ -118,6 +122,8 @@ export default {
       // 是否显示弹出层
       open: false,
       // 查询参数
+      measurementBatchOptions: [],  // 测量批次选项
+      engineModelOptions: [],       // 发动机型号选项
       queryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -140,8 +146,24 @@ export default {
     this.getList();
     this.getAngleOption();
     this.getStatusOption();
+    this.getMeasurementBatchOptions();
+    this.getEngineModelOptions();
   },
   methods: {
+    getMeasurementBatchOptions() {
+      // 调用 API 获取测量批次列表
+      getMeasurementBatchList().then(response => {
+        this.measurementBatchOptions = response.data;
+      });
+    },
+
+    // 获取发动机型号选项
+    getEngineModelOptions() {
+    //  调用 API 获取发动机型号列表
+      getEngineModelList().then(response => {
+        this.engineModelOptions = response.data;
+      });
+    },
     /** 查询数据结果列表 */
     getList() {
       this.loading = true;
@@ -331,4 +353,4 @@ export default {
     font-size: 1rem;
   }
 }
-</style>
+</style>