Browse Source

fix some bugs

allen 1 day ago
parent
commit
709f4d55ae

+ 5 - 1
mirs-admin/src/main/resources/mapper/manage/BrdfDataMapper.xml

@@ -32,10 +32,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectBrdfDataList" parameterType="BrdfData" resultMap="BrdfDataResult">
         <include refid="selectBrdfDataVo"/>
-        <where>  
+        <where>
             <if test="sampleModel != null  and sampleModel != ''"> and sample_model = #{sampleModel}</if>
             <if test="temperatureK != null "> and temperature_k = #{temperatureK}</if>
             <if test="wavelengthUm != null  and wavelengthUm != ''"> and wavelength_um = #{wavelengthUm}</if>
+            <if test="thetaIncident != null "> and theta_incident = #{thetaIncident}</if>
+            <if test="phiIncident != null "> and phi_incident = #{phiIncident}</if>
+            <if test="thetaReflected != null "> and theta_reflected = #{thetaReflected}</if>
+            <if test="phiReflected != null "> and phi_reflected = #{phiReflected}</if>
         </where>
     </select>
     

+ 12 - 1
mirs-ui/src/views/manage/sample/index.vue

@@ -11,6 +11,14 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="样片类型" prop="sampleType">
+        <el-input
+          v-model="queryParams.sampleType"
+          placeholder="请输入样片类型"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="样片型号" prop="sampleModel">
         <el-input
           v-model="queryParams.sampleModel"
@@ -127,11 +135,14 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="样片类型" prop="sampleType">
+          <el-input v-model="form.sampleType" placeholder="请输入样片型号" />
+        </el-form-item>
         <el-form-item label="样片型号" prop="sampleModel">
           <el-input v-model="form.sampleModel" placeholder="请输入样片型号" />
         </el-form-item>
         <el-form-item label="样片图片" prop="sampleImage">
-          <image-upload v-model="form.sampleImage"/>
+          <image-upload v-model="form.sampleImage" fileSize="100" limit="1"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">