|
@@ -1,7 +1,7 @@
|
|
|
<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">
|
|
|
+ <el-form-item label="测量批次id" prop="measurementBatchId" label-width="100px">
|
|
|
<el-input
|
|
|
v-model="queryParams.measurementBatchId"
|
|
|
placeholder="请输入测量批次id"
|
|
@@ -9,13 +9,25 @@
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="发动机状态" prop="engineStatus" label-width="100px">
|
|
|
+ <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-select>
|
|
|
+ </el-form-item>
|
|
|
<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.value"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="测试距离" prop="testDistance">
|
|
|
<el-input
|
|
@@ -27,11 +39,11 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="时间" prop="time">
|
|
|
<el-date-picker clearable
|
|
|
- v-model="queryParams.time"
|
|
|
- type="date"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- placeholder="请选择时间">
|
|
|
- </el-date-picker>
|
|
|
+ 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
|
|
@@ -73,10 +85,10 @@
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="浓度" prop="concentration">
|
|
|
+ <el-form-item label="CO₂浓度" prop="concentration">
|
|
|
<el-input
|
|
|
v-model="queryParams.concentration"
|
|
|
- placeholder="请输入浓度"
|
|
|
+ placeholder="请输入CO₂浓度"
|
|
|
clearable
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
@@ -141,7 +153,7 @@
|
|
|
<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" width="180">
|
|
|
+ <el-table-column label="时间" align="center" prop="time">
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{ parseTime(scope.row.time, '{y}-{m}-{d}') }}</span>
|
|
|
</template>
|
|
@@ -151,13 +163,13 @@
|
|
|
<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="浓度" align="center" prop="concentration" />
|
|
|
- <el-table-column label="创建人" align="center" prop="createBy" />
|
|
|
+ <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> -->
|
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
@@ -188,15 +200,32 @@
|
|
|
|
|
|
<!-- 添加或修改测量环境数据对话框 -->
|
|
|
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
|
|
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
|
|
+ <el-form ref="form" :model="form" :rules="rules" label-width="90px">
|
|
|
<el-form-item label="测量批次id" prop="measurementBatchId">
|
|
|
<el-input v-model="form.measurementBatchId" placeholder="请输入测量批次id" />
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="角度" prop="angle">
|
|
|
- <el-input v-model="form.angle" placeholder="请输入角度" />
|
|
|
+ <el-form-item label="发动机状态" label-width="100px" prop="engineStatus">
|
|
|
+ <el-select v-model="form.engineStatus" placeholder="请选择发动机状态">
|
|
|
+ <el-option
|
|
|
+ v-for="item in engineStatusOptions"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="涡轮后温度" prop="turbinePostTemp">
|
|
|
- <file-upload v-model="form.turbinePostTemp"/>
|
|
|
+ <el-form-item label="涡轮后温度" prop="turbinePostTemp" label-width="100px">
|
|
|
+ <file-upload :fileSize="0" :limit="1" :fileType="['txt']" v-model="form.turbinePostTemp"/>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="角度" prop="angle">
|
|
|
+ <el-select v-model="form.angle" placeholder="请输入角度">
|
|
|
+ <el-option
|
|
|
+ v-for="item in angleOptions"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="测试距离" prop="testDistance">
|
|
|
<el-input v-model="form.testDistance" placeholder="请输入测试距离" />
|
|
@@ -204,8 +233,8 @@
|
|
|
<el-form-item label="时间" prop="time">
|
|
|
<el-date-picker clearable
|
|
|
v-model="form.time"
|
|
|
- type="date"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
+ type="datetime"
|
|
|
+ value-format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm"
|
|
|
placeholder="请选择时间">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
@@ -213,19 +242,19 @@
|
|
|
<el-input v-model="form.location" placeholder="请输入地点" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="大气压" prop="atmosPress">
|
|
|
- <el-input v-model="form.atmosPress" placeholder="请输入大气压" />
|
|
|
+ <el-input v-model="form.atmosPress" placeholder="请输入大气压(单位:pa)" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="温度" prop="temperature">
|
|
|
- <el-input v-model="form.temperature" placeholder="请输入温度" />
|
|
|
+ <el-input v-model="form.temperature" placeholder="请输入温度(单位:K)" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="风速" prop="windSpeed">
|
|
|
- <el-input v-model="form.windSpeed" placeholder="请输入风速" />
|
|
|
+ <el-input v-model="form.windSpeed" placeholder="请输入风速(单位:m/s)" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="湿度" prop="humidity">
|
|
|
- <el-input v-model="form.humidity" placeholder="请输入湿度" />
|
|
|
+ <el-input v-model="form.humidity" placeholder="请输入湿度(单位:%)" />
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="浓度" prop="concentration">
|
|
|
- <el-input v-model="form.concentration" placeholder="请输入浓度" />
|
|
|
+ <el-form-item label="CO₂浓度" prop="concentration">
|
|
|
+ <el-input v-model="form.concentration" placeholder="请输入浓度(单位:mol)" />
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
@@ -280,7 +309,7 @@ export default {
|
|
|
},
|
|
|
// 表单参数
|
|
|
form: {},
|
|
|
- // 表单校验
|
|
|
+ // 表单校验和验证
|
|
|
rules: {
|
|
|
measurementBatchId: [
|
|
|
{ required: true, message: "测量批次id不能为空", trigger: "blur" }
|
|
@@ -288,17 +317,50 @@ export default {
|
|
|
engineStatus: [
|
|
|
{ required: true, message: "发动机状态不能为空", trigger: "change" }
|
|
|
],
|
|
|
- turbinePostTemp: [
|
|
|
- { required: true, message: "涡轮后温度不能为空", trigger: "blur" }
|
|
|
+ angle: [
|
|
|
+ { required: true, message: "角度不能为空", trigger: "change" }
|
|
|
+ ],
|
|
|
+ testDistance: [
|
|
|
+ { pattern: /^(0(\.\d{1,2})?|[1-9]\d{0,2}(\.\d{1,2})?|1000(\.00?)?)$/, message: '请输入0.00-1000.00之间的数字,最多可保留两位小数',trigger: 'blur'}
|
|
|
],
|
|
|
time: [
|
|
|
- { required: true, message: "时间不能为空", trigger: "blur" }
|
|
|
+ { required: true, message: "时间不能为空", trigger: "change" }
|
|
|
],
|
|
|
location: [
|
|
|
- { required: true, message: "地点不能为空", trigger: "blur" }
|
|
|
+ { required: true, message: "地点不能为空", trigger: "blur" },
|
|
|
+ { min: 0, max: 50, message: '长度在 0 到 50 个字符', trigger: 'blur' }
|
|
|
+ ],
|
|
|
+ atmosPress:[
|
|
|
+ { pattern: /^(0(\.\d{1,2})?|[1-9]\d{0,2}(\.\d{1,2})?|1[0-4]\d{2}(\.\d{1,2})?|1500(\.00?)?)$/, message: '请输入0.00-1500.00pa之间的数字,最多可保留两位小数',trigger: 'blur'}
|
|
|
+ ],
|
|
|
+ temperature:[
|
|
|
+ { pattern: /^(230|2[3-9]\d|30\d|31\d|320)(\.\d{2})?$/, message: '请输入230.00-320.00K之间的数字,最多可保留两位小数',trigger: 'blur'}
|
|
|
+ ],
|
|
|
+ windSpeed:[
|
|
|
+ { pattern: /^(0(\.\d{1,2})?|[1-9]\d{0,2}(\.\d{1,2})?|1000(\.00?)?)$/, message: '请输入0.00-1000.00m/s之间的数字,最多可保留两位小数',trigger: 'blur'}
|
|
|
],
|
|
|
- }
|
|
|
+ humidity:[
|
|
|
+ { pattern: /(^(\d|[1-9]\d)(\.\d{1,2})?$)|(^100$)/, message: '请输入0.00-100.00%之间的数字,最多可保留两位小数',trigger: 'blur'}
|
|
|
+ ],
|
|
|
+ concentration:[
|
|
|
+ { pattern: /^(0(\.\d{1,2})?|[1-9]\d{0,2}(\.\d{1,2})?|1000(\.00?)?)$/, message: '请输入0.00-1000.00mol之间的数字,最多可保留两位小数',trigger: 'blur'}
|
|
|
+ ]
|
|
|
+ },
|
|
|
+
|
|
|
+ // 发动机状态
|
|
|
+ engineStatusOptions:[
|
|
|
+ { label:'最大',value:1 },
|
|
|
+ { label:'连续',value:2 },
|
|
|
+ { label:'最小',value:3 },
|
|
|
+ ],
|
|
|
+ // 角度状态
|
|
|
+ angleOptions:[
|
|
|
+ { label:'15°',value:1 },
|
|
|
+ { label:'20°',value:2 },
|
|
|
+ { label:'30°',value:3 },
|
|
|
+ ]
|
|
|
};
|
|
|
+
|
|
|
},
|
|
|
created() {
|
|
|
this.getList();
|