测量环境数据、数据结果接口和样式

meas_web/src/api/meas/angle.js

@@ -9,6 +9,14 @@ export function listAngle(query) {
   });
 }
 
+// 查询角度下拉框
+export function angleOption() {
+  return request({
+    url: "/meas/angle/getOption",
+    method: "get"
+  });
+}
+
 // 查询角度详细
 export function getAngle(id) {
   return request({

meas_web/src/api/meas/engineModel.js

@@ -17,6 +17,13 @@ export function getEngineModel(id) {
   })
 }
 
+export function getEngineModelByEnvData(envDataId) {
+  return request({
+    url: '/meas/engineModel/getInfoByEnvDataId/' + envDataId,
+    method: 'get'
+  })
+}
+
 // 新增发动机型号
 export function addEngineModel(data) {
   return request({

meas_web/src/api/meas/radiation.js

@@ -17,6 +17,13 @@ export function getRadiation(id) {
   })
 }
 
+export function getRadiationByEnvData(envDataId) {
+  return request({
+    url: '/meas/dataResults/getInfoByEnvDataId/' + envDataId,
+    method: 'get'
+  })
+}
+
 // 新增光谱辐射
 export function addRadiation(data) {
   return request({

meas_web/src/api/meas/status.js

@@ -9,6 +9,14 @@ export function listStatus(query) {
   });
 }
 
+// 查询状态Option
+export function statusOption() {
+  return request({
+    url: "/meas/status/getOption",
+    method: "get",
+  });
+}
+
 // 查询状态详细
 export function getStatus(id) {
   return request({

meas_web/src/api/meas/thermalImagerTesDdata.js

@@ -17,6 +17,13 @@ export function getThermalImagerTesDdata(id) {
   })
 }
 
+export function getTIDataByEnvData(envDataId) {
+  return request({
+    url: '/meas/thermalImagerTesDdata/getInfoByEnvDataId/' + envDataId,
+    method: 'get'
+  })
+}
+
 // 新增热像仪测试数据
 export function addThermalImagerTesDdata(data) {
   return request({

meas_web/src/api/meas/transmissionRate.js

@@ -26,6 +26,13 @@ export function addTransmissionRate(data) {
   })
 }
 
+export function getTRateByEnvData(envDataId) {
+  return request({
+    url: '/meas/transmissionRate/getInfoByEnvDataId/' + envDataId,
+    method: 'get'
+  })
+}
+
 // 修改透过率
 export function updateTransmissionRate(data) {
   return request({

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

@@ -1,29 +1,23 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="150px">
-      <el-form-item label="测量批次id" label-width="90px" prop="measurementBatchId">
-        <el-input
-          v-model="queryParams.measurementBatchId"
-          placeholder="请输入测量批次id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+    <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-form-item>
-      <el-form-item label="波段辐射强度3~5μm" prop="specBandIrr1">
-        <el-input
-          v-model="queryParams.specBandIrr1"
-          placeholder="请输入波段辐射强度3~5μm"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="发动机型号" prop="model" >
+        <el-input v-model="queryParams.model" placeholder="请输入发动机型号" clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="波段辐射强度8~14μm" prop="specBandIrr2">
-        <el-input
-          v-model="queryParams.specBandIrr2"
-          placeholder="请输入波段辐射强度8~14μm"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="发动机状态" prop="engineStatus" >
+        <el-select v-model="queryParams.engineStatus" placeholder="请选择发动机状态" clearable>
+          <el-option v-for="(item,index) in engineStatusOptions" :key="index" :label="item" :value="item" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="角度" prop="angle">
+        <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 type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -32,16 +26,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['meas:dataResults:add']"
-        >新增</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -74,21 +58,41 @@
           v-hasPermi="['meas:dataResults:export']"
         >导出</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-view"
+          size="mini"
+          :disabled="single"
+          v-hasPermi="['meas:dataResults:edit']"
+        >光谱可视化</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-view"
+          size="mini"
+          :disabled="single"
+          v-hasPermi="['meas:dataResults:edit']"
+        >波段可视化</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="dataResultsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="编号" align="center" prop="id" />
-      <el-table-column label="测量环境id" align="center" prop="measurementBatchId" />
-      <el-table-column label="光谱辐射强度3~5μm" align="center" prop="specIrr1" />
-      <el-table-column label="光谱辐射强度8~14μm" align="center" prop="specIrr2" />
-      <el-table-column label="波段辐射强度3~5μm" align="center" prop="specBandIrr1" />
-      <el-table-column label="波段辐射强度8~14μm" align="center" prop="specBandIrr2" />
-      <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="更新人" align="center" prop="updateBy" />
+      <el-table-column label="测量批次" align="center" prop="measurementBatch" />
+      <el-table-column label="发动机型号" align="center" prop="model" />
+      <el-table-column label="发动机状态" align="center" prop="engineStatus" >
+      </el-table-column>
+      <el-table-column label="发动机角度" align="center" prop="angle" >
+      </el-table-column>
       <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']">查看</el-button>
           <el-button
             size="mini"
             type="text"
@@ -143,7 +147,9 @@
 </template>
 
 <script>
-import { listDataResults, getDataResults, delDataResults, addDataResults, updateDataResults } from "@/api/meas/dataResults";
+import { listDataResults, getDataResults, delDataResults, updateDataResults } from "@/api/meas/dataResults";
+import { angleOption } from "@/api/meas/angle";
+import { statusOption } from "@/api/meas/status";
 
 export default {
   name: "DataResults",
@@ -191,11 +197,17 @@ export default {
         specBandIrr2: [
           { pattern: /^(0(\.\d{1,2})?|[1-9]\d{0,2}(\.\d{1,2})?|1000(\.00?)?)$/, message: '请输入0.00-1000.00之间的数字,最多可保留两位小数',trigger: 'blur'}
         ],
-      }
+      },
+      // 发动机状态
+      engineStatusOptions: [],
+      // 发动机角度
+      angleOptions: [],
     };
   },
   created() {
     this.getList();
+    this.getAngleOption();
+    this.getStatusOption();
   },
   methods: {
     /** 查询数据结果列表 */
@@ -207,6 +219,22 @@ export default {
         this.loading = false;
       });
     },
+    // 获取角度Option
+    getAngleOption() {
+      this.loading = true;
+      angleOption().then((response) => {
+        this.angleOptions = response.data;
+        this.loading = false;
+      });
+    },
+    // 获取状态Option
+    getStatusOption() {
+      this.loading = true;
+      statusOption().then((response) => {
+        this.engineStatusOptions = response.data;
+        this.loading = false;
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -244,12 +272,6 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加数据结果";
-    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
@@ -270,12 +292,6 @@ export default {
               this.open = false;
               this.getList();
             });
-          } else {
-            addDataResults(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
           }
         }
       });

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

@@ -1,48 +1,24 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="测量批次id" prop="measurementBatchId" label-width="90px">
-        <el-input v-model="queryParams.measurementBatchId" placeholder="请输入测量批次id" clearable
+      <el-form-item label="测量批次" prop="measurementBatch" label-width="90px">
+        <el-input v-model="queryParams.measurementBatch" placeholder="请输入测量批次" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="发动机型号" prop="model" label-width="90px">
+        <el-input v-model="queryParams.model" placeholder="请输入发动机型号" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="发动机状态" prop="engineStatus" label-width="90px">
         <el-select v-model="queryParams.engineStatus" placeholder="请选择发动机状态" clearable>
-          <el-option v-for="item in engineStatusOptions" :key="item.value" :label="item.label" :value="item.value" />
+          <el-option v-for="(item,index) in engineStatusOptions" :key="index" :label="item" :value="item" />
         </el-select>
       </el-form-item>
       <el-form-item label="角度" prop="angle">
         <el-select v-model="queryParams.angle" placeholder="请选择角度" clearable>
-          <el-option v-for="item in angleOptions" :key="item.value" :label="item.label" :value="item.value" />
+          <el-option v-for="item in angleOptions" :key="item" :label="item" :value="item" />
         </el-select>
       </el-form-item>
-      <el-form-item label="测试距离" prop="testDistance">
-        <el-input v-model="queryParams.testDistance" placeholder="请输入测试距离" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="时间" prop="time">
-        <el-date-picker clearable v-model="queryParams.time" type="datetime" value-format="yyyy-MM-dd HH:mm"
-          format="yyyy-MM-dd HH:mm" placeholder="请选择时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="地点" prop="location">
-        <el-input v-model="queryParams.location" placeholder="请输入地点" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="大气压" prop="atmosPress">
-        <el-input v-model="queryParams.atmosPress" placeholder="请输入大气压" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="温度" prop="temperature">
-        <el-input v-model="queryParams.temperature" placeholder="请输入温度" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="风速" prop="windSpeed">
-        <el-input v-model="queryParams.windSpeed" placeholder="请输入风速" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="湿度" prop="humidity">
-        <el-input v-model="queryParams.humidity" placeholder="请输入湿度" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="CO₂浓度" prop="concentration">
-        <el-input v-model="queryParams.concentration" placeholder="请输入CO₂浓度" clearable
-          @keyup.enter.native="handleQuery" />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -71,31 +47,19 @@
 
     <el-table v-loading="loading" :data="envDataList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="编号" align="center" prop="id" />
-      <el-table-column label="测量批次id" align="center" prop="measurementBatchId" />
-      <el-table-column label="发动机状态" align="center" prop="engineStatus" />
-      <el-table-column label="角度" align="center" prop="angle" />
-      <el-table-column label="涡轮后温度" align="center" prop="turbinePostTemp" />
-      <el-table-column label="测试距离" align="center" prop="testDistance" />
-      <el-table-column label="时间" align="center" prop="time">
+      <el-table-column label="测量批次" align="center" prop="measurementBatch" />
+      <el-table-column label="发动机型号" align="center" prop="model" />
+      <el-table-column label="发动机状态" align="center" prop="engineStatus" >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.time, "{y}-{m}-{d}") }}</span>
+          <el-tag>{{ scope.row.engineStatus }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="地点" align="center" prop="location" />
-      <el-table-column label="大气压" align="center" prop="atmosPress" />
-      <el-table-column label="温度" align="center" prop="temperature" />
-      <el-table-column label="风速" align="center" prop="windSpeed" />
-      <el-table-column label="湿度" align="center" prop="humidity" />
-      <el-table-column label="CO₂浓度" align="center" prop="concentration" />
-      <!-- <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column> -->
+      <el-table-column label="发动机角度" align="center" prop="angle" >
+      </el-table-column>
       <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']">查看</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['meas:envData:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
@@ -376,6 +340,7 @@ import {
 import {
   listEngineModel,
   addEngineModel,
+  getEngineModelByEnvData,
   getEngineModel,
   updateEngineModel,
 } from "@/api/meas/engineModel";
@@ -383,6 +348,7 @@ import { listMeasBatch, addMeasBatch } from "@/api/meas/measBatch";
 import {
   addRadiation,
   getRadiation,
+  getRadiationByEnvData,
   updateRadiation,
   listRadiation,
 } from "@/api/meas/radiation";
@@ -390,12 +356,16 @@ import {
   addThermalImagerTesDdata,
   listThermalImagerTesDdata,
   updateThermalImagerTesDdata,
+  getTIDataByEnvData
 } from "@/api/meas/thermalImagerTesDdata";
 import {
   addTransmissionRate,
   listTransmissionRate,
   updateTransmissionRate,
+  getTRateByEnvData
 } from "@/api/meas/transmissionRate";
+import { angleOption } from "@/api/meas/angle";
+import { statusOption,getStatus } from "@/api/meas/status";
 import ECharts from "./ECharts.vue";
 
 export default {
@@ -441,10 +411,6 @@ export default {
         humidity: null,
         concentration: null,
       },
-      // engineQueryParams:{
-      //   pageNum: 1,
-      //   pageSize: 10,
-      // },
       // 表单参数
       form: {},
       radiationForm: {},
@@ -515,17 +481,9 @@ export default {
         ],
       },
       // 发动机状态
-      engineStatusOptions: [
-        { label: "最大", value: 1 },
-        { label: "连续", value: 2 },
-        { label: "最小", value: 3 },
-      ],
-      // 角度状态
-      angleOptions: [
-        { label: "15°", value: 1 },
-        { label: "20°", value: 2 },
-        { label: "30°", value: 3 },
-      ],
+      engineStatusOptions: [],
+      // 发动机角度
+      angleOptions: [],
       // 热像仪测试
       lensFViewOptions: [],
       filterNoOptions: [],
@@ -548,6 +506,8 @@ export default {
     this.getList();
     this.getListEngineModel();
     this.getListMeasBatch();
+    this.getAngleOption();
+    this.getStatusOption();
   },
   methods: {
     /** 查询测量环境数据列表 */
@@ -577,6 +537,22 @@ export default {
         this.loading = false;
       });
     },
+    // 获取角度Option
+    getAngleOption() {
+      this.loading = true;
+      angleOption().then((response) => {
+        this.angleOptions = response.data;
+        this.loading = false;
+      });
+    },
+    // 获取状态Option
+    getStatusOption() {
+      this.loading = true;
+      statusOption().then((response) => {
+        this.engineStatusOptions = response.data;
+        this.loading = false;
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -717,25 +693,19 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const measId = {
-        measurementBatchId: row.measurementBatchId,
-      };
-      console.log("measId", measId);
       const id = row.id || this.ids;
-      // 通过measId来查找，不具有唯一性吧。一个测量批次可以绑定多个光谱辐射数据吧。。。。
-      listEngineModel(measId).then((response) => {
-        console.log("getEngineModelRes", response);
-        this.engineForm = response.rows[0];
-      });
-      listRadiation(measId).then((response) => {
-        this.radiationForm = response.rows[0];
-      });
-      listThermalImagerTesDdata(measId).then((response) => {
-        this.TIForm = response.rows[0];
+      // getEngineModelByEnvData(id).then((response) => {
+      //   this.engineForm = response.data
+      // });
+      getRadiationByEnvData(id).then((response) => {
+        this.radiationForm = response.data;
       });
-      listTransmissionRate(measId).then((response) => {
-        this.TransmittanceForm = response.rows[0];
+      getTIDataByEnvData(id).then((response) => {
+        this.TIForm = response.data;
       });
+      // getTRateByEnvData(id).then((response) => {
+      //   this.TransmittanceForm = response.data;
+      // });
       getEnvData(id).then((response) => {
         this.form = response.data;
         this.open = true;
@@ -744,27 +714,27 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.TIForm["measurementBatchId"] = this.form.measurementBatchId;
-      this.TransmittanceForm["measurementBatchId"] =
-        this.form.measurementBatchId;
-      this.radiationForm["measurementBatchId"] = this.form.measurementBatchId;
+      // this.TIForm["measurementBatchId"] = this.form.measurementBatchId;
+      // this.TransmittanceForm["measurementBatchId"] =
+      //   this.form.measurementBatchId;
+      // this.radiationForm["measurementBatchId"] = this.form.measurementBatchId;
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateRadiation(this.radiationForm).then((response) => { });
-            updateThermalImagerTesDdata(this.TIForm).then((response) => { });
-            updateTransmissionRate(this.TransmittanceForm).then(
-              (response) => { }
-            );
+            // updateRadiation(this.radiationForm).then((response) => { });
+            // updateThermalImagerTesDdata(this.TIForm).then((response) => { });
+            // updateTransmissionRate(this.TransmittanceForm).then(
+            //   (response) => { }
+            // );
             updateEnvData(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addRadiation(this.radiationForm).then((response) => { });
-            addThermalImagerTesDdata(this.TIForm).then((response) => { });
-            addTransmissionRate(this.TransmittanceForm).then((response) => { });
+            // addRadiation(this.radiationForm).then((response) => { });
+            // addThermalImagerTesDdata(this.TIForm).then((response) => { });
+            // addTransmissionRate(this.TransmittanceForm).then((response) => { });
             addEnvData(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;