update

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

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

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

@@ -114,6 +114,21 @@ public class MeasThermalImagerTestData extends BaseEntity {
      */
     @Excel(name = "辐射温度")
     private String radTemp;
+    /**
+     * 焦距
+     */
+    @Excel(name = "焦距")
+    private Double focalLength;
+    /**
+     * 原始数据
+     */
+    @Excel(name = "原始数据")
+    private String rawData;
+    /**
+     * 处理后数据
+     */
+    @Excel(name = "处理后数据")
+    private String processedData;
 
     public Long getId() {
         return id;
@@ -259,6 +274,30 @@ public class MeasThermalImagerTestData extends BaseEntity {
         this.radTemp = radTemp;
     }
 
+    public Double getFocalLength() {
+        return focalLength;
+    }
+
+    public void setFocalLength(Double focalLength) {
+        this.focalLength = focalLength;
+    }
+
+    public String getRawData() {
+        return rawData;
+    }
+
+    public void setRawData(String rawData) {
+        this.rawData = rawData;
+    }
+
+    public String getProcessedData() {
+        return processedData;
+    }
+
+    public void setProcessedData(String processedData) {
+        this.processedData = processedData;
+    }
+
     @Override
     public String toString() {
         return "MeasThermalImagerTestData{" +
@@ -280,6 +319,9 @@ public class MeasThermalImagerTestData extends BaseEntity {
                 ", radiance='" + radiance + '\'' +
                 ", radIllumination='" + radIllumination + '\'' +
                 ", radTemp='" + radTemp + '\'' +
+                ", focalLength=" + focalLength +
+                ", rawData='" + rawData + '\'' +
+                ", processedData='" + processedData + '\'' +
                 '}';
     }
 }

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

@@ -95,7 +95,7 @@
             <if test="measurementBatchId != null ">and measurement_batch_id = #{measurementBatchId}</if>
             <if test="model != null  and model != ''">and msr.model = #{model}</if>
             <if test="lensFView != null ">and lens_f_view = #{lensFView}</if>
-            <if test="gain != null ">and gain = #{gain}</if>
+            <if test="gain != null ">and msr.gain = #{gain}</if>
             <if test="backgroundData != null  and backgroundData != ''">and background_data = #{backgroundData}</if>
             <if test="radianceId != null  and radianceId != ''">and radiance_id = #{radianceId}</if>
             <if test="rawData != null and rawData != ''">and raw_data = #{rawData}</if>

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

@@ -23,6 +23,9 @@
         <result property="radiance" column="radiance"/>
         <result property="radIllumination" column="rad_illumination"/>
         <result property="radTemp" column="rad_temp"/>
+        <result property="focalLength" column="focal_length"/>
+        <result property="rawData" column="raw_data"/>
+        <result property="processedData" column="processed_data"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -49,6 +52,9 @@
             mtitd.radiance,
             mtitd.rad_illumination,
             mtitd.rad_temp,
+            mtitd.focal_length,
+            mtitd.raw_data,
+            mtitd.processed_data,
             mtitd.create_by,
             mtitd.create_time,
             mtitd.update_by,
@@ -105,6 +111,9 @@
             <if test="radiance != null">radiance,</if>
             <if test="radIllumination != null">rad_illumination,</if>
             <if test="radTemp != null">rad_temp,</if>
+            <if test="focalLength != null">focal_length,</if>
+            <if test="rawData != null">raw_data,</if>
+            <if test="processedData != null">processed_data,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -123,6 +132,9 @@
             <if test="radiance != null">#{radiance},</if>
             <if test="radIllumination != null">#{radIllumination},</if>
             <if test="radTemp != null">#{radTemp},</if>
+            <if test="focalLength != null">#{focalLength},</if>
+            <if test="rawData != null">#{rawData},</if>
+            <if test="processedData != null">#{processedData},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -144,6 +156,9 @@
             <if test="radiance != null">radiance = #{radiance},</if>
             <if test="radIllumination != null">rad_illumination = #{radIllumination},</if>
             <if test="radTemp != null">rad_temp = #{radTemp},</if>
+            <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="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

@@ -225,66 +225,20 @@
             <el-input v-model="TIData.lensFView" placeholder="请输入镜头视场角"><template
                 slot="append">mrad</template></el-input>
           </el-form-item>
-          <el-form-item label="滤镜编号" prop="filterNo">
-            <el-input v-model="TIData.filterNo" placeholder="请选择滤镜编号" />
+          <el-form-item label="焦距" prop="focalLength">
+            <el-input v-model="TIData.focalLength" placeholder="请输入焦距" />
           </el-form-item>
         </el-row>
         <el-row type="flex" justify="space-around">
-          <el-form-item label="帧率" prop="fps">
-            <el-input v-model="TIData.fps" placeholder="请选择帧率" />
-          </el-form-item>
           <el-form-item label="波段" prop="spectralBand">
             <el-input v-model="TIData.spectralBand" placeholder="请选择波段" />
           </el-form-item>
-          <el-form-item label="积分时间" prop="integrationTime">
-            <el-input v-model.number="TIData.integrationTime" placeholder="请输入积分时间"><template
-                slot="append">ms</template></el-input>
-          </el-form-item>
-        </el-row>
-
-        <el-row style="margin-left: 2%;" class="calTempTabel" type="flex">
-          <el-form-item label="温度标定" prop="tempCal">
-            <el-table :data="tempCalData" size="mini" border style="width: 600px">
-              <el-table-column prop="temp" label="温度" width="100px" align="center">
-              </el-table-column>
-              <el-table-column prop="tempCalFile" label="文件" align="center">
-                <template slot-scope="scope">
-                  <el-link @click="$download.resource(scope.row.tempCalFile,false)"  :underline="false">
-                    <span class="el-icon-document"> {{ getFileName(scope.row.tempCalFile) }} </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="delTempCal(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="addTempCal"
-              v-if="!(checkShow || addBtn)"></i>
-          </el-form-item>
-        </el-row>
-
-        <el-row type="flex" justify="space-around">
-          <!-- <el-form-item label="温度标定" prop="tempCal">
-            <file-upload :isCheck="isCheck" :fileSize="0" :limit="1" :fileType="['txt']" v-model="TIData.tempCal" />
-          </el-form-item> -->
-          <el-form-item label="辐射亮度" prop="radiance">
-            <file-upload :isCheck="isCheck" :fileSize="0" :limit="1" :fileType="['zip']" v-model="TIData.radiance"
-              :isShowViev="true" v-on:fileView="fileViewZipL" />
-          </el-form-item>
-          <el-form-item label="辐射照度" prop="radIllumination">
-            <file-upload :isCheck="isCheck" :fileSize="0" :limit="1" :fileType="['zip']"
-              v-model="TIData.radIllumination"
-              :isShowViev="true"
-              v-on:fileView="fileViewZipZ" />
-          </el-form-item>
-          <el-form-item label="辐射温度" prop="radTemp">
-            <file-upload :isCheck="isCheck" :fileSize="0" :limit="1" :fileType="['zip']" v-model="TIData.radTemp"
-              :isShowViev="true" v-on:fileView="fileViewZipW" />
-          </el-form-item>
+        <el-form-item label="原始数据" prop="rawData">
+          <file-upload :isCheck="isCheck" :fileSize="0" :limit="1" :fileType="['rar','zip']" v-model="TIData.rawData"/>
+        </el-form-item>
+        <el-form-item label="处理后数据" prop="processedData">
+          <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="radTemp">

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

@@ -40,17 +40,6 @@
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
           v-hasPermi="['meas:dataResults:export']">导出</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-tooltip style="margin: 4px;" effect="dark" content="正在开发中..." placement="bottom">
-          <el-button type="primary" plain icon="el-icon-view" size="mini" :disabled="single" v-hasPermi="['meas:dataResults:edit']">光谱可视化</el-button>
-        </el-tooltip>
-      </el-col>
-      <el-col :span="1.5">
-        <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>
 

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

@@ -48,7 +48,7 @@
       <el-table-column label="发动机角度" align="center" prop="angle" />
       <el-table-column label="型号" align="center" prop="engineModel" />
       <el-table-column label="镜头视场角" align="center" prop="lensFView" />
-      <el-table-column label="增益" align="center" prop="gain" />
+      <el-table-column label="光阑" align="center" prop="gain" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" v-hasPermi="['meas:envData:edit']"

sql/measupdate20250712.sql

@@ -0,0 +1,7 @@
+ALTER TABLE `meas`.`meas_spectral_radiation`
+MODIFY COLUMN `gain` double(5, 1) NOT NULL COMMENT '增益' AFTER `lens_f_view`;
+
+ALTER TABLE `meas`.`meas_thermal_imager_test_data`
+ADD COLUMN `focal_length` double(11, 2) NULL COMMENT '焦距' AFTER `rad_temp`,
+ADD COLUMN `raw_data` varchar(255) NULL COMMENT '原始数据' AFTER `focal_length`,
+ADD COLUMN `processed_data` varchar(255) NULL COMMENT '处理后数据' AFTER `raw_data`;