fix bug

meas-admin/src/main/resources/application.yml

@@ -68,13 +68,14 @@ spring:
   # redis 配置
   redis:
     # 地址 101.126.133.7
-    host: 101.126.133.7
+#    host: 101.126.133.7
+    host: 127.0.0.1
     # 端口，默认为6379
     port: 6379
     # 数据库索引
     database: 0
-    # 密码 CWwYsGjafmv8Sr7g
-    password: Z;G4AS:Vor'YF#p?
+    # 密码 Z;G4AS:Vor'YF#p?
+    password:
     # 连接超时时间
     timeout: 10s
     lettuce:

meas-common/src/main/java/com/meas/common/utils/file/MimeTypeUtils.java

@@ -16,7 +16,7 @@ public class MimeTypeUtils {
 
     public static final String IMAGE_GIF = "image/gif";
 
-    public static final String[] IMAGE_EXTENSION = {"bmp", "gif", "jpg", "jpeg", "png"};
+    public static final String[] IMAGE_EXTENSION = {"bmp", "gif", "jpg", "jpeg", "png", "tiff"};
 
     public static final String[] FLASH_EXTENSION = {"swf", "flv"};
 
@@ -27,7 +27,7 @@ public class MimeTypeUtils {
 
     public static final String[] DEFAULT_ALLOWED_EXTENSION = {
             // 图片
-            "bmp", "gif", "jpg", "jpeg", "png",
+            "bmp", "gif", "jpg", "jpeg", "png", "tiff",
             // word excel powerpoint
             "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt",
             // 压缩文件
@@ -37,7 +37,7 @@ public class MimeTypeUtils {
             // pdf
             "pdf",
             // special
-            "x_t","str","lgm"
+            "x_t","str","Igm"
     };
 
     public static String getExtension(String prefix) {

meas_web/src/router/index.js

@@ -68,7 +68,7 @@ export const constantRoutes = [
     children: [
       {
         path: 'index',
-        component: () => import('@/views/index'),
+        component: () => import('@/views/meas/dataResults/index'),
         name: 'Index',
         meta: { title: '首页', icon: 'dashboard', affix: true }
       }

meas_web/src/views/meas/components/dialogContent.vue

@@ -67,7 +67,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="涡轮后温度" prop="turbinePostTemp" label-width="90px">
-            <file-upload :isCheck="isCheck" :fileSize="0" :limit="1" :fileType="['txt']"
+            <file-upload :isCheck="isCheck" :fileSize="0" :limit="1" :fileType="['txt','xls','xlsx']"
               v-model="formData.turbinePostTemp" />
           </el-form-item>
           <el-form-item>
@@ -103,10 +103,10 @@
         <el-row type="flex" justify="space-around">
           <el-form-item label="大气压" prop="atmosPress">
             <el-input v-model="formData.atmosPress" placeholder="请输入大气压"><template
-                slot="append">pa</template></el-input>
+                slot="append">kpa</template></el-input>
           </el-form-item>
           <el-form-item label="温度" prop="temperature">
-            <el-input v-model="formData.temperature" placeholder="请输入温度"><template slot="append">K</template></el-input>
+            <el-input v-model="formData.temperature" placeholder="请输入温度"><template slot="append">℃</template></el-input>
           </el-form-item>
           <el-form-item label="风速" prop="windSpeed">
             <el-input v-model="formData.windSpeed" placeholder="请输入风速"><template slot="append">m/s</template></el-input>
@@ -118,7 +118,7 @@
           </el-form-item>
           <el-form-item label="CO₂浓度" prop="concentration">
             <el-input v-model="formData.concentration" placeholder="请输入浓度"><template
-                slot="append">mol</template></el-input>
+                slot="append">ppmv</template></el-input>
           </el-form-item>
           <!-- lhp_start -->
           <el-form-item label="能见度" prop="visibility">
@@ -150,9 +150,9 @@
             <el-input v-model="radiationData.lensFView" placeholder="请输入镜头视场角"><template
                 slot="append">mrad</template></el-input>
           </el-form-item>
-          <el-form-item label="增益" prop="gain">
-            <el-input v-model.number="radiationData.gain" placeholder="请输入增益"><template
-                slot="append">x</template></el-input>
+          <el-form-item label="光阑" prop="gain">
+            <el-input v-model.number="radiationData.gain" placeholder="请输入光阑"><template
+                slot="append">mm</template></el-input>
           </el-form-item>
         </el-row>
 
@@ -163,7 +163,7 @@
             :validate-on-rule-change="false" :model="radiationData" label-width="80px">
             <el-row type="flex" justify="space-around">
               <el-form-item label="标定温度" prop="calTempEk">
-                <file-upload :isCheck="isCheck" :fileSize="0" :limit="5" :fileType="['lgm']"
+                <file-upload :isCheck="isCheck" :fileSize="0" :limit="5" :fileType="['Igm','rar','zip']"
                   v-model="radiationData.calTempEk" />
               </el-form-item>
               <el-form-item label="标定曲线" prop="calCurve">
@@ -179,27 +179,13 @@
             :validate-on-rule-change="false" :model="radiationData" label-width="80px">
             <el-row type="flex" justify="space-around">
               <el-form-item label="目标">
-              </el-form-item>
-              <el-form-item label="3~5μm" prop="rawTarget1">
-                <file-upload :isCheck="isCheck" :fileSize="0" :limit="10" :fileType="['lgm']"
+                <file-upload :isCheck="isCheck" :fileSize="0" :limit="10" :fileType="['Igm']"
                   v-model="radiationData.rawTarget1" />
               </el-form-item>
-              <el-form-item label="8~14μm" prop="rawTarget2">
-                <file-upload :isCheck="isCheck" :fileSize="0" :limit="10" :fileType="['lgm']"
-                  v-model="radiationData.rawTarget2" />
-              </el-form-item>
-            </el-row>
-            <el-row type="flex" justify="space-around">
               <el-form-item label="背景">
-              </el-form-item>
-              <el-form-item label="3~5μm" prop="rawBackground1">
-                <file-upload :isCheck="isCheck" :fileSize="0" :limit="10" :fileType="['lgm']"
+                <file-upload :isCheck="isCheck" :fileSize="0" :limit="10" :fileType="['Igm']"
                   v-model="radiationData.rawBackground1" />
               </el-form-item>
-              <el-form-item label="8~14μm" prop="rawBackground2">
-                <file-upload :isCheck="isCheck" :fileSize="0" :limit="10" :fileType="['lgm']"
-                  v-model="radiationData.rawBackground2" />
-              </el-form-item>
             </el-row>
           </el-form>
         </div>
@@ -208,10 +194,8 @@
           <el-form ref="radiationRef" :disabled="checkShow || addBtn" size="mini" :rules="radiationRules"
             :validate-on-rule-change="false" :model="radiationData" label-width="80px">
             <el-row type="flex" justify="space-around">
-              <el-form-item label="目标">
-              </el-form-item>
               <el-form-item label="3~5μm" prop="tackleTarget1">
-                <file-upload :isCheck="isCheck" :fileSize="0" :limit="1" :fileType="['txt']" :isShowViev="true" 
+                <file-upload :isCheck="isCheck" :fileSize="0" :limit="1" :fileType="['txt']" :isShowViev="true"
                   v-model="radiationData.tackleTarget1" v-on:fileView="fileView"/>
               </el-form-item>
               <el-form-item label="8~14μm" prop="tackleTarget2">
@@ -219,25 +203,13 @@
                   v-model="radiationData.tackleTarget2" v-on:fileView="fileView" />
               </el-form-item>
             </el-row>
-            <el-row type="flex" justify="space-around">
-              <el-form-item label="背景">
-              </el-form-item>
-              <el-form-item label="3~5μm" prop="tackleBackground1">
-                <file-upload :isCheck="isCheck" :fileSize="0" :limit="1" :fileType="['txt']"
-                  v-model="radiationData.tackleBackground1" />
-              </el-form-item>
-              <el-form-item label="8~14μm" prop="tackleBackground2">
-                <file-upload :isCheck="isCheck" :fileSize="0" :limit="1" :fileType="['txt']"
-                  v-model="radiationData.tackleBackground2" />
-              </el-form-item>
-            </el-row>
           </el-form>
         </div>
         <!-- lhp_end -->
 
         <!-- <el-row type="flex" justify="space-around">
           <el-form-item label="背景数据" prop="backgroundData">
-            <file-upload :isCheck="isCheck" :fileSize="0" :limit="1" :fileType="['lgm']"
+            <file-upload :isCheck="isCheck" :fileSize="0" :limit="1" :fileType="['Igm']"
               v-model="radiationData.backgroundData" />
           </el-form-item>
           <el-form-item label="标定曲线" prop="calCurve">
@@ -448,7 +420,6 @@
         <el-button @click="cancelCalTemp">取 消</el-button>
       </div>
     </el-dialog>
-
     <el-dialog :close-on-click-modal="false" title="增加标定温度" :visible.sync="addTempCalVisible" width="500px"
       append-to-body>
       <el-form ref="tempCalFormRef" :model="tempCalForm" label-width="60px">
@@ -473,10 +444,10 @@
           <el-input v-model="addEngineForm.model" placeholder="请输入发动机型号" />
         </el-form-item>
         <el-form-item label="几何模型文件" prop="geometryFiles">
-          <file-upload :fileSize="0" :limit="1" :fileType="['x_t', 'str']" v-model="addEngineForm.geometryFiles" />
+          <file-upload :fileSize="0" :limit="1" :fileType="['x_t', 'str', 'rar', 'zip']" v-model="addEngineForm.geometryFiles" />
         </el-form-item>
         <el-form-item label="几何模型图片" prop="geometryImage">
-          <image-upload :fileSize="0" :limit="1" :fileType="['jpg']" v-model="addEngineForm.geometryImage" />
+          <image-upload :fileSize="0" :limit="1" :fileType="['jpg','bmp','jpeg','png','tiff']" v-model="addEngineForm.geometryImage" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -637,8 +608,8 @@ export default {
         ],
         temperature: [
           {
-            pattern: /^(230|2[3-9]\d|30\d|31\d|320)(\.\d{0,2})?$/,
-            message: "请输入230.00-320.00之间的数字,最多可保留两位小数",
+            pattern: /^-?(50(\.0{0,2})?|([1-4][0-9]|[1-9])(\.[0-9]{1,2})?|60(\.0{0,2})?|0(\.[0-9]{1,2})?)$/,
+            message: "请输入-50.00-60.00之间的数字,最多可保留两位小数",
             trigger: "blur",
           },
         ],
@@ -681,8 +652,8 @@ export default {
           { required: true, pattern: /^(0|[1-8]?[0-9]|90)(\.\d{0,2})?$/, message: '请输入0.00-90.00之间的数字,最多可保留两位小数', trigger: 'blur' }
         ],
         gain: [
-          { required: true, message: '增益不能为空' },
-          { type: 'number', min: 1, max: 10, message: '请输入1-10之间的数字', trigger: 'blur' }
+          { required: true, message: '光阑不能为空' },
+          { required: true, pattern: /^(10\.0|([0-9]\.[0-9]))$/, message: '请输入0.0-10.0之间的数字,最多可保留一位小数', trigger: 'blur' }
         ],
 
       },

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

@@ -95,7 +95,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -111,10 +111,10 @@
           <el-input v-model="form.model" placeholder="请输入发动机型号" />
         </el-form-item>
         <el-form-item label="几何模型文件" prop="geometryFiles">
-          <file-upload :fileSize="0" :limit="1" :fileType="['x_t','str']" v-model="form.geometryFiles"/>
+          <file-upload :fileSize="0" :limit="1" :fileType="['x_t', 'str', 'rar', 'zip']" v-model="form.geometryFiles"/>
         </el-form-item>
         <el-form-item label="几何模型图片" prop="geometryImage">
-          <image-upload  :fileSize="0" :limit="1" :fileType="['jpg']" v-model="form.geometryImage"/>
+          <image-upload  :fileSize="0" :limit="1" :fileType="['jpg','bmp','jpeg','png','tiff']" v-model="form.geometryImage"/>
         </el-form-item>
       </el-form>
       <div v-if="!isCheck" slot="footer" class="dialog-footer">

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

@@ -450,7 +450,7 @@ export default {
       this.isCheck = false
       this.addFlag = false
       this.footShow = true
-      const id = row.id;
+      const id = row.id || this.ids;
       getRadiationByEnvData(id).then((response) => {
         if (response.data) {
           this.$refs.dialogContentRef?.getcalTempData(response.data.calTemp)
@@ -477,7 +477,7 @@ export default {
           this.TransmittanceForm.measurementBatchId = id
         }
       });
-      getEnvData(row.id).then((response) => {
+      getEnvData(id).then((response) => {
         if (response.data) {
           this.form = response.data;
           this.open = true;