update

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

@@ -100,4 +100,8 @@ public class MeasStatusController extends BaseController {
     public AjaxResult getOption(){
         return success(measStatusService.getOption());
     }
+    //获取状态
+
+    @GetMapping("/selectstatusOption")
+    public AjaxResult statusOption(){return success(measStatusService.selectstatusOption());}
 }

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

@@ -1,6 +1,7 @@
 package com.meas.system.mapper;
 
 import java.util.List;
+import java.util.Map;
 
 import com.meas.system.domain.MeasStatus;
 
@@ -60,4 +61,7 @@ public interface MeasStatusMapper {
     public int deleteMeasStatusByIds(Long[] ids);
 
     List<String> getOption();
+    List<Map> statusOption();
+
+
 }

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

@@ -1,6 +1,7 @@
 package com.meas.system.service;
 
 import java.util.List;
+import java.util.Map;
 
 import com.meas.system.domain .MeasStatus;
 
@@ -60,4 +61,7 @@ public interface IMeasStatusService {
     public int deleteMeasStatusById(Long id);
 
     List<String> getOption();
+
+    List<Map> selectstatusOption();
+
 }

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

@@ -1,7 +1,9 @@
 package com.meas.system.service.impl;
 
 import java.util.List;
-        import com.meas.common.utils.DateUtils;
+import java.util.Map;
+
+import com.meas.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.meas.system.mapper.MeasStatusMapper;
@@ -91,4 +93,8 @@ public class MeasStatusServiceImpl implements IMeasStatusService {
     public List<String> getOption() {
         return measStatusMapper.getOption();
     }
+    public List<Map> selectstatusOption() {
+        return measStatusMapper.statusOption();
+    }
+
 }

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

@@ -33,10 +33,8 @@
     <select id="selectMeasBatchList" parameterType="MeasBatch" resultMap="MeasBatchResult">
         <include refid="selectMeasBatchVo"/>
         <where>
-            <if test="engineId != null ">and mb.engine_id = #{engineId}</if>
-            <if test="engineModel != null ">and mem.model = #{engineModel}</if>
-            <if test="measurementBatch != null  and measurementBatch != ''">and mb.measurement_batch =
-                #{measurementBatch}
+            <if test="engineModel != null ">and mb.engine_id = #{engineModel}</if>
+            <if test="measurementBatch != null  and measurementBatch != ''">and mb.id = #{measurementBatch}
             </if>
         </where>
         order by mb.create_time desc

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

@@ -110,4 +110,8 @@
     <select id="getOption" resultType="String">
         select status from meas_status order by `index` asc
     </select>
+    <select id="statusOption" resultType="Map">
+        select status as id,status as label from meas_status order by id asc
+    </select>
+
 </mapper>

meas_web/src/api/meas/status.js

@@ -48,5 +48,14 @@ export function delStatus(id) {
   return request({
     url: "/meas/status/" + id,
     method: "delete",
-  });
-}
+  });}
+  //查询状态
+  export function getStatusOptions() {
+    return request({
+      url: "/meas/status/selectstatusOption",
+      method: "get",
+    });
+
+
+  }
+

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

@@ -9,12 +9,10 @@
       label-width="68px"
     >
       <el-form-item label="角度" prop="angle">
-        <el-input
-          v-model="queryParams.angle"
-          placeholder="请输入角度"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+
+        <el-select v-model="queryParams.angle" placeholder="请选择角度" clearable>
+          <el-option v-for="item in angleOptions" :key="item" :label="item" :value="item" />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button
@@ -148,6 +146,7 @@ import {
   updateAngle,
   delAngle,
 } from "@/api/meas/angle";
+import { angleOption } from "@/api/meas/angle";
 
 export default {
   name: "Angle",
@@ -171,6 +170,8 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      // 发动机角度
+      angleOptions: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -193,6 +194,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getAngleOption();
   },
   methods: {
     /** 查询角度列表 */
@@ -204,6 +206,13 @@ export default {
         this.loading = false;
       });
     },
+    getAngleOption() {
+      this.loading = true;
+      angleOption().then((response) => {
+        this.angleOptions = response.data;
+        this.loading = false;
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;

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

@@ -40,10 +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-button type="primary" plain size="mini" @click="handleDui"
-                   v-hasPermi="['meas:dataResults:edit']">数据对比</el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -91,7 +87,6 @@ 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";
-import router from "@/router";
 export default {
   name: "DataResults",
   components: { dialogContent },
@@ -327,10 +322,6 @@ export default {
         `dataResults_${new Date().getTime()}.xlsx`
       );
     },
-    /** 数据对比操作 */
-    handleDui() {
-      router.push('/meas/env/data');
-    },
   },
 };
 </script>

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

@@ -2,12 +2,9 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px" @submit.native.prevent>
       <el-form-item label="发动机型号" prop="model">
-        <el-input
-          v-model="queryParams.model"
-          placeholder="请输入发动机型号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.model" placeholder="请选择发动机型号" clearable @keyup.enter.native="handleQuery">
+          <el-option v-for="item in engineModelOptions" :key="item.id" :label="item.label" :value="item.label" />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -108,7 +105,10 @@
     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open"  width="500px" append-to-body>
       <el-form ref="form" :model="form" :disabled="isCheck" :rules="rules" label-width="100px">
         <el-form-item label="发动机型号" prop="model">
-          <el-input v-model="form.model" placeholder="请输入发动机型号" />
+<!--          <el-input v-model="form.model" placeholder="请输入发动机型号" />-->
+          <el-select v-model="form.model" 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="geometryFiles">
           <file-upload :fileSize="0" :limit="1" :fileType="['x_t', 'str', 'rar', 'zip']" v-model="form.geometryFiles"/>
@@ -127,6 +127,7 @@
 
 <script>
 import { listEngineModel, getEngineModel, delEngineModel, addEngineModel, updateEngineModel } from "@/api/meas/engineModel";
+import {getEngineModelList} from "@/api/meas/engineModel";
 
 export default {
   name: "EngineModel",
@@ -150,6 +151,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      engineModelOptions: [],       // 发动机型号选项
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -170,8 +172,16 @@ export default {
   },
   created() {
     this.getList();
+    this.getEngineModelOptions();
   },
   methods: {
+    // 获取发动机型号选项
+    getEngineModelOptions() {
+      //  调用 API 获取发动机型号列表
+      getEngineModelList().then(response => {
+        this.engineModelOptions = response.data;
+      });
+    },
     /** 查询发动机型号列表 */
     getList() {
       this.loading = true;

meas_web/src/views/meas/env/data.vue

@@ -6,9 +6,10 @@
           <el-radio-group v-model="contrastType">
             <el-radio :label="1">中波光谱辐射强度</el-radio>
             <el-radio :label="2">长波光谱辐射强度</el-radio>
+            <el-radio :label="3">光谱辐射计算后数据3~5</el-radio>
+            <el-radio :label="4">光谱辐射计算后数据8~14</el-radio>
             <el-radio :label="5">中波透过率曲线</el-radio>
             <el-radio :label="6">长波透过率曲线</el-radio>
-            <el-radio :label="7">角度辐射强度</el-radio>
           </el-radio-group>
         </el-form-item>
         <div class="mod-bd" style="float: right;padding-bottom: 10px;">
@@ -25,12 +26,14 @@
         <div class="panel-bd">
           <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
             <el-form-item label="测量批次" prop="measurementBatch" label-width="90px">
-              <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="engineModel" label-width="90px">
-              <el-input v-model="queryParams.engineModel" placeholder="请输入发动机型号" clearable
-                        @keyup.enter.native="handleQuery" />
+              <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" label-width="90px">
               <el-select v-model="queryParams.engineStatus" placeholder="请选择发动机状态" clearable>
@@ -104,6 +107,8 @@ import { statusOption } from '@/api/meas/status'
 import { angleOption } from '@/api/meas/angle'
 import { compareData, listEnvData } from '@/api/meas/envData'
 import ECharts from './ECharts.vue'
+import { getMeasurementBatchList } from "@/api/meas/measBatch";
+import {getEngineModelList} from "@/api/meas/engineModel";
 
 export default {
   components: { ECharts },
@@ -138,6 +143,8 @@ export default {
       // 发动机角度
       angleOptions: [],
       contrastType: 1,
+      measurementBatchOptions: [],  // 测量批次选项
+      engineModelOptions: [],       // 发动机型号选项
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -156,8 +163,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;
+      });
+    },
     // 获取状态Option
     getStatusOption() {
       this.loading = true;
@@ -230,6 +253,7 @@ export default {
         this.$modal.msgWarning("数据最多可对比20条！");
       }
     },
+
     /** 查询测量环境数据列表 */
     getList() {
       this.loading = true;

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

@@ -30,12 +30,14 @@
       <el-col :span="20" :xs="24" class="table">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
           <el-form-item label="测量批次" prop="measurementBatch" label-width="90px">
-            <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="engineModel" label-width="90px">
-            <el-input v-model="queryParams.engineModel" placeholder="请输入发动机型号" clearable
-              @keyup.enter.native="handleQuery" />
+            <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" label-width="90px">
             <el-select v-model="queryParams.engineStatus" placeholder="请选择发动机状态" clearable>
@@ -70,6 +72,10 @@
             <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
               v-hasPermi="['meas:envData:export']">导出</el-button>
           </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" plain size="mini" @click="handleDui"
+                       v-hasPermi="['meas:envData:edit']">数据对比</el-button>
+          </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
@@ -139,6 +145,8 @@ import { angleOption } from "@/api/meas/angle";
 import { statusOption } from "@/api/meas/status";
 import router from "@/router";
 import dialogContent from "@/views/meas/components/dialogContent";
+import { getMeasurementBatchList } from "@/api/meas/measBatch";
+import {getEngineModelList} from "@/api/meas/engineModel";
 
 export default {
   name: "EnvData",
@@ -163,6 +171,8 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      measurementBatchOptions: [],  // 测量批次选项
+      engineModelOptions: [],       // 发动机型号选项
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -220,8 +230,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;
+      });
+    },
     handleEnter() {
       console.log('回车键被按下了');
       console.log(this.measurementBatch);
@@ -338,7 +364,7 @@ export default {
         updateTime: null,
         remark: null,
         id: null,
-        measurementBatchId: null,
+        // measurementBatchId: null,
         measurementBatch: null,
         engineModel: null,
         geometryFiles: null,

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

@@ -9,20 +9,14 @@
       label-width="68px"
     >
       <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="发动机型号" label-width="100px" prop="engineModel">
-        <el-input
-          v-model="queryParams.engineModel"
-          placeholder="请输入发动机型号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <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>
         <el-button
@@ -200,7 +194,8 @@ import {
   updateMeasBatch,
 } from "@/api/meas/measBatch";
 import { listEngineModel } from "@/api/meas/engineModel";
-
+import {getEngineModelList} from "@/api/meas/engineModel";
+import { getMeasurementBatchList } from "@/api/meas/measBatch";
 export default {
   name: "MeasBatch",
   data() {
@@ -223,6 +218,8 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      measurementBatchOptions: [],  // 测量批次选项
+      engineModelOptions: [],       // 发动机型号选项
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -252,8 +249,25 @@ export default {
   },
   created() {
     this.getList();
+    this.getEngineModelOptions();
+    this.getMeasurementBatchOptions();
+
   },
   methods: {
+    getMeasurementBatchOptions() {
+      // 调用 API 获取测量批次列表
+      getMeasurementBatchList().then(response => {
+        this.measurementBatchOptions = response.data;
+      });
+    },
+
+    // 获取发动机型号选项
+    getEngineModelOptions() {
+      //  调用 API 获取发动机型号列表
+      getEngineModelList().then(response => {
+        this.engineModelOptions = response.data;
+      });
+    },
     /** 查询测量批次列表 */
     getList() {
       this.loading = true;

meas_web/src/views/meas/radiation/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="engineModel">
-        <el-input v-model="queryParams.engineModel" placeholder="请输入发动机型号" clearable @keyup.enter.native="handleQuery" />
+        <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>
@@ -78,6 +81,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: "Radiation",
@@ -102,6 +107,9 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+
+      measurementBatchOptions: [],  // 测量批次选项
+      engineModelOptions: [],       // 发动机型号选项
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -110,6 +118,7 @@ export default {
         engineModel: null,
         engineStatus: null,
         angle: null,
+
       },
       // 表单参数
       form: {},
@@ -125,8 +134,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;

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

@@ -9,21 +9,17 @@
       label-width="68px"
     >
       <el-form-item label="状态" prop="status">
-        <el-input
-          v-model="queryParams.status"
-          placeholder="请输入状态"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="排序" prop="index">
-        <el-input
-          v-model="queryParams.index"
-          placeholder="请输入排序"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
+          <el-option v-for="item in statusOptions" :key="item.id" :label="item.label" :value="item.id" />
+        </el-select>
       </el-form-item>
+<!--      <el-form-item label="排序" prop="index">-->
+
+<!--        <el-select v-model="queryParams.index" placeholder="请选择排序" clearable>-->
+<!--          <el-option v-for="item in indexOptions" :key="item.id" :label="item.label" :value="item.id" />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item>
         <el-button
           type="primary"
@@ -135,11 +131,12 @@
     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="状态" prop="status">
-          <el-input v-model="form.status" placeholder="请输入状态" />
-        </el-form-item>
-        <el-form-item label="排序" prop="index">
-          <el-input v-model="form.index" placeholder="请输入排序" />
+          <el-select v-model="form.status" placeholder="请选择状态" clearable>
+            <el-option v-for="item in statusOptions" :key="item.id" :label="item.label" :value="item.id" />
+          </el-select>
+
         </el-form-item>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -157,6 +154,7 @@ import {
   updateStatus,
   delStatus,
 } from "@/api/meas/status";
+import {getStatusOptions} from "@/api/meas/status";
 
 export default {
   name: "Status",
@@ -180,6 +178,8 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      statusOptions:[],
+      indexOptions:[],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -210,8 +210,17 @@ export default {
   },
   created() {
     this.getList();
+    this.getStatusOptions();
+
   },
   methods: {
+    // 获取状态选项
+    getStatusOptions(){
+      getStatusOptions().then(response =>{
+        this.statusOptions = response.data;
+      });
+    },
+
     /** 查询状态列表 */
     getList() {
       this.loading = true;

meas_web/src/views/meas/thermalImagerTesDdata/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="engineModel">
-        <el-input v-model="queryParams.engineModel" placeholder="请输入发动机型号" clearable @keyup.enter.native="handleQuery" />
+        <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>
@@ -114,6 +117,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: "ThermalImagerTesDdata",
@@ -138,6 +143,8 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      measurementBatchOptions: [],  // 测量批次选项
+      engineModelOptions: [],       // 发动机型号选项
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -161,8 +168,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;

meas_web/src/views/meas/transmissionRate/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="engineModel">
-        <el-input v-model="queryParams.engineModel" placeholder="请输入发动机型号" clearable @keyup.enter.native="handleQuery" />
+        <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>
@@ -100,6 +103,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: "TransmissionRate",
@@ -124,6 +129,8 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      measurementBatchOptions: [],  // 测量批次选项
+      engineModelOptions: [],       // 发动机型号选项
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -147,8 +154,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;