4.20 红外输出拆分

fidms-admin/src/main/java/com/fidms/web/controller/BzInfraredRadiationTController.java

@@ -0,0 +1,131 @@
+package com.fidms.web.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.fidms.web.domain.BzInfraredRadiationT;
+import com.fidms.web.service.IBzInfraredRadiationTService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.fidms.common.annotation.Log;
+import com.fidms.common.core.domain.AjaxResult;
+import com.fidms.common.enums.BusinessType;
+import com.fidms.common.utils.poi.ExcelUtil;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.fidms.web.domain.ExportAllinfo;
+import com.fidms.web.service.IExportAllinfoService;
+
+
+
+import com.fidms.common.core.controller.BaseController;
+import com.fidms.common.core.page.TableDataInfo;
+
+/**
+ * 红外辐射输出Controller
+ * 
+ * @author fidms
+ * @date 2024-04-19
+ */
+@RestController
+@RequestMapping("/data/radiation")
+public class BzInfraredRadiationTController extends BaseController
+{
+    @Autowired
+    private IBzInfraredRadiationTService bzInfraredRadiationTService;
+
+    /**
+     * 查询红外辐射输出列表
+     */
+    @PreAuthorize("@ss.hasPermi('data:radiation:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BzInfraredRadiationT bzInfraredRadiationT)
+    {
+        startPage();
+        List<BzInfraredRadiationT> list = bzInfraredRadiationTService.selectBzInfraredRadiationTList(bzInfraredRadiationT);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出红外辐射输出列表
+     */
+    @PreAuthorize("@ss.hasPermi('data:radiation:export')")
+    @Log(title = "红外辐射输出", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BzInfraredRadiationT bzInfraredRadiationT)
+    {
+        List<BzInfraredRadiationT> list = bzInfraredRadiationTService.selectBzInfraredRadiationTList(bzInfraredRadiationT);
+        ExcelUtil<BzInfraredRadiationT> util = new ExcelUtil<BzInfraredRadiationT>(BzInfraredRadiationT.class);
+        util.exportExcel(response, list, "红外辐射输出数据");
+    }
+
+    /**
+     * 获取红外辐射输出详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('data:radiation:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(bzInfraredRadiationTService.selectBzInfraredRadiationTById(id));
+    }
+
+    /**
+     * 新增红外辐射输出
+     */
+    @PreAuthorize("@ss.hasPermi('data:radiation:add')")
+    @Log(title = "红外辐射输出", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BzInfraredRadiationT bzInfraredRadiationT)
+    {
+        return toAjax(bzInfraredRadiationTService.insertBzInfraredRadiationT(bzInfraredRadiationT));
+    }
+
+    /**
+     * 修改红外辐射输出
+     */
+    @PreAuthorize("@ss.hasPermi('data:radiation:edit')")
+    @Log(title = "红外辐射输出", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BzInfraredRadiationT bzInfraredRadiationT)
+    {
+        return toAjax(bzInfraredRadiationTService.updateBzInfraredRadiationT(bzInfraredRadiationT));
+    }
+
+    /**
+     * 删除红外辐射输出
+     */
+    @PreAuthorize("@ss.hasPermi('data:radiation:remove')")
+    @Log(title = "红外辐射输出", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(bzInfraredRadiationTService.deleteBzInfraredRadiationTByIds(ids));
+    }
+
+
+    @GetMapping(value = "/infraredradiationoutputexist/{id}")
+    public AjaxResult checktsExistence(@PathVariable("id") Long[] id)
+    {
+        return success(bzInfraredRadiationTService.getinfraredradiationOption(id));
+    }
+}

fidms-admin/src/main/java/com/fidms/web/controller/InfraredOutputController.java

@@ -162,4 +162,13 @@ public class InfraredOutputController extends BaseController
         FolderUtils.openFolderAndSelectFile(dir);
     }
 
+    @GetMapping("/getInfraredOutputOption")
+    public AjaxResult getInfraredOutputOption()
+    {
+        return success(infraredOutputService.getInfraredOutputOption());
+    }
+
 }
+
+
+

fidms-admin/src/main/java/com/fidms/web/domain/BzInfraredRadiationT.java

@@ -0,0 +1,125 @@
+package com.fidms.web.domain;
+
+import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.fidms.common.annotation.Excel;
+import com.fidms.common.core.domain.BaseEntity;
+
+/**
+ * 红外辐射输出对象 bz_infrared_radiation_t
+ * 
+ * @author fidms
+ * @date 2024-04-19
+ */
+public class BzInfraredRadiationT extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 编号 */
+    private Long id;
+
+    /** 对应红外输出编号 */
+    @Excel(name = "对应红外输出编号")
+    private Long infraredOutputId;
+
+    /** 红外辐射强度[W/Sr] */
+    @Excel(name = "红外辐射强度[W/Sr]")
+    private BigDecimal radiationIntensity;
+
+    /** 红外图像输出路径 */
+    @Excel(name = "红外图像",width = 25,height = 125,cellType= Excel.ColumnType.IMAGE)
+    private String infraredImagePath;
+
+    /** 固体红外辐射强度[W/Sr] */
+    @Excel(name = "固体红外辐射强度[W/Sr]")
+    private BigDecimal solidInfraredRadiation;
+
+    /** 气体红外辐射强度[W/Sr] */
+    @Excel(name = "气体红外辐射强度[W/Sr]")
+    private BigDecimal gasInfraredRadiation;
+
+    /** 红外光谱辐射强度分布图 */
+    @Excel(name = "红外光谱辐射强度分布图",width = 25,height = 125,cellType= Excel.ColumnType.IMAGE)
+    private String infraredspectrumDistribution;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setInfraredOutputId(Long infraredOutputId) 
+    {
+        this.infraredOutputId = infraredOutputId;
+    }
+
+    public Long getInfraredOutputId() 
+    {
+        return infraredOutputId;
+    }
+    public void setRadiationIntensity(BigDecimal radiationIntensity) 
+    {
+        this.radiationIntensity = radiationIntensity;
+    }
+
+    public BigDecimal getRadiationIntensity() 
+    {
+        return radiationIntensity;
+    }
+    public void setInfraredImagePath(String infraredImagePath) 
+    {
+        this.infraredImagePath = infraredImagePath;
+    }
+
+    public String getInfraredImagePath() 
+    {
+        return infraredImagePath;
+    }
+    public void setSolidInfraredRadiation(BigDecimal solidInfraredRadiation) 
+    {
+        this.solidInfraredRadiation = solidInfraredRadiation;
+    }
+
+    public BigDecimal getSolidInfraredRadiation() 
+    {
+        return solidInfraredRadiation;
+    }
+    public void setGasInfraredRadiation(BigDecimal gasInfraredRadiation) 
+    {
+        this.gasInfraredRadiation = gasInfraredRadiation;
+    }
+
+    public BigDecimal getGasInfraredRadiation() 
+    {
+        return gasInfraredRadiation;
+    }
+
+    public String getInfraredspectrumDistribution() {
+        return infraredspectrumDistribution;
+    }
+
+    public void setInfraredspectrumDistribution(String infraredspectrumDistribution) {
+        this.infraredspectrumDistribution = infraredspectrumDistribution;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("infraredOutputId", getInfraredOutputId())
+            .append("radiationIntensity", getRadiationIntensity())
+            .append("infraredImagePath", getInfraredImagePath())
+            .append("solidInfraredRadiation", getSolidInfraredRadiation())
+            .append("gasInfraredRadiation", getGasInfraredRadiation())
+            .append("infraredSpectrumDistribution", getInfraredspectrumDistribution())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

fidms-admin/src/main/java/com/fidms/web/domain/ExportAll.java

@@ -38,8 +38,8 @@ public class ExportAll extends BaseEntity {
         id = infraredout.getId();
         infraredInputID = infraredout.getInfraredInputID();
         outputFilePath = infraredout.getOutputFilePath();
-        radiationIntensity = infraredout.getRadiationIntensity();
-        infraredImagePath = infraredout.getInfraredImagePath();
+//        radiationIntensity = infraredout.getRadiationIntensity();
+//        infraredImagePath = infraredout.getInfraredImagePath();
     }
 
     @Excel(name="对应流场输出编号")

fidms-admin/src/main/java/com/fidms/web/domain/ExportAllinfo.java

@@ -314,6 +314,15 @@ public class ExportAllinfo extends BaseEntity
     @Excel(name = "文件输出")
     private String outputFilePath;
 
+
+    /** 编号 */
+    @Excel(name = "红外辐射输出编号")
+    private Long ifrid;
+
+    /** 对应红外输出编号 */
+
+    private Long infraredOutputId;
+
     /** 红外辐射强度 */
     @Excel(name = "红外辐射强度")
     private BigDecimal radiationIntensity;
@@ -977,4 +986,20 @@ public class ExportAllinfo extends BaseEntity
     public void setInfraredspectrumdistribution(String infraredspectrumdistribution) {
         this.infraredspectrumdistribution = infraredspectrumdistribution;
     }
+
+    public Long getInfraredOutputId() {
+        return infraredOutputId;
+    }
+
+    public void setInfraredOutputId(Long infraredOutputId) {
+        this.infraredOutputId = infraredOutputId;
+    }
+
+    public Long getIfrid() {
+        return ifrid;
+    }
+
+    public void setIfrid(Long ifrid) {
+        this.ifrid = ifrid;
+    }
 }

fidms-admin/src/main/java/com/fidms/web/domain/InfraredOutput.java

@@ -32,30 +32,30 @@ public class InfraredOutput extends BaseEntity
     @Excel(name = "文件输出路径")
     private String outputFilePath;
 
-    /** 红外辐射强度 */
-    @Excel(name = "红外辐射强度")
-    private BigDecimal radiationIntensity;
-
-    /** 红外辐射强度 */
-    @Excel(name = "固体红外辐射强度")
-    private BigDecimal solidinfraredradiation;
-    /** 红外辐射强度 */
-    @Excel(name = "气体红外辐射强度")
-    private BigDecimal gasinfraredradiation;
-
-
-    /** 红外图像 */
-    //@Excel(name = "红外图像")
-    private String infraredImage;
-
-    /** 红外图像路径 */
-    @Excel(name = "红外图像",width = 25,height = 125,cellType= Excel.ColumnType.IMAGE)
-    private String infraredImagePath;
-
-
-    /** 红外图像路径 */
-    @Excel(name = "红外光谱辐射强度分布图",width = 25,height = 125,cellType= Excel.ColumnType.IMAGE)
-    private String infraredspectrumdistribution;
+//    /** 红外辐射强度 */
+//    @Excel(name = "红外辐射强度")
+//    private BigDecimal radiationIntensity;
+//
+//    /** 红外辐射强度 */
+//    @Excel(name = "固体红外辐射强度")
+//    private BigDecimal solidinfraredradiation;
+//    /** 红外辐射强度 */
+//    @Excel(name = "气体红外辐射强度")
+//    private BigDecimal gasinfraredradiation;
+//
+//
+//    /** 红外图像 */
+//    //@Excel(name = "红外图像")
+//    private String infraredImage;
+
+//    /** 红外图像路径 */
+//    @Excel(name = "红外图像",width = 25,height = 125,cellType= Excel.ColumnType.IMAGE)
+//    private String infraredImagePath;
+//
+//
+//    /** 红外图像路径 */
+//    @Excel(name = "红外光谱辐射强度分布图",width = 25,height = 125,cellType= Excel.ColumnType.IMAGE)
+//    private String infraredspectrumdistribution;
 
     public void setId(Long id) 
     {
@@ -83,53 +83,53 @@ public class InfraredOutput extends BaseEntity
         this.outputFilePath = outputFilePath;
     }
 
-    public String getOutputFilePath() 
+    public String getOutputFilePath()
     {
         return outputFilePath;
     }
-    public void setRadiationIntensity(BigDecimal radiationIntensity) 
-    {
-        this.radiationIntensity = radiationIntensity;
-    }
-
-    public BigDecimal getRadiationIntensity() 
-    {
-        return radiationIntensity;
-    }
-
-    public String getInfraredImage(){return infraredImage;}
-
-    public void setInfraredImage(String infraredImage) {
-        this.infraredImage = infraredImage;
-    }
-
-    public String getInfraredImagePath(){return infraredImagePath;}
-    public void setInfraredImagePath(String infraredImagePath){this.infraredImagePath = infraredImagePath;}
-
-
-    public BigDecimal getSolidinfraredradiation() {
-        return solidinfraredradiation;
-    }
-
-    public void setSolidinfraredradiation(BigDecimal solidinfraredradiation) {
-        this.solidinfraredradiation = solidinfraredradiation;
-    }
-
-    public BigDecimal getGasinfraredradiation() {
-        return gasinfraredradiation;
-    }
-
-    public void setGasinfraredradiation(BigDecimal gasinfraredradiation) {
-        this.gasinfraredradiation = gasinfraredradiation;
-    }
-
-    public String getInfraredspectrumdistribution() {
-        return infraredspectrumdistribution;
-    }
-
-    public void setInfraredspectrumdistribution(String infraredspectrumdistribution) {
-        this.infraredspectrumdistribution = infraredspectrumdistribution;
-    }
+//    public void setRadiationIntensity(BigDecimal radiationIntensity)
+//    {
+//        this.radiationIntensity = radiationIntensity;
+//    }
+
+//    public BigDecimal getRadiationIntensity()
+//    {
+//        return radiationIntensity;
+//    }
+//
+//    public String getInfraredImage(){return infraredImage;}
+//
+//    public void setInfraredImage(String infraredImage) {
+//        this.infraredImage = infraredImage;
+//    }
+//
+//    public String getInfraredImagePath(){return infraredImagePath;}
+//    public void setInfraredImagePath(String infraredImagePath){this.infraredImagePath = infraredImagePath;}
+//
+//
+//    public BigDecimal getSolidinfraredradiation() {
+//        return solidinfraredradiation;
+//    }
+//
+//    public void setSolidinfraredradiation(BigDecimal solidinfraredradiation) {
+//        this.solidinfraredradiation = solidinfraredradiation;
+//    }
+//
+//    public BigDecimal getGasinfraredradiation() {
+//        return gasinfraredradiation;
+//    }
+//
+//    public void setGasinfraredradiation(BigDecimal gasinfraredradiation) {
+//        this.gasinfraredradiation = gasinfraredradiation;
+//    }
+//
+//    public String getInfraredspectrumdistribution() {
+//        return infraredspectrumdistribution;
+//    }
+//
+//    public void setInfraredspectrumdistribution(String infraredspectrumdistribution) {
+//        this.infraredspectrumdistribution = infraredspectrumdistribution;
+//    }
 
     @Override
     public String toString() {
@@ -137,13 +137,13 @@ public class InfraredOutput extends BaseEntity
             .append("id", getId())
             .append("infraredInputID",getInfraredInputID())
             .append("outputFile", getOutputFile())
-            .append("outputFilePath", getOutputFilePath())
-            .append("radiationIntensity", getRadiationIntensity())
-            .append("infraredImage",getInfraredImage())
-            .append("infraredImagePath",getInfraredImagePath())
-                .append("solidinfraredradiation",getSolidinfraredradiation())
-                .append("gasinfraredradiation",getGasinfraredradiation())
-                .append("infraredspectrumdistribution",getInfraredspectrumdistribution())
+//            .append("outputFilePath", getOutputFilePath())
+//            .append("radiationIntensity", getRadiationIntensity())
+//            .append("infraredImage",getInfraredImage())
+//            .append("infraredImagePath",getInfraredImagePath())
+//                .append("solidinfraredradiation",getSolidinfraredradiation())
+//                .append("gasinfraredradiation",getGasinfraredradiation())
+//                .append("infraredspectrumdistribution",getInfraredspectrumdistribution())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())

fidms-admin/src/main/java/com/fidms/web/mapper/BzInfraredRadiationTMapper.java

@@ -0,0 +1,65 @@
+package com.fidms.web.mapper;
+
+import java.util.List;
+import com.fidms.web.domain.BzInfraredRadiationT;
+
+
+/**
+ * 红外辐射输出Mapper接口
+ * 
+ * @author fidms
+ * @date 2024-04-19
+ */
+public interface BzInfraredRadiationTMapper 
+{
+    /**
+     * 查询红外辐射输出
+     * 
+     * @param id 红外辐射输出主键
+     * @return 红外辐射输出
+     */
+    public BzInfraredRadiationT selectBzInfraredRadiationTById(Long id);
+
+    /**
+     * 查询红外辐射输出列表
+     * 
+     * @param bzInfraredRadiationT 红外辐射输出
+     * @return 红外辐射输出集合
+     */
+    public List<BzInfraredRadiationT> selectBzInfraredRadiationTList(BzInfraredRadiationT bzInfraredRadiationT);
+
+    /**
+     * 新增红外辐射输出
+     * 
+     * @param bzInfraredRadiationT 红外辐射输出
+     * @return 结果
+     */
+    public int insertBzInfraredRadiationT(BzInfraredRadiationT bzInfraredRadiationT);
+
+    /**
+     * 修改红外辐射输出
+     * 
+     * @param bzInfraredRadiationT 红外辐射输出
+     * @return 结果
+     */
+    public int updateBzInfraredRadiationT(BzInfraredRadiationT bzInfraredRadiationT);
+
+    /**
+     * 删除红外辐射输出
+     * 
+     * @param id 红外辐射输出主键
+     * @return 结果
+     */
+    public int deleteBzInfraredRadiationTById(Long id);
+
+    /**
+     * 批量删除红外辐射输出
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteBzInfraredRadiationTByIds(Long[] ids);
+
+
+    public List  getinfraredradiationOption(Long[] id);
+}

fidms-admin/src/main/java/com/fidms/web/mapper/InfraredOutputMapper.java

@@ -65,4 +65,6 @@ public interface InfraredOutputMapper
      * @return
      */
     public List  getinfraredoutputOption(Long[] id);
+
+    public List getInfraredOutputOption();
 }

fidms-admin/src/main/java/com/fidms/web/service/IBzInfraredRadiationTService.java

@@ -0,0 +1,65 @@
+package com.fidms.web.service;
+
+import java.util.List;
+import com.fidms.web.domain.BzInfraredRadiationT;
+
+/**
+ * 红外辐射输出Service接口
+ * 
+ * @author fidms
+ * @date 2024-04-19
+ */
+public interface IBzInfraredRadiationTService 
+{
+    /**
+     * 查询红外辐射输出
+     * 
+     * @param id 红外辐射输出主键
+     * @return 红外辐射输出
+     */
+    public BzInfraredRadiationT selectBzInfraredRadiationTById(Long id);
+
+    /**
+     * 查询红外辐射输出列表
+     * 
+     * @param bzInfraredRadiationT 红外辐射输出
+     * @return 红外辐射输出集合
+     */
+    public List<BzInfraredRadiationT> selectBzInfraredRadiationTList(BzInfraredRadiationT bzInfraredRadiationT);
+
+    /**
+     * 新增红外辐射输出
+     * 
+     * @param bzInfraredRadiationT 红外辐射输出
+     * @return 结果
+     */
+    public int insertBzInfraredRadiationT(BzInfraredRadiationT bzInfraredRadiationT);
+
+    /**
+     * 修改红外辐射输出
+     * 
+     * @param bzInfraredRadiationT 红外辐射输出
+     * @return 结果
+     */
+    public int updateBzInfraredRadiationT(BzInfraredRadiationT bzInfraredRadiationT);
+
+    /**
+     * 批量删除红外辐射输出
+     * 
+     * @param ids 需要删除的红外辐射输出主键集合
+     * @return 结果
+     */
+    public int deleteBzInfraredRadiationTByIds(Long[] ids);
+
+    /**
+     * 删除红外辐射输出信息
+     * 
+     * @param id 红外辐射输出主键
+     * @return 结果
+     */
+    public int deleteBzInfraredRadiationTById(Long id);
+
+
+
+    public List getinfraredradiationOption(Long[] id);
+}

fidms-admin/src/main/java/com/fidms/web/service/IInfraredOutputService.java

@@ -61,4 +61,6 @@ public interface IInfraredOutputService
 
 
     public List getinfraredoutputOption(Long[] id);
+
+    public List getInfraredOutputOption();
 }

fidms-admin/src/main/java/com/fidms/web/service/impl/BzInfraredRadiationTServiceImpl.java

@@ -0,0 +1,111 @@
+package com.fidms.web.service.impl;
+
+import java.util.List;
+import java.util.List;
+
+import com.fidms.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.fidms.web.mapper.ExportAllinfoMapper;
+import com.fidms.web.domain.ExportAllinfo;
+import com.fidms.web.service.IExportAllinfoService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.fidms.web.mapper.BzInfraredRadiationTMapper;
+import com.fidms.web.domain.BzInfraredRadiationT;
+import com.fidms.web.service.IBzInfraredRadiationTService;
+
+/**
+ * 红外辐射输出Service业务层处理
+ * 
+ * @author fidms
+ * @date 2024-04-19
+ */
+@Service
+public class BzInfraredRadiationTServiceImpl implements IBzInfraredRadiationTService 
+{
+    @Autowired
+    private BzInfraredRadiationTMapper bzInfraredRadiationTMapper;
+
+    /**
+     * 查询红外辐射输出
+     * 
+     * @param id 红外辐射输出主键
+     * @return 红外辐射输出
+     */
+    @Override
+    public BzInfraredRadiationT selectBzInfraredRadiationTById(Long id)
+    {
+        return bzInfraredRadiationTMapper.selectBzInfraredRadiationTById(id);
+    }
+
+    /**
+     * 查询红外辐射输出列表
+     * 
+     * @param bzInfraredRadiationT 红外辐射输出
+     * @return 红外辐射输出
+     */
+    @Override
+    public List<BzInfraredRadiationT> selectBzInfraredRadiationTList(BzInfraredRadiationT bzInfraredRadiationT)
+    {
+        return bzInfraredRadiationTMapper.selectBzInfraredRadiationTList(bzInfraredRadiationT);
+    }
+
+    /**
+     * 新增红外辐射输出
+     * 
+     * @param bzInfraredRadiationT 红外辐射输出
+     * @return 结果
+     */
+    @Override
+    public int insertBzInfraredRadiationT(BzInfraredRadiationT bzInfraredRadiationT)
+    {
+        bzInfraredRadiationT.setCreateTime(DateUtils.getNowDate());
+        return bzInfraredRadiationTMapper.insertBzInfraredRadiationT(bzInfraredRadiationT);
+    }
+
+    /**
+     * 修改红外辐射输出
+     * 
+     * @param bzInfraredRadiationT 红外辐射输出
+     * @return 结果
+     */
+    @Override
+    public int updateBzInfraredRadiationT(BzInfraredRadiationT bzInfraredRadiationT)
+    {
+        bzInfraredRadiationT.setUpdateTime(DateUtils.getNowDate());
+        return bzInfraredRadiationTMapper.updateBzInfraredRadiationT(bzInfraredRadiationT);
+    }
+
+    /**
+     * 批量删除红外辐射输出
+     * 
+     * @param ids 需要删除的红外辐射输出主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBzInfraredRadiationTByIds(Long[] ids)
+    {
+        return bzInfraredRadiationTMapper.deleteBzInfraredRadiationTByIds(ids);
+    }
+
+    /**
+     * 删除红外辐射输出信息
+     * 
+     * @param id 红外辐射输出主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBzInfraredRadiationTById(Long id)
+    {
+        return bzInfraredRadiationTMapper.deleteBzInfraredRadiationTById(id);
+    }
+
+
+    @Override
+    public List  getinfraredradiationOption(Long[] id) {
+        return bzInfraredRadiationTMapper.getinfraredradiationOption(id);
+    }
+
+}

fidms-admin/src/main/java/com/fidms/web/service/impl/InfraredOutputServiceImpl.java

@@ -99,4 +99,11 @@ public class InfraredOutputServiceImpl implements IInfraredOutputService
     public List  getinfraredoutputOption(Long[] id) {
         return infraredOutputMapper.getinfraredoutputOption(id);
     }
+
+    @Override
+    public List getInfraredOutputOption()
+    {
+        return infraredOutputMapper.getInfraredOutputOption();
+    }
+
 }

fidms-admin/src/main/resources/mapper/data/BzInfraredRadiationTMapper.xml

@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fidms.web.mapper.BzInfraredRadiationTMapper">
+    
+    <resultMap type="BzInfraredRadiationT" id="BzInfraredRadiationTResult">
+        <result property="id"    column="id"    />
+        <result property="infraredOutputId"    column="infrared_output_id"    />
+        <result property="radiationIntensity"    column="radiation_intensity"    />
+        <result property="infraredImagePath"    column="infrared_image_path"    />
+        <result property="solidInfraredRadiation"    column="solid_infrared_radiation"    />
+        <result property="gasInfraredRadiation"    column="gas_infrared_radiation"    />
+        <result property="infraredspectrumDistribution"    column="infrared_spectrum_distribution"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectBzInfraredRadiationTVo">
+        select id, infrared_output_id, radiation_intensity, infrared_image_path, solid_infrared_radiation, gas_infrared_radiation, infrared_spectrum_distribution, create_by, create_time, update_by, update_time from bz_infrared_radiation_t
+    </sql>
+
+    <select id="selectBzInfraredRadiationTList" parameterType="BzInfraredRadiationT" resultMap="BzInfraredRadiationTResult">
+        <include refid="selectBzInfraredRadiationTVo"/>
+        <where>  
+            <if test="infraredOutputId != null "> and infrared_output_id = #{infraredOutputId}</if>
+            <if test="radiationIntensity != null "> and radiation_intensity = #{radiationIntensity}</if>
+            <if test="solidInfraredRadiation != null "> and solid_infrared_radiation = #{solidInfraredRadiation}</if>
+            <if test="gasInfraredRadiation != null "> and gas_infrared_radiation = #{gasInfraredRadiation}</if>
+        </where>
+    </select>
+    
+    <select id="selectBzInfraredRadiationTById" parameterType="Long" resultMap="BzInfraredRadiationTResult">
+        <include refid="selectBzInfraredRadiationTVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertBzInfraredRadiationT" parameterType="BzInfraredRadiationT" useGeneratedKeys="true" keyProperty="id">
+        insert into bz_infrared_radiation_t
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="infraredOutputId != null">infrared_output_id,</if>
+            <if test="radiationIntensity != null">radiation_intensity,</if>
+            <if test="infraredImagePath != null">infrared_image_path,</if>
+            <if test="solidInfraredRadiation != null">solid_infrared_radiation,</if>
+            <if test="gasInfraredRadiation != null">gas_infrared_radiation,</if>
+            <if test="infraredspectrumDistribution != null">infrared_spectrum_distribution,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="infraredOutputId != null">#{infraredOutputId},</if>
+            <if test="radiationIntensity != null">#{radiationIntensity},</if>
+            <if test="infraredImagePath != null">#{infraredImagePath},</if>
+            <if test="solidInfraredRadiation != null">#{solidInfraredRadiation},</if>
+            <if test="gasInfraredRadiation != null">#{gasInfraredRadiation},</if>
+            <if test="infraredspectrumDistribution != null">#{infraredspectrumDistribution},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBzInfraredRadiationT" parameterType="BzInfraredRadiationT">
+        update bz_infrared_radiation_t
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="infraredOutputId != null">infrared_output_id = #{infraredOutputId},</if>
+            <if test="radiationIntensity != null">radiation_intensity = #{radiationIntensity},</if>
+            <if test="infraredImagePath != null">infrared_image_path = #{infraredImagePath},</if>
+            <if test="solidInfraredRadiation != null">solid_infrared_radiation = #{solidInfraredRadiation},</if>
+            <if test="gasInfraredRadiation != null">gas_infrared_radiation = #{gasInfraredRadiation},</if>
+            <if test="infraredspectrumDistribution != null">infrared_spectrum_distribution = #{infraredspectrumDistribution},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteBzInfraredRadiationTById" parameterType="Long">
+        delete from bz_infrared_radiation_t where id = #{id}
+    </delete>
+
+    <delete id="deleteBzInfraredRadiationTByIds" parameterType="String">
+        delete from bz_infrared_radiation_t where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <select id="getinfraredradiationOption" parameterType="String" resultType="Map">
+        select distinct infrared_output_id
+        from
+        bz_infrared_radiation_t
+        where
+        bz_infrared_radiation_t.infrared_output_id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+        group by infrared_output_id
+        having count(0) > 0
+    </select>
+</mapper>

fidms-admin/src/main/resources/mapper/data/ExportAllinfoMapper.xml

@@ -84,6 +84,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="infraredInputID" column="infrared_input_id"/>
         <result property="outputFile"    column="output_file"    />
         <result property="outputFilePath"    column="output_file_path"    />
+
+        <result property="ifrid"    column="ifrid"    />
+        <result property="infraredOutputId"    column="infrared_output_id"    />
         <result property="radiationIntensity"    column="radiation_intensity"    />
         <result property="infraredImage"    column="infrared_image"    />
         <result property="infraredImagePath"    column="infrared_image_path"    />
@@ -171,12 +174,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                ifo.infrared_input_id,
                ifo.output_file,
                ifo.output_file_path,
-               ifo.radiation_intensity,
-               ifo.infrared_image,
-               ifo.infrared_image_path,
-               ifo.solid_infrared_radiation,
-               ifo.gas_infrared_radiation,
-               ifo.infrared_spectrum_distribution
+
+               ifr.id "ifrid",
+               ifr.infrared_output_id,
+               ifr.radiation_intensity,
+               ifr.infrared_image_path,
+               ifr.solid_infrared_radiation,
+               ifr.gas_infrared_radiation,
+               ifr.infrared_spectrum_distribution
 
         FROM
             bz_model_3d_t m3
@@ -184,6 +189,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN bz_flow_field_output_t ffo ON ffo.flow_field_input_id = ffi.id
             LEFT JOIN bz_infrared_input_t ifi ON ffo.id = ifi.flow_field_output_id
             LEFT JOIN bz_infrared_output_t ifo ON ifi.id = ifo.infrared_input_id
+            LEFT JOIN bz_infrared_radiation_t ifr ON ifo.id = ifr.infrared_output_id
     </sql>
 
     <select id="selectExportAllinfoList" parameterType="ExportAllinfo" resultMap="ExportAllinfoResult">
@@ -249,7 +255,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="axialVelocityDistributionPath != null and axialVelocityDistributionPath !=''"> and axial_velocity_distribution_path = #{axialVelocityDistributionPath}</if>
 
 
-            <if test="flowFieldOutputID != null">and flow_field_output_id=#{flowFieldOutputID},</if>
+            <if test="flowFieldOutputID != null">and flow_field_output_id=#{flowFieldOutputID}</if>
             <if test="FullLaunchRate != null "> and full_launch_rate = #{FullLaunchRate}</if>
             <if test="DamageLaunchRate != null "> and damage_launch_rate = #{DamageLaunchRate}</if>
             <if test="DamageArea != null "> and damage_area = #{DamageArea}</if>
@@ -261,11 +267,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="DetectVerticalAngle != null "> and detect_vertical_angle = #{DetectVerticalAngle}</if>
 
 
-            <if test="infraredInputID != null">and infrared_input_id=#{infraredInputID},</if>
+            <if test="infraredInputID != null">and infrared_input_id=#{infraredInputID}</if>
             <if test="outputFile != null  and outputFile != ''"> and output_file = #{outputFile}</if>
             <if test="outputFilePath != null  and outputFilePath != ''"> and output_file_path = #{outputFilePath}</if>
+
+
+            <if test="infraredOutputId != null "> and infrared_output_id = #{infraredOutputId}</if>
             <if test="radiationIntensity != null "> and radiation_intensity = #{radiationIntensity}</if>
-            <if test="infraredImage != null  and infraredImage != ''"> and infrared_image = #{infraredImage}</if>
+<!--            <if test="infraredImage != null  and infraredImage != ''"> and infrared_image = #{infraredImage}</if>-->
             <if test="infraredImagePath != null  and infraredImagePath != ''"> and infrared_image_path = #{infraredImagePath}</if>
             <if test="solidinfraredradiation != null "> and solid_infrared_radiation = #{solidinfraredradiation}</if>
             <if test="gasinfraredradiation != null "> and gas_infrared_radiation = #{gasinfraredradiation}</if>

fidms-admin/src/main/resources/mapper/data/InfraredInputMapper.xml

@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectInfraredInputList" parameterType="InfraredInput" resultMap="InfraredInputResult">
         <include refid="selectInfraredInputVo"/>
         <where>
-            <if test="flowFieldOutputID != null">and flow_field_output_id=#{flowFieldOutputID},</if>
+            <if test="flowFieldOutputID != null">and flow_field_output_id=#{flowFieldOutputID}</if>
             <if test="FullLaunchRate != null "> and full_launch_rate = #{FullLaunchRate}</if>
             <if test="DamageLaunchRate != null "> and damage_launch_rate = #{DamageLaunchRate}</if>
             <if test="DamageArea != null "> and damage_area = #{DamageArea}</if>

fidms-admin/src/main/resources/mapper/data/InfraredOutputMapper.xml

@@ -9,13 +9,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="infraredInputID" column="infrared_input_id"/>
         <result property="outputFile"    column="output_file"    />
         <result property="outputFilePath"    column="output_file_path"    />
-        <result property="radiationIntensity"    column="radiation_intensity"    />
-        <result property="infraredImage"    column="infrared_image"    />
-        <result property="infraredImagePath"    column="infrared_image_path"    />
+<!--        <result property="radiationIntensity"    column="radiation_intensity"    />-->
+<!--        <result property="infraredImage"    column="infrared_image"    />-->
+<!--        <result property="infraredImagePath"    column="infrared_image_path"    />-->
 
-        <result property="solidinfraredradiation"    column="solid_infrared_radiation"    />
-        <result property="gasinfraredradiation"    column="gas_infrared_radiation"    />
-        <result property="infraredspectrumdistribution"    column="infrared_spectrum_distribution"    />
+<!--        <result property="solidinfraredradiation"    column="solid_infrared_radiation"    />-->
+<!--        <result property="gasinfraredradiation"    column="gas_infrared_radiation"    />-->
+<!--        <result property="infraredspectrumdistribution"    column="infrared_spectrum_distribution"    />-->
 
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -24,24 +24,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectInfraredOutputVo">
-        select id, infrared_input_id,output_file, output_file_path, radiation_intensity, solid_infrared_radiation,gas_infrared_radiation,infrared_spectrum_distribution,infrared_image,infrared_image_path,create_by, create_time, update_by, update_time from bz_infrared_output_t
+        select id, infrared_input_id,output_file, output_file_path, create_by, create_time, update_by, update_time from bz_infrared_output_t
     </sql>
 
     <select id="selectInfraredOutputList" parameterType="InfraredOutput" resultMap="InfraredOutputResult">
         <include refid="selectInfraredOutputVo"/>
         <where>
-            <if test="infraredInputID != null">and infrared_input_id=#{infraredInputID},</if>
+            <if test="infraredInputID != null">and infrared_input_id=#{infraredInputID}</if>
             <if test="outputFile != null  and outputFile != ''"> and output_file = #{outputFile}</if>
             <if test="outputFilePath != null  and outputFilePath != ''"> and output_file_path = #{outputFilePath}</if>
-            <if test="radiationIntensity != null "> and radiation_intensity = #{radiationIntensity}</if>
+<!--            <if test="radiationIntensity != null "> and radiation_intensity = #{radiationIntensity}</if>-->
 
-            <if test="solidinfraredradiation != null "> and solid_infrared_radiation = #{solidinfraredradiation}</if>
-            <if test="gasinfraredradiation != null "> and gas_infrared_radiation = #{gasinfraredradiation}</if>
-            <if test="infraredspectrumdistribution != null "> and infrared_spectrum_distribution = #{infraredspectrumdistribution}</if>
+<!--            <if test="solidinfraredradiation != null "> and solid_infrared_radiation = #{solidinfraredradiation}</if>-->
+<!--            <if test="gasinfraredradiation != null "> and gas_infrared_radiation = #{gasinfraredradiation}</if>-->
+<!--            <if test="infraredspectrumdistribution != null "> and infrared_spectrum_distribution = #{infraredspectrumdistribution}</if>-->
 
 
-            <if test="infraredImage != null  and infraredImage != ''"> and infrared_image = #{infraredImage}</if>
-            <if test="infraredImagePath != null  and infraredImagePath != ''"> and infrared_image_path = #{infraredImagePath}</if>
+<!--            <if test="infraredImage != null  and infraredImage != ''"> and infrared_image = #{infraredImage}</if>-->
+<!--            <if test="infraredImagePath != null  and infraredImagePath != ''"> and infrared_image_path = #{infraredImagePath}</if>-->
         </where>
     </select>
     <select id="selectInfraredOutputById" parameterType="Long" resultMap="InfraredOutputResult">
@@ -55,14 +55,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="infraredInputID != null">infrared_input_id,</if>
             <if test="outputFile != null">output_file,</if>
             <if test="outputFilePath != null">output_file_path,</if>
-            <if test="radiationIntensity != null">radiation_intensity,</if>
+<!--            <if test="radiationIntensity != null">radiation_intensity,</if>-->
 
-            <if test="solidinfraredradiation != null">solid_infrared_radiation,</if>
-            <if test="gasinfraredradiation != null">gas_infrared_radiation,</if>
-            <if test="infraredspectrumdistribution != null">infrared_spectrum_distribution,</if>
+<!--            <if test="solidinfraredradiation != null">solid_infrared_radiation,</if>-->
+<!--            <if test="gasinfraredradiation != null">gas_infrared_radiation,</if>-->
+<!--            <if test="infraredspectrumdistribution != null">infrared_spectrum_distribution,</if>-->
 
-            <if test="infraredImage != null">infrared_image,</if>
-            <if test="infraredImagePath != null">infrared_image_path,</if>
+<!--            <if test="infraredImage != null">infrared_image,</if>-->
+<!--            <if test="infraredImagePath != null">infrared_image_path,</if>-->
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -72,14 +72,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="infraredInputID != null">#{infraredInputID},</if>
             <if test="outputFile != null">#{outputFile},</if>
             <if test="outputFilePath != null">#{outputFilePath},</if>
-            <if test="radiationIntensity != null">#{radiationIntensity},</if>
+<!--            <if test="radiationIntensity != null">#{radiationIntensity},</if>-->
 
-            <if test="solidinfraredradiation != null">#{solidinfraredradiation},</if>
-            <if test="gasinfraredradiation != null">#{gasinfraredradiation},</if>
-            <if test="infraredspectrumdistribution != null">#{infraredspectrumdistribution},</if>
+<!--            <if test="solidinfraredradiation != null">#{solidinfraredradiation},</if>-->
+<!--            <if test="gasinfraredradiation != null">#{gasinfraredradiation},</if>-->
+<!--            <if test="infraredspectrumdistribution != null">#{infraredspectrumdistribution},</if>-->
 
-            <if test="infraredImage != null">#{infraredImage},</if>
-            <if test="infraredImagePath != null">#{infraredImagePath},</if>
+<!--            <if test="infraredImage != null">#{infraredImage},</if>-->
+<!--            <if test="infraredImagePath != null">#{infraredImagePath},</if>-->
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -93,14 +93,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="infraredInputID != null">infrared_input_id= #{infraredInputID},</if>
             <if test="outputFile != null">output_file = #{outputFile},</if>
             <if test="outputFilePath != null">output_file_path = #{outputFilePath},</if>
-            <if test="radiationIntensity != null">radiation_intensity = #{radiationIntensity},</if>
+<!--            <if test="radiationIntensity != null">radiation_intensity = #{radiationIntensity},</if>-->
 
-            <if test="solidinfraredradiation != null "> and solid_infrared_radiation = #{solidinfraredradiation}</if>
-            <if test="gasinfraredradiation != null "> and gas_infrared_radiation = #{gasinfraredradiation}</if>
-            <if test="infraredspectrumdistribution != null "> and infrared_spectrum_distribution = #{infraredspectrumdistribution}</if>
+<!--            <if test="solidinfraredradiation != null "> and solid_infrared_radiation = #{solidinfraredradiation}</if>-->
+<!--            <if test="gasinfraredradiation != null "> and gas_infrared_radiation = #{gasinfraredradiation}</if>-->
+<!--            <if test="infraredspectrumdistribution != null "> and infrared_spectrum_distribution = #{infraredspectrumdistribution}</if>-->
 
-            <if test="infraredImage != null">infrared_image = #{infraredImage},</if>
-            <if test="infraredImagePath != null">infrared_image_path = #{infraredImagePath},</if>
+<!--            <if test="infraredImage != null">infrared_image = #{infraredImage},</if>-->
+<!--            <if test="infraredImagePath != null">infrared_image_path = #{infraredImagePath},</if>-->
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
@@ -121,6 +121,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
 
+    <select id="getInfraredOutputOption" resultType="Map">
+        select id,output_file_path from bz_infrared_output_t order by id desc
+    </select>
+
     <select id="getinfraredoutputOption" parameterType="String" resultType="Map">
         select distinct infrared_input_id
         from
@@ -135,4 +139,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
+
 </mapper>

fidms-ui/src/api/data/infraredOut.js

@@ -57,3 +57,10 @@ export function checktsExistence(id) {
     method: 'get'
   })
 }
+
+export function getInfraredOutputID()
+{return request({
+  url:'/data/infraredOut/getInfraredOutputOption',
+  method:'get'
+})
+}

fidms-ui/src/api/data/radiation.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询红外辐射输出列表
+export function listRadiation(query) {
+  return request({
+    url: '/data/radiation/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询红外辐射输出详细
+export function getRadiation(id) {
+  return request({
+    url: '/data/radiation/' + id,
+    method: 'get'
+  })
+}
+
+// 新增红外辐射输出
+export function addRadiation(data) {
+  return request({
+    url: '/data/radiation',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改红外辐射输出
+export function updateRadiation(data) {
+  return request({
+    url: '/data/radiation',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除红外辐射输出
+export function delRadiation(id) {
+  return request({
+    url: '/data/radiation/' + id,
+    method: 'delete'
+  })
+}
+
+
+export function checktsExistence(id) {
+  return request({
+    url: '/data/radiation/infraredradiationoutputexist/' + id,
+    method: 'get'
+  })
+}

fidms-ui/src/views/data/allinfo/index.vue

@@ -437,6 +437,8 @@
           </el-button>
         </template>
       </el-table-column>
+
+      <el-table-column label="红外辐射输出编号" align="center" prop="ifrid" />
       <el-table-column label="红外辐射强度" align="center" prop="radiationIntensity" />
       <el-table-column label="红外图像" align="center" prop="infraredImagePath">
         <template slot-scope="scope">
@@ -790,7 +792,6 @@ export default {
       this.$download.resource(path);
     },
     openFolder(path){
-      
       getFolder(path);
     },
     isDecimalFormat(value) {

fidms-ui/src/views/data/infraredOut/index.vue

@@ -1,14 +1,15 @@
 <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="红外辐射强度[W/Sr]" prop="radiationIntensity">
-        <el-input
-          v-model="queryParams.radiationIntensity"
-          placeholder="请输入红外辐射强度[W/Sr]"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+      <el-form-item label="红外输入编号"  prop="infraredInputID">
+          <el-select v-model="queryParams.infraredInputID" placeholder="请输入对应红外输入编号">
+            <el-option v-for="item in infraredInputOption"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </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>
@@ -67,7 +68,7 @@
       <el-table-column label="对应红外输入编号" align="center" prop="infraredInputID" />
       <el-table-column label="文件输出" align="center" prop="outputFilePath">
         <template slot-scope="scope">
-          <el-button
+          <el-button v-if="scope.row.outputFilePath !== null"
             size="mini"
             type="text"
             icon="el-icon-folder-opened"
@@ -85,7 +86,7 @@
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="红外辐射强度[W/Sr]" align="center" prop="radiationIntensity" />
+      <!-- <el-table-column label="红外辐射强度[W/Sr]" align="center" prop="radiationIntensity" />
 
       <el-table-column label="红外图像" align="center" prop="infraredImagePath">
         <template slot-scope="scope">
@@ -133,7 +134,7 @@
           </el-button>
           <image-preview v-if="scope.row.infraredspectrumdistribution !== null" :src="scope.row.infraredspectrumdistribution" :width="30" :height="30" ></image-preview>
       </template>
-      </el-table-column>
+      </el-table-column> -->
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -175,9 +176,9 @@
           </el-select>
         </el-form-item>
         <el-form-item label="文件输出" prop="outputFilePath">
-          <file-upload v-model="form.outputFilePath" :fileType="fileType" :fileSize="2048" :limit="1" />
+          <file-uploadedit v-model="form.outputFilePath" :fileSize="2048" :limit="1" />
         </el-form-item>
-        <el-form-item label="红外辐射强度[W/Sr]" prop="radiationIntensity">
+        <!-- <el-form-item label="红外辐射强度[W/Sr]" prop="radiationIntensity">
           <el-input v-model="form.radiationIntensity" placeholder="请输入红外辐射强度[W/Sr]" />
         </el-form-item>
         <el-form-item label="红外图像" prop="infraredImagePath">
@@ -189,9 +190,9 @@
         <el-form-item label="气体红外辐射强度[W/Sr]" prop="gasinfraredradiation">
           <el-input v-model="form.gasinfraredradiation" placeholder="请输入气体红外辐射强度[W/Sr]" />
         </el-form-item>
-        <el-form-item label="红外图像" prop="infraredspectrumdistribution">
+        <el-form-item label="红外光谱辐射强度分布图" prop="infraredspectrumdistribution">
           <file-upload v-model="form.infraredspectrumdistribution" :fileType="imageType" :fileSize="2048" :limit="1"/>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -204,6 +205,7 @@
 <script>
 import { listInfraredOut, getInfraredOut, delInfraredOut, addInfraredOut, updateInfraredOut,getFolder } from "@/api/data/infraredOut";
 import { getInfraredInputID }from "@/api/data/infraredIn";
+import { checktsExistence} from "@/api/data/radiation";
 
 export default {
   name: "InfraredOut",
@@ -234,12 +236,12 @@ export default {
         infraredInputID:null,
         outputFile: null,
         outputFilePath: null,
-        radiationIntensity: null,
-        infraredImage:null,
-        infraredImagePath:null,
-        solidinfraredradiation:null,
-        gasinfraredradiation:null,
-        infraredspectrumdistribution:null,
+        // radiationIntensity: null,
+        // infraredImage:null,
+        // infraredImagePath:null,
+        // solidinfraredradiation:null,
+        // gasinfraredradiation:null,
+        // infraredspectrumdistribution:null,
 
       },
       // 表单参数
@@ -249,65 +251,11 @@ export default {
         infraredInputID: [
           { required: true, message: "对应红外输入编号不能为空", trigger: "change" }
         ],
-        outputFilePath:[
-          { required: true, message: "文件输出不能为空", trigger: "change" }
-        ],
-        infraredImagePath:[
-          { required: true, message: "文件输出不能为空", trigger: "change" }
-        ],
-        radiationIntensity: [
-          {
-            validator: (rule, value, callback) => {
-              if (value === '' || value === null) { // 允许空值通过验证
-                callback();
-              } else {
-                const machNumberRegex = /^\d{1,10}(\.\d{1,6})?$/; // 匹配DECIMAL(16,6)格式的正则表达式
-                if (!machNumberRegex.test(value)) {
-                  callback(new Error('红外辐射强度格式不正确，应为DECIMAL(16,6)格式'));
-                } else {
-                  callback();
-                }
-              }
-            },
-            trigger: 'change'
-          }
-        ],
-
-        solidinfraredradiation: [
-          {
-            validator: (rule, value, callback) => {
-              if (value === '' || value === null) { // 允许空值通过验证
-                callback();
-              } else {
-                const machNumberRegex = /^\d{1,10}(\.\d{1,6})?$/; // 匹配DECIMAL(16,6)格式的正则表达式
-                if (!machNumberRegex.test(value)) {
-                  callback(new Error('固体红外辐射强度格式不正确，应为DECIMAL(16,6)格式'));
-                } else {
-                  callback();
-                }
-              }
-            },
-            trigger: 'change'
-          }
-        ],
-
-        gasinfraredradiation: [
-          {
-            validator: (rule, value, callback) => {
-              if (value === '' || value === null) { // 允许空值通过验证
-                callback();
-              } else {
-                const machNumberRegex = /^\d{1,10}(\.\d{1,6})?$/; // 匹配DECIMAL(16,6)格式的正则表达式
-                if (!machNumberRegex.test(value)) {
-                  callback(new Error('气体红外辐射强度格式不正确，应为DECIMAL(16,6)格式'));
-                } else {
-                  callback();
-                }
-              }
-            },
-            trigger: 'change'
-          }
-        ],
+        // outputFilePath:[
+        //   { required: true, message: "文件输出不能为空", trigger: "change" }
+        // ],
+        
+        
 
       },
       infraredInputOption:[],
@@ -341,26 +289,26 @@ export default {
         infraredInputID:null,
         outputFile: null,
         outputFilePath: null,
-        radiationIntensity: null,
-        infraredImage:null,
-        infraredImagePath:null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null,
-        solidinfraredradiation:null,
-        gasinfraredradiation:null,
-        infraredspectrumdistribution:null,
+        // radiationIntensity: null,
+        // infraredImage:null,
+        // infraredImagePath:null,
+        // createBy: null,
+        // createTime: null,
+        // updateBy: null,
+        // updateTime: null,
+        // solidinfraredradiation:null,
+        // gasinfraredradiation:null,
+        // infraredspectrumdistribution:null,
 
       };
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      if (this.queryParams.radiationIntensity &&!this.isDecimalFormat(this.queryParams.radiationIntensity)) {
-        this.$modal.msgError("红外辐射强度格式不正确，请输入DECIMAL(16,6)格式数据");
-        return;
-      }
+      // if (this.queryParams.radiationIntensity &&!this.isDecimalFormat(this.queryParams.radiationIntensity)) {
+      //   this.$modal.msgError("红外辐射强度格式不正确，请输入DECIMAL(16,6)格式数据");
+      //   return;
+      // }
       this.queryParams.pageNum = 1;
       this.getList();
     },
@@ -411,16 +359,53 @@ export default {
         }
       });
     },
-    /** 删除按钮操作 */
+    // /** 删除按钮操作 */
+    // handleDelete(row) {
+    //   const ids = row.id || this.ids;
+    //   this.$modal.confirm('是否确认删除红外输出编号为"' + ids + '"的数据项？').then(function() {
+    //     return delInfraredOut(ids);
+    //   }).then(() => {
+    //     this.getList();
+    //     this.$modal.msgSuccess("删除成功");
+    //   }).catch(() => {});
+    // },
+
+
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除红外输出编号为"' + ids + '"的数据项？').then(function() {
-        return delInfraredOut(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      checktsExistence(ids).then(resp => {
+        if (resp.data && resp.data.length > 0){
+          let deid = resp.data.map(item => item.infrared_output_id).join(',');
+          if(resp.data.length > 0 && resp.data.length != ids.length && ids.length != undefined){
+            this.$modal.confirm('编号为"' + deid + '"的红外输出关联了红外辐射输出，确定是否删除编号为"' + ids + '"的数据项？').then(() => {
+              return delInfraredOut(ids);
+            }).then(() => {
+                this.getList();
+                this.$modal.msgSuccess("删除成功");
+            }).catch(() => {});
+          }
+          else{
+            this.$modal.confirm('编号为"' + ids + '"的红外输出关联了红外辐射输出，确定是否删除？').then(function(){
+              return delInfraredOut(ids);
+            }).then(() => {
+              this.getList();
+              this.$modal.msgSuccess("删除成功");
+            }).catch(() => {});
+          }
+          
+            }
+            else{
+              this.$modal.confirm('是否确认删除红外辐射输出编号为"' + ids + '"的数据项？').then(function() {
+                  return delInfraredOut(ids);
+                }).then(() => {
+                  this.getList();
+                  this.$modal.msgSuccess("删除成功");
+                }).catch(() => {});
+      }
+      });
+
     },
+
     /** 导出按钮操作 */
     handleExport() {
 

fidms-ui/src/views/data/model/index.vue

@@ -210,6 +210,7 @@ export default {
   },
   created() {
     this.getList();
+    
 
   },
   methods: {
@@ -392,7 +393,10 @@ export default {
     openFolder(path){
       
       getFolder(path);
-    }
+    },
+    // getOption() {
+    //   getInfraredOutputID().then(resp=>{this.infraredOutputOption = resp.data})
+    // },
   }
 };
 </script>

fidms-ui/src/views/data/radiation/index.vue

@@ -0,0 +1,450 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="180px">
+      <!-- <el-form-item label="对应红外输出编号" prop="infraredOutputId">
+        <el-input
+          v-model="queryParams.infraredOutputId"
+          placeholder="请输入对应红外输出编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <el-form-item label="红外辐射强度[W/Sr]" prop="radiationIntensity">
+        <el-input
+          v-model="queryParams.radiationIntensity"
+          placeholder="请输入红外辐射强度[W/Sr]"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="固体红外辐射强度[W/Sr]" prop="solidInfraredRadiation">
+        <el-input
+          v-model="queryParams.solidInfraredRadiation"
+          placeholder="请输入固体红外辐射强度[W/Sr]"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <!-- <el-form-item label="气体红外辐射强度[W/Sr]" prop="gasInfraredRadiation">
+        <el-input
+          v-model="queryParams.gasInfraredRadiation"
+          placeholder="请输入气体红外辐射强度[W/Sr]"
+          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>
+      </el-form-item>
+    </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="['data:radiation:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['data:radiation:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['data:radiation:remove']"
+        >删除</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['data:radiation:export']"
+        >导出</el-button>
+      </el-col> -->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="radiationList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="对应红外输出编号" align="center" prop="infraredOutputId" />
+      <el-table-column label="红外辐射强度[W/Sr]" align="center" prop="radiationIntensity" />
+      <el-table-column label="红外图像" align="center" prop="infraredImagePath">
+        <template slot-scope="scope">
+        <el-button v-if="scope.row.infraredImagePath !== null"
+            size="mini"
+            type="text"
+            @click="openFolder(scope.row.infraredImagePath)"
+            icon="el-icon-folder-opened"
+            v-hasPermi="['data:infraredOut:edit']">
+          {{getFileName(scope.row.infraredImagePath)}}
+        </el-button>
+        <el-button v-if="scope.row.infraredImagePath !== null"
+            size="mini"
+            type="text"
+            icon="el-icon-download"
+            @click="downloadfile(scope.row.infraredImagePath)"
+            v-hasPermi="['data:infraredOut:edit']"
+          >{{ getFileName(scope.row.infraredImagePath) }}
+          </el-button>
+          <image-preview v-if="scope.row.infraredImagePath !== null" :src="scope.row.infraredImagePath" :width="30" :height="30" ></image-preview>
+      </template>
+      </el-table-column>
+      
+      <el-table-column label="固体红外辐射强度[W/Sr]" align="center" prop="solidInfraredRadiation" />
+      <el-table-column label="气体红外辐射强度[W/Sr]" align="center" prop="gasInfraredRadiation" />
+      <el-table-column label="红外光谱辐射强度分布图" align="center" prop="infraredspectrumDistribution">
+        <template slot-scope="scope">
+        <el-button v-if="scope.row.infraredspectrumDistribution !== null"
+            size="mini"
+            type="text"
+            @click="openFolder(scope.row.infraredspectrumDistribution)"
+            icon="el-icon-folder-opened"
+            v-hasPermi="['data:infraredOut:edit']">
+          {{getFileName(scope.row.infraredspectrumDistribution)}}
+        </el-button>
+        <el-button v-if="scope.row.infraredspectrumDistribution !== null"
+            size="mini"
+            type="text"
+            icon="el-icon-download"
+            @click="downloadfile(scope.row.infraredspectrumDistribution)"
+            v-hasPermi="['data:infraredOut:edit']"
+          >{{ getFileName(scope.row.infraredspectrumDistribution) }}
+          </el-button>
+          <image-preview v-if="scope.row.infraredspectrumDistribution !== null" :src="scope.row.infraredspectrumDistribution" :width="30" :height="30" ></image-preview>
+      </template>
+      </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-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['data:radiation:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['data:radiation:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改红外辐射输出对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="580px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="170px">
+        <el-form-item label="对应红外输出编号" prop="infraredOutputId">
+          <el-select v-model="form.infraredOutputId" placeholder="请输入对应红外输出编号">
+            <el-option v-for="item in infraredOutputOption"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+          
+
+        <el-form-item label="红外辐射强度[W/Sr]" prop="radiationIntensity">
+          <el-input v-model="form.radiationIntensity" placeholder="请输入红外辐射强度[W/Sr]" />
+        </el-form-item>
+        <el-form-item label="红外图像" prop="infraredImagePath">
+          <file-upload v-model="form.infraredImagePath" :fileType="imageType" :fileSize="2048" :limit="1"/>
+        </el-form-item>
+        <el-form-item label="固体红外辐射强度[W/Sr]" prop="solidInfraredRadiation">
+          <el-input v-model="form.solidInfraredRadiation" placeholder="请输入固体红外辐射强度[W/Sr]" />
+        </el-form-item>
+        <el-form-item label="气体红外辐射强度[W/Sr]" prop="gasInfraredRadiation">
+          <el-input v-model="form.gasInfraredRadiation" placeholder="请输入气体红外辐射强度[W/Sr]" />
+        </el-form-item>
+        <el-form-item label="红外光谱辐射强度分布图" prop="infraredspectrumDistribution">
+          <file-upload v-model="form.infraredspectrumDistribution" :fileType="imageType" :fileSize="2048" :limit="1"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listRadiation, getRadiation, delRadiation, addRadiation, updateRadiation } from "@/api/data/radiation";
+import { getFolder } from "@/api/data/infraredOut";
+import { getInfraredOutputID }from "@/api/data/infraredOut";
+
+export default {
+  name: "Radiation",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 红外辐射输出表格数据
+      radiationList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        infraredOutputId: null,
+        radiationIntensity: null,
+        solidInfraredRadiation: null,
+        gasInfraredRadiation: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        infraredOutputId:[
+        { required: true, message: "红外输出编号不能为空", trigger: "change" }
+        ],
+        infraredImagePath:[
+          { required: true, message: "红外图像不能为空", trigger: "blur" }
+        ],
+        radiationIntensity: [
+          {
+            validator: (rule, value, callback) => {
+              if (value === '' || value === null) { // 允许空值通过验证
+                callback();
+              } else {
+                const machNumberRegex = /^\d{1,10}(\.\d{1,6})?$/; // 匹配DECIMAL(16,6)格式的正则表达式
+                if (!machNumberRegex.test(value)) {
+                  callback(new Error('红外辐射强度格式不正确，应为DECIMAL(16,6)格式'));
+                } else {
+                  callback();
+                }
+              }
+            },
+            trigger: 'change'
+          }
+        ],
+
+        solidInfraredRadiation: [
+          {
+            validator: (rule, value, callback) => {
+              if (value === '' || value === null) { // 允许空值通过验证
+                callback();
+              } else {
+                const machNumberRegex = /^\d{1,10}(\.\d{1,6})?$/; // 匹配DECIMAL(16,6)格式的正则表达式
+                if (!machNumberRegex.test(value)) {
+                  callback(new Error('固体红外辐射强度格式不正确，应为DECIMAL(16,6)格式'));
+                } else {
+                  callback();
+                }
+              }
+            },
+            trigger: 'change'
+          }
+        ],
+
+        gasInfraredRadiation: [
+          {
+            validator: (rule, value, callback) => {
+              if (value === '' || value === null) { // 允许空值通过验证
+                callback();
+              } else {
+                const machNumberRegex = /^\d{1,10}(\.\d{1,6})?$/; // 匹配DECIMAL(16,6)格式的正则表达式
+                if (!machNumberRegex.test(value)) {
+                  callback(new Error('气体红外辐射强度格式不正确，应为DECIMAL(16,6)格式'));
+                } else {
+                  callback();
+                }
+              }
+            },
+            trigger: 'change'
+          }
+        ],
+      
+      },
+      infraredOutputOption:[],
+      imageType:['jpg','png']
+    };
+  },
+  created() {
+    this.getList();
+    this.getOption();
+  },
+  methods: {
+    /** 查询红外辐射输出列表 */
+    getList() {
+      this.loading = true;
+      listRadiation(this.queryParams).then(response => {
+        this.radiationList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        infraredOutputId: null,
+        radiationIntensity: null,
+        infraredImagePath: null,
+        solidInfraredRadiation: null,
+        gasInfraredRadiation: null,
+        infraredspectrumDistribution: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      if (this.queryParams.radiationIntensity &&!this.isDecimalFormat(this.queryParams.radiationIntensity)) {
+        this.$modal.msgError("红外辐射强度格式不正确，请输入DECIMAL(16,6)格式数据");
+        return;
+      }
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加红外辐射输出";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getRadiation(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改红外辐射输出";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateRadiation(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addRadiation(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              console.log(this.form)
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除红外辐射输出编号为"' + ids + '"的数据项？').then(function() {
+        return delRadiation(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('data/radiation/export', {
+        ...this.queryParams
+      }, `radiation_${new Date().getTime()}.xlsx`)
+    },
+    getFileName(path) {
+      if (!path) {
+        return ''
+      } else if (path.lastIndexOf("/") > -1) {
+        const newName = path.slice(path.lastIndexOf("/") + 1)
+        const names = newName.split(".")
+        if ((names.size = 2) && (names[0].length > 19)) {
+          return newName.substring(0, names[0].length - 19) + '.' + names[1]
+        } else {
+          return newName
+        }
+      } else {
+        return '';
+      }
+    },
+    downloadfile(path) {
+      this.$download.resource(path);
+    },
+    openFolder(path){
+     
+     getFolder(path);
+   },
+   isDecimalFormat(value) {
+      const decimalRegex = /^\d{1,16}(\.\d{1,6})?$/;
+      return value === '' || decimalRegex.test(value);
+    },
+    getOption() {
+      getInfraredOutputID().then(resp=>{this.infraredOutputOption = resp.data})
+    },
+  }
+};
+</script>

sql/ry_20230223.sql

@@ -1184,4 +1184,56 @@ ALTER TABLE bz_infrared_output_t
     ADD COLUMN gas_infrared_radiation DECIMAL ( 20, 6 ) COMMENT '气体红外辐射强度[W/Sr]';
 
 ALTER TABLE bz_infrared_output_t
-    ADD COLUMN infrared_spectrum_distribution VARCHAR ( 511 ) COMMENT '红外光谱辐射强度分布图';
+    ADD COLUMN infrared_spectrum_distribution VARCHAR ( 511 ) COMMENT '红外光谱辐射强度分布图';
+
+-- ----------------------------
+-- 24、红外辐射输出表
+-- ----------------------------
+DROP TABLE
+    IF
+    EXISTS bz_infrared_radiation_t;
+CREATE TABLE bz_infrared_radiation_t (
+    id BIGINT ( 20 ) NOT NULL auto_increment COMMENT '编号',
+    infrared_output_id BIGINT ( 20 ) COMMENT '对应红外输出编号',
+    radiation_intensity DECIMAL ( 20, 6 ) COMMENT '红外辐射强度[W/Sr]',
+    infrared_image_path  VARCHAR ( 511 ) COMMENT '红外图像输出路径',
+    solid_infrared_radiation DECIMAL ( 20, 6 ) COMMENT '固体红外辐射强度[W/Sr]',
+    gas_infrared_radiation DECIMAL ( 20, 6 ) COMMENT '气体红外辐射强度[W/Sr]',
+    infrared_spectrum_distribution VARCHAR ( 511 ) COMMENT '红外光谱辐射强度分布图',
+    create_by VARCHAR ( 64 ) DEFAULT '' COMMENT '创建者',
+    create_time datetime COMMENT '创建时间',
+    update_by VARCHAR ( 64 ) DEFAULT '' COMMENT '更新者',
+    update_time datetime COMMENT '更新时间',
+    PRIMARY KEY ( id )
+) ENGINE = INNODB auto_increment = 1 COMMENT = '红外辐射输出表';
+
+
+-- 菜单 SQL
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('红外辐射输出', '0', '1', 'radiation', 'data/radiation/index', 1, 0, 'C', '0', '0', 'data:radiation:list', '#', 'admin', sysdate(), '', null, '红外辐射输出菜单');
+
+-- 按钮父菜单ID
+SELECT @parentId := LAST_INSERT_ID();
+
+-- 按钮 SQL
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('红外辐射输出查询', @parentId, '1',  '#', '', 1, 0, 'F', '0', '0', 'data:radiation:query',        '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('红外辐射输出新增', @parentId, '2',  '#', '', 1, 0, 'F', '0', '0', 'data:radiation:add',          '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('红外辐射输出修改', @parentId, '3',  '#', '', 1, 0, 'F', '0', '0', 'data:radiation:edit',         '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('红外辐射输出删除', @parentId, '4',  '#', '', 1, 0, 'F', '0', '0', 'data:radiation:remove',       '#', 'admin', sysdate(), '', null, '');
+
+insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('红外辐射输出导出', @parentId, '5',  '#', '', 1, 0, 'F', '0', '0', 'data:radiation:export',       '#', 'admin', sysdate(), '', null, '');
+
+
+ALTER TABLE bz_infrared_output_t DROP COLUMN radiation_intensity;
+ALTER TABLE bz_infrared_output_t DROP COLUMN infrared_image_path;
+ALTER TABLE bz_infrared_output_t DROP COLUMN solid_infrared_radiation;
+ALTER TABLE bz_infrared_output_t DROP COLUMN gas_infrared_radiation;
+ALTER TABLE bz_infrared_output_t DROP COLUMN infrared_spectrum_distribution;