update

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

@@ -130,6 +130,42 @@ public class MeasThermalImagerTestData extends BaseEntity {
     @Excel(name = "处理后数据")
     private String processedData;
 
+    /**
+     * 型号
+     */
+    @Excel(name = "型号2")
+    private String model2;
+
+    /**
+     * 镜头视场角
+     */
+    @Excel(name = "镜头视场角2")
+    private String lensFView2;
+
+    /**
+     * 焦距
+     */
+    @Excel(name = "焦距2")
+    private Double focalLength2;
+
+    /**
+     * 波段
+     */
+    @Excel(name = "波段2")
+    private String spectralBand2;
+
+    /**
+     * 原始数据
+     */
+    @Excel(name = "原始数据2")
+    private String rawData2;
+    /**
+     * 处理后数据
+     */
+    @Excel(name = "处理后数据2")
+    private String processedData2;
+
+
     public Long getId() {
         return id;
     }
@@ -298,6 +334,54 @@ public class MeasThermalImagerTestData extends BaseEntity {
         this.processedData = processedData;
     }
 
+    public String getModel2() {
+        return model2;
+    }
+
+    public void setModel2(String model2) {
+        this.model2 = model2;
+    }
+
+    public String getLensFView2() {
+        return lensFView2;
+    }
+
+    public void setLensFView2(String lensFView2) {
+        this.lensFView2 = lensFView2;
+    }
+
+    public Double getFocalLength2() {
+        return focalLength2;
+    }
+
+    public void setFocalLength2(Double focalLength2) {
+        this.focalLength2 = focalLength2;
+    }
+
+    public String getSpectralBand2() {
+        return spectralBand2;
+    }
+
+    public void setSpectralBand2(String spectralBand2) {
+        this.spectralBand2 = spectralBand2;
+    }
+
+    public String getRawData2() {
+        return rawData2;
+    }
+
+    public void setRawData2(String rawData2) {
+        this.rawData2 = rawData2;
+    }
+
+    public String getProcessedData2() {
+        return processedData2;
+    }
+
+    public void setProcessedData2(String processedData2) {
+        this.processedData2 = processedData2;
+    }
+
     @Override
     public String toString() {
         return "MeasThermalImagerTestData{" +
@@ -322,6 +406,12 @@ public class MeasThermalImagerTestData extends BaseEntity {
                 ", focalLength=" + focalLength +
                 ", rawData='" + rawData + '\'' +
                 ", processedData='" + processedData + '\'' +
+                ", model2='" + model2 + '\'' +
+                ", lensFView2='" + lensFView2 + '\'' +
+                ", focalLength2=" + focalLength2 +
+                ", spectralBand2='" + spectralBand2 + '\'' +
+                ", rawData2='" + rawData2 + '\'' +
+                ", processedData2='" + processedData2 + '\'' +
                 '}';
     }
 }

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

@@ -26,6 +26,12 @@
         <result property="focalLength" column="focal_length"/>
         <result property="rawData" column="raw_data"/>
         <result property="processedData" column="processed_data"/>
+        <result property="model2" column="model2"/>
+        <result property="lensFView2" column="lens_f_view2"/>
+        <result property="focalLength2" column="focal_length2"/>
+        <result property="spectralBand2" column="spectral_band2"/>
+        <result property="rawData2" column="raw_data2"/>
+        <result property="processedData2" column="processed_data2"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -55,6 +61,12 @@
             mtitd.focal_length,
             mtitd.raw_data,
             mtitd.processed_data,
+            mtitd.model2,
+            mtitd.lens_f_view2,
+            mtitd.spectral_band2,
+            mtitd.focal_length2,
+            mtitd.raw_data2,
+            mtitd.processed_data2,
             mtitd.create_by,
             mtitd.create_time,
             mtitd.update_by,
@@ -114,6 +126,12 @@
             <if test="focalLength != null">focal_length,</if>
             <if test="rawData != null">raw_data,</if>
             <if test="processedData != null">processed_data,</if>
+            <if test="model2 != null">model2,</if>
+            <if test="lensFView2 != null">lens_f_view2,</if>
+            <if test="focalLength2 != null">focal_length2,</if>
+            <if test="spectralBand2 != null">spectral_band2,</if>
+            <if test="rawData2 != null">raw_data2,</if>
+            <if test="processedData2 != null">processed_data2,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -135,6 +153,13 @@
             <if test="focalLength != null">#{focalLength},</if>
             <if test="rawData != null">#{rawData},</if>
             <if test="processedData != null">#{processedData},</if>
+
+            <if test="model2 != null">#{model2},</if>
+            <if test="lensFView2 != null">#{lensFView2},</if>
+            <if test="focalLength2 != null">#{focalLength2},</if>
+            <if test="spectralBand2 != null">#{spectralBand2},</if>
+            <if test="rawData2 != null">#{rawData2},</if>
+            <if test="processedData2 != null">#{processedData2},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -159,6 +184,13 @@
             <if test="focalLength != null">focal_length = #{focalLength},</if>
             <if test="rawData != null">raw_data = #{rawData},</if>
             <if test="processedData != null">processed_data = #{processedData},</if>
+
+            <if test="model2 != null">model2 = #{model2},</if>
+            <if test="lensFView2 != null">lens_f_view2 = #{lensFView2},</if>
+            <if test="spectralBand2 != null">spectral_band2 = #{spectralBand2},</if>
+            <if test="focalLength2 != null">focal_length2 = #{focalLength2},</if>
+            <if test="rawData2 != null">raw_data2 = #{rawData2},</if>
+            <if test="processedData2 != null">processed_data2 = #{processedData2},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>

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

@@ -223,15 +223,15 @@
           </el-form-item>
           <el-form-item label="镜头视场角" label-width="95px" prop="lensFView">
             <el-input v-model="TIData.lensFView" placeholder="请输入镜头视场角"><template
-                slot="append">mrad</template></el-input>
+                slot="append">°</template></el-input>
           </el-form-item>
           <el-form-item label="焦距" prop="focalLength">
-            <el-input v-model="TIData.focalLength" placeholder="请输入焦距" />
+            <el-input v-model="TIData.focalLength" placeholder="请输入焦距" ><template slot="append">mm</template></el-input>
           </el-form-item>
         </el-row>
         <el-row type="flex" justify="space-around">
           <el-form-item label="波段" prop="spectralBand">
-            <el-input v-model="TIData.spectralBand" placeholder="请选择波段" />
+            <el-input v-model="TIData.spectralBand" placeholder="请选择波段"><template slot="append">μm</template></el-input>
           </el-form-item>
         <el-form-item label="原始数据" prop="rawData">
           <file-upload :isCheck="isCheck" :fileSize="0" :limit="1" :fileType="['rar','zip']" v-model="TIData.rawData"/>
@@ -240,6 +240,29 @@
           <file-upload :isCheck="isCheck" :fileSize="0" :limit="1" :fileType="['rar','zip','txt','csv']" v-model="TIData.processedData"/>
         </el-form-item>
         </el-row>
+        <el-row type="flex" justify="space-around">
+          <el-form-item label="型号" prop="model2">
+            <el-input v-model="TIData.model2" placeholder="请输入型号" />
+          </el-form-item>
+          <el-form-item label="镜头视场角" label-width="95px" prop="lensFView2">
+            <el-input v-model="TIData.lensFView2" placeholder="请输入镜头视场角"><template
+                slot="append">°</template></el-input>
+          </el-form-item>
+          <el-form-item label="焦距" prop="focalLength2">
+            <el-input v-model="TIData.focalLength2" placeholder="请输入焦距"><template slot="append">mm</template></el-input>
+          </el-form-item>
+        </el-row>
+        <el-row type="flex" justify="space-around">
+          <el-form-item label="波段" prop="spectralBand2">
+            <el-input v-model="TIData.spectralBand2" placeholder="请选择波段" ><template slot="append">μm</template></el-input>
+          </el-form-item>
+        <el-form-item label="原始数据" prop="rawData2">
+          <file-upload :isCheck="isCheck" :fileSize="0" :limit="1" :fileType="['rar','zip']" v-model="TIData.rawData2"/>
+        </el-form-item>
+        <el-form-item label="处理后数据" prop="processedData2">
+          <file-upload :isCheck="isCheck" :fileSize="0" :limit="1" :fileType="['rar','zip','txt','csv']" v-model="TIData.processedData2"/>
+        </el-form-item>
+        </el-row>
         <!-- <el-row type="flex" justify="space-around">
           <el-form-item label="辐射温度" prop="radTemp">
             <file-upload :isCheck="isCheck" :fileSize="0" :limit="1" :fileType="['zip']" v-model="TIData.radTemp"

sql/measupdate20250712-2.sql

@@ -0,0 +1,7 @@
+ALTER TABLE `meas`.`meas_thermal_imager_test_data`
+ADD COLUMN `model2` varchar(255) NULL COMMENT '模型2' AFTER `processed_data`,
+ADD COLUMN `lens_f_view2` varchar(255) NULL COMMENT '镜头视场角2' AFTER `model2`,
+ADD COLUMN `focal_length2` double(11, 2) NULL COMMENT '焦距2' AFTER `lens_f_view2`,
+ADD COLUMN `spectral_band2` varchar(255) NULL COMMENT '波段2' AFTER `focal_length2`,
+ADD COLUMN `raw_data2` varchar(255) NULL COMMENT '原始数据2' AFTER `spectral_band2`,
+ADD COLUMN `processed_data2` varchar(255) NULL COMMENT '处理后数据2' AFTER `raw_data2`;