Browse Source

七个页面的表单校验规则

Rmengdi 11 months ago
parent
commit
f2d351ace8

+ 15 - 8
meas_web/src/views/meas/dataResults/index.vue

@@ -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 :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"
@@ -117,15 +117,15 @@
 
     <!-- 添加或修改数据结果对话框 -->
     <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-item label="测量批次id" prop="measurementBatchId">
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+        <el-form-item label="测量批次id" label-width="90px" prop="measurementBatchId">
           <el-input v-model="form.measurementBatchId" placeholder="请输入测量批次id" />
         </el-form-item>
         <el-form-item label="光谱辐射强度3~5μm" prop="specIrr1">
-          <file-upload v-model="form.specIrr1"/>
+          <file-upload :fileSize="0" :limit="1" :fileType="['txt']" v-model="form.specIrr1"/>
         </el-form-item>
         <el-form-item label="光谱辐射强度8~14μm" prop="specIrr2">
-          <file-upload v-model="form.specIrr2"/>
+          <file-upload :fileSize="0" :limit="1" :fileType="['txt']" v-model="form.specIrr2"/>
         </el-form-item>
         <el-form-item label="波段辐射强度3~5μm" prop="specBandIrr1">
           <el-input v-model="form.specBandIrr1" placeholder="请输入波段辐射强度3~5μm" />
@@ -181,8 +181,15 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        measurementBatchId: [
-          { required: true, message: "测量批次id不能为空", trigger: "blur" }
+        measurementBatchId:[
+          { required: true, message: "测量批次id不能为空"},
+          {type: 'number', message: '测量批次id必须为数字',trigger: 'blur'}
+        ],
+        specBandIrr1: [
+          { pattern: /^(0(\.\d{1,2})?|[1-9]\d{0,2}(\.\d{1,2})?|1000(\.00?)?)$/, message: '请输入0.00-1000.00之间的数字,最多可保留两位小数',trigger: 'blur'} 
+        ],
+        specBandIrr2: [
+          { pattern: /^(0(\.\d{1,2})?|[1-9]\d{0,2}(\.\d{1,2})?|1000(\.00?)?)$/, message: '请输入0.00-1000.00之间的数字,最多可保留两位小数',trigger: 'blur'} 
         ],
       }
     };

+ 10 - 8
meas_web/src/views/meas/engineModel/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
       <el-form-item label="发动机型号" prop="model">
         <el-input
           v-model="queryParams.model"
@@ -66,17 +66,17 @@
       <el-table-column label="编号" align="center" prop="id" />
       <el-table-column label="发动机型号" align="center" prop="model" />
       <el-table-column label="几何模型文件" align="center" prop="geometryFiles" />
-      <el-table-column label="几何模型图片" align="center" prop="geometryImage" width="100">
+      <el-table-column label="几何模型图片" align="center" prop="geometryImage">
         <template slot-scope="scope">
           <image-preview :src="scope.row.geometryImage" :width="50" :height="50"/>
         </template>
       </el-table-column>
-      <el-table-column label="创建人" align="center" prop="createBy" />
+      <!-- <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
@@ -107,15 +107,16 @@
 
     <!-- 添加或修改发动机型号对话框 -->
     <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="100px">
         <el-form-item label="发动机型号" prop="model">
           <el-input v-model="form.model" placeholder="请输入发动机型号" />
         </el-form-item>
         <el-form-item label="几何模型文件" prop="geometryFiles">
-          <file-upload v-model="form.geometryFiles"/>
+          <file-upload :fileSize="0" :limit="1" :fileType="['x_t']" v-model="form.geometryFiles"/>
+          <file-upload :fileSize="0" :limit="1" :fileType="['str']" v-model="form.geometryFiles"/>
         </el-form-item>
         <el-form-item label="几何模型图片" prop="geometryImage">
-          <image-upload v-model="form.geometryImage"/>
+          <image-upload  :fileSize="0" :limit="1" :fileType="['jpg']" v-model="form.geometryImage"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -164,7 +165,8 @@ export default {
       // 表单校验
       rules: {
         model: [
-          { required: true, message: "发动机型号不能为空", trigger: "blur" }
+          { required: true, message: "地点不能为空", trigger: "blur" },
+          { min: 0, max: 50, message: '长度在 0 到 50 个字符', trigger: 'blur' }
         ],
       }
     };

+ 99 - 37
meas_web/src/views/meas/envData/index.vue

@@ -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();

+ 6 - 6
meas_web/src/views/meas/measBatch/index.vue

@@ -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="engineId">
+      <el-form-item label="发动机型号ID" label-width="100px" prop="engineId">
         <el-input
           v-model="queryParams.engineId"
           placeholder="请输入发动机型号ID"
@@ -74,7 +74,7 @@
       <el-table-column label="编号" align="center" prop="id" />
       <el-table-column label="发动机型号ID" align="center" prop="engineId" />
       <el-table-column label="测量批次" align="center" prop="measurementBatch" />
-      <el-table-column label="创建人" align="center" prop="createBy" />
+      <!-- <el-table-column label="创建人" align="center" prop="createBy" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -106,11 +106,11 @@
     <!-- 添加或修改测量批次对话框 -->
     <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-item label="发动机型号ID" prop="engineId">
-          <el-input v-model="form.engineId" placeholder="请输入发动机型号ID" />
+        <el-form-item label="发动机型号ID" label-width="110px" prop="engineId">
+          <el-input v-model.number="form.engineId" placeholder="请输入发动机型号ID" />
         </el-form-item>
         <el-form-item label="测量批次" prop="measurementBatch">
-          <el-input v-model="form.measurementBatch" placeholder="请输入测量批次" />
+          <el-input v-model="form.measurementBatch" placeholder="请输入测量批次(测量年月日+发动机型号)" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -158,7 +158,7 @@ export default {
       // 表单校验
       rules: {
         engineId: [
-          { required: true, message: "发动机型号ID不能为空", trigger: "blur" }
+          { required: true,type:'number', message: "发动机型号ID不能为空,且必须为数字", trigger: "blur" }
         ],
         measurementBatch: [
           { required: true, message: "测量批次不能为空", trigger: "blur" }

+ 24 - 20
meas_web/src/views/meas/radiation/index.vue

@@ -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" label-width="90px"prop="measurementBatchId">
         <el-input
           v-model="queryParams.measurementBatchId"
           placeholder="请输入测量批次id"
@@ -17,7 +17,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="镜头视场角" prop="lensFView">
+      <el-form-item label-width="90px" label="镜头视场角" prop="lensFView">
         <el-input
           v-model="queryParams.lensFView"
           placeholder="请输入镜头视场角"
@@ -104,14 +104,14 @@
       <el-table-column label="标定温度" align="center" prop="calTemp" />
       <el-table-column label="标定曲线" align="center" prop="calCurve" />
       <el-table-column label="原始数据" align="center" prop="rawData" />
-      <el-table-column label="辐射亮度" align="center" prop="radiance1" />
-      <el-table-column label="辐射亮度" align="center" prop="radiance2" />
-      <el-table-column label="创建人" align="center" prop="createBy" />
+      <el-table-column label="辐射亮度(3~5μm)" align="center" prop="radiance1" />
+      <el-table-column label="辐射亮度(8~14μm)" align="center" prop="radiance2" />
+      <!-- <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
@@ -143,35 +143,35 @@
     <!-- 添加或修改光谱辐射对话框 -->
     <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-item label="测量批次id" prop="measurementBatchId">
-          <el-input v-model="form.measurementBatchId" placeholder="请输入测量批次id" />
+        <el-form-item label="测量批次id" label-width="100px" prop="measurementBatchId">
+          <el-input v-model.number="form.measurementBatchId" placeholder="请输入测量批次id" />
         </el-form-item>
         <el-form-item label="型号" prop="model">
           <el-input v-model="form.model" placeholder="请输入型号" />
         </el-form-item>
-        <el-form-item label="镜头视场角" prop="lensFView">
-          <el-input v-model="form.lensFView" placeholder="请输入镜头视场角" />
+        <el-form-item label="镜头视场角" prop="lensFView" label-width="100px">
+          <el-input v-model="form.lensFView" placeholder="请输入镜头视场角(单位:mrad)" />
         </el-form-item>
         <el-form-item label="增益" prop="gain">
-          <el-input v-model="form.gain" placeholder="请输入增益" />
+          <el-input v-model.number="form.gain" placeholder="请输入增益(单位:x)" />
         </el-form-item>
         <el-form-item label="背景数据" prop="backgroundData">
-          <file-upload v-model="form.backgroundData"/>
+          <file-upload :fileSize="0" :limit="1" :fileType="['lgm']" v-model="form.backgroundData"/>
         </el-form-item>
         <el-form-item label="标定温度" prop="calTemp">
           <el-input v-model="form.calTemp" placeholder="请输入标定温度" />
         </el-form-item>
         <el-form-item label="标定曲线" prop="calCurve">
-          <file-upload v-model="form.calCurve"/>
+          <file-upload :fileSize="0" :limit="5" :fileType="['txt']" v-model="form.calCurve"/>
         </el-form-item>
         <el-form-item label="原始数据" prop="rawData">
-          <file-upload v-model="form.rawData"/>
+          <file-upload :fileSize="0" :limit="5" :fileType="['txt']" v-model="form.rawData"/>
         </el-form-item>
         <el-form-item label="辐射亮度" prop="radiance1">
-          <file-upload v-model="form.radiance1"/>
+          <file-upload :fileSize="0" :limit="1" :fileType="['txt']"  v-model="form.radiance1"/>
         </el-form-item>
         <el-form-item label="辐射亮度" prop="radiance2">
-          <file-upload v-model="form.radiance2"/>
+          <file-upload :fileSize="0" :limit="1" :fileType="['txt']"  v-model="form.radiance2"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -227,16 +227,20 @@ export default {
       // 表单校验
       rules: {
         measurementBatchId: [
-          { required: true, message: "测量批次id不能为空", trigger: "blur" }
+          { required: true, message: "测量批次id不能为空"},
+          {type: 'number', message: '测量批次id必须为数字',trigger: 'blur'}
         ],
         model: [
-          { required: true, message: "型号不能为空", trigger: "blur" }
+          { required: true, message: "型号不能为空", trigger: "blur" },
+          { min: 0, max: 50, message: '长度在 0 到 50 个字符', trigger: 'blur' }
         ],
         lensFView: [
-          { required: true, message: "镜头视场角不能为空", trigger: "blur" }
+          {required: true, message: "镜头视场角不能为空"},
+          { required: true,  pattern: /^(0(\.\d{1,2})?|([1-8]\d|90)(\.\d{1,2})?)$/, message: '请输入0.00-90.00mard之间的数字,最多可保留两位小数',trigger: 'blur'}
         ],
         gain: [
-          { required: true, message: "增益不能为空", trigger: "blur" }
+          { required: true, message: '增益不能为空'},
+          { type: 'number',min:1,max:10, message: '请输入1-10x之间的数字',trigger: 'blur'}
         ],
       }
     };

+ 23 - 9
meas_web/src/views/meas/thermalImagerTesDdata/index.vue

@@ -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" label-width="90px" prop="measurementBatchId">
         <el-input
           v-model="queryParams.measurementBatchId"
           placeholder="请输入测量批次id"
@@ -91,12 +91,12 @@
       <el-table-column label="辐射亮度" align="center" prop="radiance" />
       <el-table-column label="辐射照度" align="center" prop="radIllumination" />
       <el-table-column label="辐射温度" align="center" prop="radTemp" />
-      <el-table-column label="创建人" align="center" prop="createBy" />
+      <!-- <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
@@ -129,25 +129,25 @@
     <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-item label="测量批次id" prop="measurementBatchId">
-          <el-input v-model="form.measurementBatchId" placeholder="请输入测量批次id" />
+          <el-input v-model.number="form.measurementBatchId" placeholder="请输入测量批次id" />
         </el-form-item>
         <el-form-item label="型号" prop="model">
           <el-input v-model="form.model" placeholder="请输入型号" />
         </el-form-item>
         <el-form-item label="积分时间" prop="integrationTime">
-          <el-input v-model="form.integrationTime" placeholder="请输入积分时间" />
+          <el-input v-model.number="form.integrationTime" placeholder="请输入积分时间(单位:s)" />
         </el-form-item>
         <el-form-item label="温度标定" prop="tempCal">
-          <file-upload v-model="form.tempCal"/>
+          <file-upload :fileSize="0" :limit="1" :fileType="['txt']" v-model="form.tempCal"/>
         </el-form-item>
         <el-form-item label="辐射亮度" prop="radiance">
-          <file-upload v-model="form.radiance"/>
+          <file-upload :fileSize="0" :limit="1" :fileType="['txt']" v-model="form.radiance"/>
         </el-form-item>
         <el-form-item label="辐射照度" prop="radIllumination">
-          <file-upload v-model="form.radIllumination"/>
+          <file-upload :fileSize="0" :limit="1" :fileType="['txt']" v-model="form.radIllumination"/>
         </el-form-item>
         <el-form-item label="辐射温度" prop="radTemp">
-          <file-upload v-model="form.radTemp"/>
+          <file-upload :fileSize="0" :limit="1" :fileType="['txt']" v-model="form.radTemp"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -203,6 +203,20 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        measurementBatchId:[
+          { required: true, message: "测量批次id不能为空"},
+          {type: 'number', message: '测量批次id必须为数字',trigger: 'blur'}
+        ],
+        model: [
+          { required: true, message: "型号不能为空", trigger: "blur" },
+          { min: 0, max: 50, message: '长度在 0 到 50 个字符', trigger: 'blur' }
+        ],
+        lensFView:[
+          { required: true, message: "镜头视场角不能为空", trigger: "change" },
+        ],
+        integrationTime:[
+          { type: 'number',min:1,max:100, message: '请输入1-100s之间的数字',trigger: 'blur'}
+        ]
       }
     };
   },

+ 13 - 12
meas_web/src/views/meas/transmissionRate/index.vue

@@ -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" label-width="90px" prop="measurementBatchId">
         <el-input
           v-model="queryParams.measurementBatchId"
           placeholder="请输入测量批次id"
@@ -68,12 +68,12 @@
       <el-table-column label="原始数据" align="center" prop="rawData" />
       <el-table-column label="透过率曲线3~5μm" align="center" prop="curve1" />
       <el-table-column label="透过率曲线8~14μm" align="center" prop="curve2" />
-      <el-table-column label="创建人" align="center" prop="createBy" />
+      <!-- <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
@@ -104,18 +104,18 @@
 
     <!-- 添加或修改透过率对话框 -->
     <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-input v-model.number="form.measurementBatchId" placeholder="请输入测量批次id" />
         </el-form-item>
         <el-form-item label="原始数据" prop="rawData">
-          <file-upload v-model="form.rawData"/>
+          <file-upload :fileSize="0" :limit="1" :fileType="['txt']" v-model="form.rawData"/>
         </el-form-item>
-        <el-form-item label="透过率曲线3~5μm" prop="curve1">
-          <file-upload v-model="form.curve1"/>
+        <el-form-item label="透过率曲线3~5μm" label-width="130px" prop="curve1">
+          <file-upload :fileSize="0" :limit="1" :fileType="['txt']"  v-model="form.curve1"/>
         </el-form-item>
-        <el-form-item label="透过率曲线8~14μm" prop="curve2">
-          <file-upload v-model="form.curve2"/>
+        <el-form-item label="透过率曲线8~14μm" label-width="135px" prop="curve2">
+          <file-upload :fileSize="0" :limit="1" :fileType="['txt']"  v-model="form.curve2"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -164,8 +164,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        measurementBatchId: [
-          { required: true, message: "测量批次id不能为空", trigger: "blur" }
+        measurementBatchId:[
+          { required: true, message: "测量批次id不能为空"},
+          {type: 'number', message: '测量批次id必须为数字',trigger: 'blur'}
         ],
       }
     };