export all data to excel

fidms-admin/src/main/java/com/fidms/FidmsApplication.java

@@ -1,8 +1,12 @@
 package com.fidms;
 
+import javafx.application.Application;
+import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.context.ConfigurableApplicationContext;
 
 /**
  * 启动程序

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

@@ -5,16 +5,22 @@ import com.fidms.common.core.controller.BaseController;
 import com.fidms.common.core.domain.AjaxResult;
 import com.fidms.common.core.page.TableDataInfo;
 import com.fidms.common.enums.BusinessType;
+import com.fidms.common.utils.FolderUtils;
+import com.fidms.common.utils.file.FileUploadUtils;
 import com.fidms.common.utils.poi.ExcelUtil;
-import com.fidms.web.domain.InfraredOutput;
-import com.fidms.web.service.IInfraredOutputService;
+import com.fidms.web.domain.*;
+import com.fidms.web.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
 import java.util.List;
 
+import static javax.swing.UIManager.get;
+
 /**
  * 红外输出Controller
  * 
@@ -27,6 +33,14 @@ public class InfraredOutputController extends BaseController
 {
     @Autowired
     private IInfraredOutputService infraredOutputService;
+    @Autowired
+    private IInfraredInputService infraredInputService;
+    @Autowired
+    private IFlowFieldOutputService flowFieldOutputService;
+    @Autowired
+    private IFlowFieldInputService flowFieldInputService;
+    @Autowired
+    private IModel3dService model3dService;
 
     /**
      * 查询红外输出列表
@@ -46,11 +60,27 @@ public class InfraredOutputController extends BaseController
     @PreAuthorize("@ss.hasPermi('data:infraredOut:export')")
     @Log(title = "红外输出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, InfraredOutput infraredOutput)
-    {
+    public void export(HttpServletResponse response, InfraredOutput infraredOutput) throws IllegalAccessException {
         List<InfraredOutput> list = infraredOutputService.selectInfraredOutputList(infraredOutput);
-        ExcelUtil<InfraredOutput> util = new ExcelUtil<InfraredOutput>(InfraredOutput.class);
-        util.exportExcel(response, list, "红外输出数据");
+        List<ExportAll> listAll = new ArrayList<ExportAll>();
+        for(InfraredOutput infraredout:list) {
+            InfraredInput infraredin = infraredInputService.selectInfraredInputById(infraredout.getInfraredInputID());
+            FlowFieldOutput flowout = flowFieldOutputService.selectFlowFieldOutputById(infraredin.getFlowFieldOutputID());
+            FlowFieldInput flowin = flowFieldInputService.selectFlowFieldInputById(flowout.getFlowFieldInputID());
+            Model3d model3d = model3dService.selectModel3dById(flowin.getModel3dId());
+
+            ExportAll exportall = new ExportAll();
+            exportall.getinfraredoutData(infraredout);
+            exportall.getinfraredinData(infraredin);
+            exportall.getFlowfieldoutData(flowout);
+            exportall.getFlowfieldinData(flowin);
+            exportall.getModel3dData(model3d);
+
+            listAll.add(exportall);
+        }
+
+        ExcelUtil<ExportAll> util = new ExcelUtil<ExportAll>(ExportAll.class);
+        util.exportExcel(response, listAll, "红外输出数据");
     }
 
     /**
@@ -98,4 +128,28 @@ public class InfraredOutputController extends BaseController
     {
         return toAjax(infraredOutputService.deleteInfraredOutputByIds(ids));
     }
+
+    /**
+     * 打开文件夹
+     * */
+    @PreAuthorize("@ss.hasPermi('data:infraredOut:openFolder')")
+    @PostMapping("/folder")
+    public void getFolder(@RequestParam String path) throws IOException {
+        FolderUtils Folder = new FolderUtils();
+        FileUploadUtils file = new FileUploadUtils();
+        String dir="";
+
+        String str = path.substring(1,8);
+        if(str.compareTo("profile")==0)
+        {
+            dir = file.getDefaultBaseDir();
+            dir += path.substring(8);
+        }
+        else
+        {
+            dir = path;
+        }
+        Folder.openFolder(dir);
+    }
+
 }

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

@@ -0,0 +1,266 @@
+package com.fidms.web.domain;
+
+import com.fidms.common.annotation.Excel;
+import com.fidms.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.math.BigDecimal;
+
+public class ExportAll extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+    public InfraredOutput infraredout;
+    public InfraredInput infraredin;
+
+    /** 编号 */
+    @Excel(name="红外输出编号")
+    public Long id;
+
+    /**对应红外输入编号*/
+    @Excel(name="对应红外输入编号")
+    public Long infraredInputID;
+
+
+    /** 文件输出路径 */
+    @Excel(name = "文件输出路径")
+    public String outputFilePath;
+
+    /** 红外辐射强度 */
+    @Excel(name = "红外辐射强度")
+    public BigDecimal radiationIntensity;
+
+    /** 红外图像路径 */
+    @Excel(name = "红外图像",width = 25,height = 125,cellType= Excel.ColumnType.IMAGE)
+    public String infraredImagePath;
+
+    public void getinfraredoutData(InfraredOutput infraredout)
+    {
+        id = infraredout.getId();
+        infraredInputID = infraredout.getInfraredInputID();
+        outputFilePath = infraredout.getOutputFilePath();
+        radiationIntensity = infraredout.getRadiationIntensity();
+        infraredImagePath = infraredout.getInfraredImagePath();
+    }
+
+    @Excel(name="对应流场输出编号")
+    public Long flowFieldOutputID;
+
+    /** 完好发射率 */
+    @Excel(name = "完好发射率")
+    public BigDecimal FullLaunchRate;
+
+    /** 损伤发射率 */
+    @Excel(name = "损伤发射率")
+    public BigDecimal DamageLaunchRate;
+
+    /** 损伤区域 */
+    @Excel(name = "损伤区域")
+    public String DamageArea;
+
+    /** 损伤面积比 */
+    @Excel(name = "损伤面积比")
+    public BigDecimal DamageAreaRatio;
+
+    /** 表面状态说明 */
+    @Excel(name = "表面状态说明")
+    public String SurfaceDescription;
+
+    /** 探测距离*/
+    @Excel(name = "探测距离")
+    public BigDecimal DetectDistance;
+
+    /** 探测方位角 */
+    @Excel(name = "探测方位角")
+    public BigDecimal DetectAngle;
+
+    /** 红外波段 */
+    @Excel(name = "红外波段")
+    public BigDecimal InfraredBand;
+
+    public void getinfraredinData(InfraredInput infraredin)
+    {
+        flowFieldOutputID = infraredin.getFlowFieldOutputID();
+        FullLaunchRate = infraredin.getFullLaunchRate();
+        DamageLaunchRate = infraredin.getDamageLaunchRate();
+        DamageArea =infraredin.getDamageArea();
+        DamageAreaRatio = infraredin.getDamageAreaRatio();
+        SurfaceDescription = infraredin.getSurfaceDescription();
+        DetectDistance=infraredin.getDetectDistance();
+        DetectAngle=infraredin.getDetectAngle();
+        InfraredBand=infraredin.getInfraredBand();
+    }
+
+    /**对应流场输入编号*/
+    @Excel(name = "对应流场输入编号")
+    public Long flowFieldInputID;
+
+    /** 是否为结构网格 */
+    @Excel(name = "是否为结构网格")
+    public Boolean isStructureGrid;
+
+    /** 网格数 */
+    @Excel(name = "网格数")
+    public BigDecimal gridNumber;
+
+    /** 迭代步数*/
+    @Excel(name = "迭代步数")
+    public BigDecimal iterationSteps;
+
+    /** cas文件输出路径 */
+    @Excel(name = "cas文件输出")
+    public String casOutputFilePath;
+
+    /** dat文件输出路径 */
+    @Excel(name = "dat文件输出")
+    public String datOutputFilePath;
+
+    /** other文件输出路径 */
+    @Excel(name = "other文件输出")
+    public String otherOutputFilePath;
+
+    /**表面温度分布图路径*/
+    @Excel(name="表面温度分布图",width = 25,height = 125,cellType= Excel.ColumnType.IMAGE)
+    public String temperatureImagePath;
+
+    /**表面速度分布图路径*/
+    @Excel(name="表面速度分布图",width = 25,height = 125,cellType= Excel.ColumnType.IMAGE)
+    public String velocityImagePath;
+
+    /**表面压力分布图路径*/
+    @Excel(name="表面压力分布图",width = 25,height = 125,cellType= Excel.ColumnType.IMAGE)
+    public String pressureImagePath;
+
+    public void getFlowfieldoutData(FlowFieldOutput flowfieldout){
+        flowFieldInputID = flowfieldout.getFlowFieldInputID();
+        isStructureGrid = flowfieldout.getIsStructureGrid();
+        gridNumber = flowfieldout.getGridNumber();
+        iterationSteps = flowfieldout.getIterationSteps();
+        casOutputFilePath = flowfieldout.getCasOutputFilePath();
+        datOutputFilePath = flowfieldout.getDatOutputFilePath();
+        otherOutputFilePath = flowfieldout.getOtherOutputFilePath();
+        temperatureImagePath = flowfieldout.getTemperatureImagePath();
+        velocityImagePath=flowfieldout.getVelocityImagePath();
+        pressureImagePath=flowfieldout.getPressureImagePath();
+    }
+
+    /** 3d模型主键 */
+    @Excel(name = "3d模型主键")
+    public Long model3dId;
+
+    @Excel(name = "3d模型")
+    public String model3dName;
+
+    /** 来流马赫数*/
+    @Excel(name = "来流马赫数")
+    public BigDecimal machNumber;
+
+    /** 来流方向x */
+    @Excel(name = "来流方向x")
+    public BigDecimal flowDirectionX;
+
+    /** 来流方向y */
+    @Excel(name = "来流方向y")
+    public BigDecimal flowDirectionY;
+
+    /** 来流方向z */
+    @Excel(name = "来流方向z")
+    public BigDecimal flowDirectionZ;
+
+    /** 流速x */
+    @Excel(name = "流速x")
+    public BigDecimal flowVelocityX;
+
+    /** 流速y */
+    @Excel(name = "流速y")
+    public BigDecimal flowVelocityY;
+
+    /** 流速z */
+    @Excel(name = "流速z")
+    public BigDecimal flowVelocityZ;
+
+    /**红外波段*/
+    @Excel(name = "红外波段")
+    public BigDecimal infraredBand;
+
+    /** 来流温度 */
+    @Excel(name = "来流温度")
+    public BigDecimal flowTemperature;
+
+    /** 来流静压 */
+    @Excel(name = "来流静压")
+    public BigDecimal flowPressure;
+
+    /** 来流密度 */
+    @Excel(name = "来流密度")
+    public BigDecimal flowDensity;
+
+    /** 飞行高度 */
+    @Excel(name = "飞行高度")
+    public BigDecimal flightAltitude;
+
+    /** 二氧化碳质量分数 */
+    @Excel(name = "二氧化碳质量分数")
+    public BigDecimal co2MassFraction;
+
+    /** 一氧化碳质量分数 */
+    @Excel(name = "一氧化碳质量分数")
+    public BigDecimal coMassFraction;
+
+    /** 水蒸气质量分数 */
+    @Excel(name = "水蒸气质量分数")
+    public BigDecimal h2oMassFraction;
+
+    /** Fluent网格文件路径 */
+    @Excel(name = "Fluent网格文件")
+    public String fluentGridFilePath;
+
+    /** Fluent cas文件路径 */
+    @Excel(name = "Fluent cas文件")
+    public String fluentCasFilePath;
+
+    /** Fluent dat文件 */
+    @Excel(name = "Fluent dat文件")
+    public String fluentDatFilePath;
+
+    public void getFlowfieldinData(FlowFieldInput flowfieldin){
+        model3dId = flowfieldin.getModel3dId();
+        model3dName = flowfieldin.getModel3dName();
+        machNumber = flowfieldin.getMachNumber();
+        flowDirectionX = flowfieldin.getFlowDirectionX();
+        flowDirectionY = flowfieldin.getFlowDirectionY();
+        flowDirectionZ = flowfieldin.getFlowDirectionZ();
+        flowVelocityX = flowfieldin.getFlowVelocityX();
+        flowVelocityY = flowfieldin.getFlowVelocityY();
+        flowVelocityZ = flowfieldin.getFlowVelocityZ();
+        infraredBand = flowfieldin.getInfraredBand();
+        flowTemperature = flowfieldin.getFlowTemperature();
+        flowPressure = flowfieldin.getFlowPressure();
+        flowDensity = flowfieldin.getFlowDensity();
+        flightAltitude = flowfieldin.getFlightAltitude();
+        co2MassFraction = flowfieldin.getCo2MassFraction();
+        coMassFraction = flowfieldin.getCoMassFraction();
+        h2oMassFraction = flowfieldin.getH2oMassFraction();
+        fluentCasFilePath = flowfieldin.getFluentCasFilePath();
+        fluentGridFilePath = flowfieldin.getFluentGridFilePath();
+        fluentDatFilePath = flowfieldin.getFluentDatFilePath();
+    }
+
+    /** 3D模型名称 */
+    @Excel(name = "3D模型名称")
+    public String name;
+
+    /**飞机类型*/
+    @Excel(name="飞机类型")
+    public String aircraftType;
+
+    /** 3d模型文件名称路径 */
+    @Excel(name = "3D模型文件")
+    public String model3dFilePath;
+
+    public void getModel3dData(Model3d model3d){
+        name = model3d.getName();
+        aircraftType = model3d.getAircraftType();
+        model3dFilePath = model3d.getModel3dFilePath();
+    }
+
+}

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

@@ -20,6 +20,10 @@ public class InfraredInput extends BaseEntity
     /** 编号 */
     private Long id;
 
+    /**对应流场输出编号*/
+    @Excel(name="对应流场输出编号")
+    private Long flowFieldOutputID;
+
     /** 完好发射率 */
     @Excel(name = "完好发射率")
     private BigDecimal FullLaunchRate;
@@ -62,6 +66,9 @@ public class InfraredInput extends BaseEntity
         return id;
     }
 
+    public Long getFlowFieldOutputID(){return flowFieldOutputID;}
+    public void setFlowFieldOutputID(Long flowFieldOutputID){this.flowFieldOutputID = flowFieldOutputID;}
+
     public void setFullLaunchRate(BigDecimal FullLaunchRate)
     {
         this.FullLaunchRate = FullLaunchRate;
@@ -134,6 +141,7 @@ public class InfraredInput extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
+            .append("flowFieldOutputID",getFlowFieldOutputID())
             .append("FullLaunchRate", getFullLaunchRate())
             .append("DamageLaunchRate", getDamageLaunchRate())
             .append("DamageArea", getDamageArea())

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

@@ -20,10 +20,6 @@ public class InfraredOutput extends BaseEntity
     /** 编号 */
     private Long id;
 
-    /**对应流场输出编号*/
-    @Excel(name="对应流场输出编号")
-    private Long flowFieldOutputID;
-
     /**对应红外输入编号*/
     @Excel(name="对应红外输入编号")
     private Long infraredInputID;
@@ -41,11 +37,11 @@ public class InfraredOutput extends BaseEntity
     private BigDecimal radiationIntensity;
 
     /** 红外图像 */
-    @Excel(name = "红外图像")
+    //@Excel(name = "红外图像")
     private String infraredImage;
 
     /** 红外图像路径 */
-    @Excel(name = "红外图像路径",width = 25,height = 125,cellType= Excel.ColumnType.IMAGE)
+    @Excel(name = "红外图像",width = 25,height = 125,cellType= Excel.ColumnType.IMAGE)
     private String infraredImagePath;
 
     public void setId(Long id) 
@@ -57,8 +53,6 @@ public class InfraredOutput extends BaseEntity
     {
         return id;
     }
-    public Long getFlowFieldOutputID(){return flowFieldOutputID;}
-    public void setFlowFieldOutputID(Long flowFieldOutputID){this.flowFieldOutputID = flowFieldOutputID;}
 
     public Long getInfraredInputID(){return infraredInputID;}
     public void setInfraredInputID(Long infraredInputID){this.infraredInputID = infraredInputID;}
@@ -102,7 +96,6 @@ public class InfraredOutput extends BaseEntity
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
-            .append("flowFieldOutputID",getFlowFieldOutputID())
             .append("infraredInputID",getInfraredInputID())
             .append("outputFile", getOutputFile())
             .append("outputFilePath", getOutputFilePath())

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

@@ -16,6 +16,7 @@ public class Model3d extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 编号 */
+    @Excel(name = "编号")
     private Long id;
 
     /** 3D模型名称 */
@@ -27,11 +28,11 @@ public class Model3d extends BaseEntity
     private String aircraftType;
 
     /** 3d模型文件名称 */
-    @Excel(name = "3D模型文件名称")
+    //@Excel(name = "3D模型文件名称")
     private String model3dFile;
 
     /** 3d模型文件名称路径 */
-    @Excel(name = "3D模型文件名称路径")
+    @Excel(name = "3D模型文件名称")
     private String model3dFilePath;
 
     public void setId(Long id) 

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

@@ -59,9 +59,9 @@ spring:
   servlet:
      multipart:
        # 单个文件大小
-       max-file-size:  10MB
+       max-file-size:  2000MB
        # 设置总上传的文件大小
-       max-request-size:  20MB
+       max-request-size:  2000MB
   # 服务模块
   devtools:
     restart:

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

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="InfraredInput" id="InfraredInputResult">
         <result property="id"    column="id"    />
+        <result property="flowFieldOutputID" column="flow_field_output_id"/>
         <result property="FullLaunchRate"    column="full_launch_rate"    />
         <result property="DamageLaunchRate"    column="damage_launch_rate"    />
         <result property="DamageArea"    column="damage_area"    />
@@ -21,12 +22,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectInfraredInputVo">
-        select id, full_launch_rate, damage_launch_rate, damage_area, damage_area_ratio, surface_description, detect_distance, detect_angle,infrared_band, create_by, create_time, update_by, update_time from bz_infrared_input_t
+        select id, flow_field_output_id,full_launch_rate, damage_launch_rate, damage_area, damage_area_ratio, surface_description, detect_distance, detect_angle,infrared_band, create_by, create_time, update_by, update_time from bz_infrared_input_t
     </sql>
 
     <select id="selectInfraredInputList" parameterType="InfraredInput" resultMap="InfraredInputResult">
         <include refid="selectInfraredInputVo"/>
         <where>
+            <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>
@@ -46,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertInfraredInput" parameterType="InfraredInput" useGeneratedKeys="true" keyProperty="id">
         insert into bz_infrared_input_t
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="flowFieldOutputID != null">flow_field_output_id,</if>
             <if test="FullLaunchRate != null">full_launch_rate,</if>
             <if test="DamageLaunchRate != null">damage_launch_rate,</if>
             <if test="DamageArea != null">damage_area,</if>
@@ -60,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="flowFieldOutputID !=null">#{flowFieldOutputID},</if>
             <if test="FullLaunchRate != null">#{FullLaunchRate},</if>
             <if test="DamageLaunchRate != null">#{DamageLaunchRate},</if>
             <if test="DamageArea != null">#{DamageArea},</if>
@@ -78,6 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateInfraredInput" parameterType="InfraredInput">
         update bz_infrared_input_t
         <trim prefix="SET" suffixOverrides=",">
+            <if test="flowFieldOutputID != null">flow_field_output_id= #{flowFieldOutputID},</if>
             <if test="FullLaunchRate != null">full_launch_rate = #{FullLaunchRate},</if>
             <if test="DamageLaunchRate != null">damage_launch_rate = #{DamageLaunchRate},</if>
             <if test="DamageArea != null">damage_area = #{DamageArea},</if>

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

@@ -6,7 +6,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="InfraredOutput" id="InfraredOutputResult">
         <result property="id"    column="id"    />
-        <result property="flowFieldOutputID" column="flow_field_output_id"/>
         <result property="infraredInputID" column="infrared_input_id"/>
         <result property="outputFile"    column="output_file"    />
         <result property="outputFilePath"    column="output_file_path"    />
@@ -20,13 +19,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectInfraredOutputVo">
-        select id, flow_field_output_id,infrared_input_id,output_file, output_file_path, radiation_intensity, 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, radiation_intensity, infrared_image,infrared_image_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="flowFieldOutputID != null">and flow_field_output_id=#{flowFieldOutputID},</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>
@@ -35,7 +33,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="infraredImagePath != null  and infraredImagePath != ''"> and infrared_image_path = #{infraredImagePath}</if>
         </where>
     </select>
-    
     <select id="selectInfraredOutputById" parameterType="Long" resultMap="InfraredOutputResult">
         <include refid="selectInfraredOutputVo"/>
         where id = #{id}
@@ -44,7 +41,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertInfraredOutput" parameterType="InfraredOutput" useGeneratedKeys="true" keyProperty="id">
         insert into bz_infrared_output_t
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="flowFieldOutputID != null">flow_field_output_id,</if>
             <if test="infraredInputID != null">infrared_input_id,</if>
             <if test="outputFile != null">output_file,</if>
             <if test="outputFilePath != null">output_file_path,</if>
@@ -57,7 +53,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="flowFieldOutputID !=null">#{flowFieldOutputID},</if>
             <if test="infraredInputID != null">#{infraredInputID},</if>
             <if test="outputFile != null">#{outputFile},</if>
             <if test="outputFilePath != null">#{outputFilePath},</if>
@@ -74,7 +69,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateInfraredOutput" parameterType="InfraredOutput">
         update bz_infrared_output_t
         <trim prefix="SET" suffixOverrides=",">
-            <if test="flowFieldOutputID != null">flow_field_output_id= #{flowFieldOutputID},</if>
             <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>

fidms-common/src/main/java/com/fidms/common/utils/FolderUtils.java

@@ -16,6 +16,8 @@ public class FolderUtils {
         // 指定要打开的文件夹路径
         File folder = new File(path);
 
+        //打开桌面程序调用 默认不支持
+        System.setProperty("java.awt.headless", "false");
         // 检查桌面是否支持打开文件夹操作
         if (Desktop.isDesktopSupported()) {
             Desktop desktop = Desktop.getDesktop();

fidms-common/src/main/java/com/fidms/common/utils/file/FileUploadUtils.java

@@ -25,7 +25,7 @@ public class FileUploadUtils
     /**
      * 默认大小 50M
      */
-    public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024;
+    public static final long DEFAULT_MAX_SIZE = 2000 * 1024 * 1024;
 
     /**
      * 默认的文件名最大长度 100

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

@@ -49,3 +49,11 @@ export function getFlowFieldOutputID(){
       method:'get'
     })
 }
+
+//打开文件夹
+export function getFolder(data) {
+  return request({
+    url: '/data/infraredOut/folder?path='+data,
+    method: 'post',
+  })
+}

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

@@ -42,3 +42,11 @@ export function delInfraredOut(id) {
     method: 'delete'
   })
 }
+
+//打开文件夹
+export function getFolder(data) {
+  return request({
+    url: '/data/infraredOut/folder?path='+data,
+    method: 'post',
+  })
+}

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

@@ -49,3 +49,11 @@ export function getModelOption() {
     method: 'get'
   })
 }
+
+//打开文件夹
+export function getFolder(data) {
+  return request({
+    url: '/data/infraredOut/folder?path='+data,
+    method: 'post',
+  })
+}

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

@@ -19,7 +19,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="来流方向x" prop="flowDirectionX">
+      <!--<el-form-item label="来流方向x" prop="flowDirectionX">
         <el-input
           v-model="queryParams.flowDirectionX"
           placeholder="请输入来流方向x"
@@ -66,7 +66,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="红外波段" prop="infraredBand">
         <el-input
         v-model="queryParams.infraredBand"
@@ -108,7 +108,7 @@
         @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="二氧化碳质量分数" prop="co2MassFraction">
+      <!--<el-form-item label="二氧化碳质量分数" prop="co2MassFraction">
         <el-input
           v-model="queryParams.co2MassFraction"
           placeholder="请输入二氧化碳质量分数"
@@ -131,7 +131,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </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>
@@ -239,9 +239,10 @@
     />
 
     <!-- 添加或修改流场输入对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
-        <el-form-item label="3D模型" prop="model3dId">
+    <el-dialog :title="title" :visible.sync="open" width="650px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+          <el-form-item label="3D模型" prop="model3dId">
           <el-select v-model="form.model3dId" placeholder="请选择3D模型">
             <el-option
               v-for="item in modelOption"
@@ -250,55 +251,85 @@
               :value="item.id">
             </el-option>
           </el-select>
-        </el-form-item>
-        <el-form-item label="来流马赫数" prop="machNumber">
-          <el-input v-model="form.machNumber" placeholder="请输入来流马赫数"/>
-        </el-form-item>
-        <el-form-item label="来流方向x" prop="flowDirectionX" >
-          <el-input v-model="form.flowDirectionX" placeholder="请输入来流方向x"/>
-        </el-form-item>
-        <el-form-item label="来流方向y" prop="flowDirectionY">
-          <el-input v-model="form.flowDirectionY" placeholder="请输入来流方向y"/>
-        </el-form-item>
-        <el-form-item label="来流方向z" prop="flowDirectionZ">
-          <el-input v-model="form.flowDirectionZ" placeholder="请输入来流方向z"/>
-        </el-form-item>
-        <!--
-        <el-form-item label="流速x" prop="flowVelocityX">
-          <el-input v-model="form.flowVelocityX" placeholder="请输入流速x" />
-        </el-form-item>
-        <el-form-item label="流速y" prop="flowVelocityY">
-          <el-input v-model="form.flowVelocityY" placeholder="请输入流速y" />
-        </el-form-item>
-        <el-form-item label="流速z" prop="flowVelocityZ">
-          <el-input v-model="form.flowVelocityZ" placeholder="请输入流速z" />
-        </el-form-item>
-        -->
-        <el-form-item label="红外波段" prop="infraredBand">
-          <el-input v-model="form.infraredBand" placeholder="请输入红外波段"/>
-        </el-form-item>
-        <el-form-item label="来流温度" prop="flowTemperature">
-          <el-input v-model="form.flowTemperature" placeholder="请输入来流温度" :controls="false" precision="6"/>
-        </el-form-item>
-        <el-form-item label="来流静压" prop="flowPressure">
-          <el-input v-model="form.flowPressure" placeholder="请输入来流静压" />
-        </el-form-item>
-        <el-form-item label="来流密度" prop="flowDensity">
-        <el-input v-model="form.flowDensity" placeholder="请输入来流密度" />
-        </el-form-item>
-        <el-form-item label="飞行高度" prop="flightAltitude">
-          <el-input v-model="form.flightAltitude" placeholder="请输入飞行高度"/>
-        </el-form-item>
-        <el-form-item label="二氧化碳质量分数" prop="co2MassFraction">
-          <el-input v-model="form.co2MassFraction" placeholder="请输入二氧化碳质量分数" :controls="false" precision="2"/>
-        </el-form-item>
-        <el-form-item label="一氧化碳质量分数" prop="coMassFraction">
-          <el-input v-model="form.coMassFraction" placeholder="请输入一氧化碳质量分数" :controls="false" precision="2"/>
-        </el-form-item>
-        <el-form-item label="水蒸气质量分数" prop="h2oMassFraction">
-          <el-input v-model="form.h2oMassFraction" placeholder="请输入水蒸气质量分数" :controls="false" precision="2"/>
-        </el-form-item>
-
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="来流马赫数" prop="machNumber">
+            <el-input v-model="form.machNumber" placeholder="请输入来流马赫数"/>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+          <el-form-item label="来流方向x" prop="flowDirectionX" >
+            <el-input v-model="form.flowDirectionX" placeholder="请输入来流方向x"/>
+          </el-form-item>
+          </el-col>
+          <el-col :span="8">
+          <el-form-item label="来流方向y" prop="flowDirectionY">
+            <el-input v-model="form.flowDirectionY" placeholder="请输入来流方向y"/>
+          </el-form-item>
+          </el-col>
+          <el-col :span="8">
+          <el-form-item label="来流方向z" prop="flowDirectionZ">
+            <el-input v-model="form.flowDirectionZ" placeholder="请输入来流方向z"/>
+          </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="流速x" prop="flowVelocityX">
+              <el-input v-model="form.flowVelocityX" placeholder="计算获取" :disabled="true"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="流速y" prop="flowVelocityY">
+              <el-input v-model="form.flowVelocityY" placeholder="计算获取" :disabled="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="流速z" prop="flowVelocityZ">
+              <el-input v-model="form.flowVelocityZ" placeholder="计算获取" :disabled="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-form-item label="红外波段" prop="infraredBand">
+            <el-input v-model="form.infraredBand" placeholder="请输入红外波段"/>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="来流温度" prop="flowTemperature">
+              <el-input v-model="form.flowTemperature" placeholder="计算获取" :disabled="true"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="来流静压" prop="flowPressure">
+              <el-input v-model="form.flowPressure" placeholder="计算获取" :disabled="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="来流密度" prop="flowDensity">
+            <el-input v-model="form.flowDensity" placeholder="计算获取" :disabled="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-form-item label="飞行高度" prop="flightAltitude">
+            <el-input v-model="form.flightAltitude" placeholder="请输入飞行高度"/>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="二氧化碳质量分数" prop="co2MassFraction">
+            <el-input v-model="form.co2MassFraction" placeholder="请输入二氧化碳质量分数" :controls="false" precision="2"/>
+          </el-form-item>
+          <el-form-item label="一氧化碳质量分数" prop="coMassFraction">
+            <el-input v-model="form.coMassFraction" placeholder="请输入一氧化碳质量分数" :controls="false" precision="2"/>
+          </el-form-item>
+          <el-form-item label="水蒸气质量分数" prop="h2oMassFraction">
+            <el-input v-model="form.h2oMassFraction" placeholder="请输入水蒸气质量分数" :controls="false" precision="2"/>
+          </el-form-item>
+        </el-row>
         <!-- <el-form-item label="Fluent网格文件" prop="fluentGridFile">
           <file-upload v-model="form.fluentGridFile"/>
         </el-form-item>

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

@@ -57,7 +57,7 @@
           v-hasPermi="['data:flowOut:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!--<el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -66,7 +66,7 @@
           @click="handleExport"
           v-hasPermi="['data:flowOut:export']"
         >导出</el-button>
-      </el-col>
+      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -86,8 +86,8 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-download"
-            @click="downloadfile(scope.row.casOutputFilePath)"
+            icon="el-icon-folder-opened"
+            @click="openFolder(scope.row.casOutputFilePath)"
             v-hasPermi="['data:model:edit']"
           >{{ getFileName(scope.row.casOutputFilePath) }}
           </el-button>
@@ -98,8 +98,8 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-download"
-            @click="downloadfile(scope.row.datOutputFilePath)"
+            icon="el-icon-folder-opened"
+            @click="openFolder(scope.row.datOutputFilePath)"
             v-hasPermi="['data:model:edit']"
           >{{ getFileName(scope.row.datOutputFilePath) }}
           </el-button>
@@ -110,8 +110,8 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-download"
-            @click="downloadfile(scope.row.otherOutputFilePath)"
+            icon="el-icon-folder-opened"
+            @click="openFolder(scope.row.otherOutputFilePath)"
             v-hasPermi="['data:model:edit']"
           >{{ getFileName(scope.row.otherOutputFilePath) }}
           </el-button>
@@ -122,11 +122,12 @@
           <el-button
           size ="mini"
           type="text"
-          icon="el-icon-download"
-          @click="downloadfile(scope.row.temperatureImagePath)"
+          icon="el-icon-folder-opened"
+          @click="openFolder(scope.row.temperatureImagePath)"
           v-haspermi="['data:model:edit']">
             {{getFileName(scope.row.temperatureImagePath)}}
           </el-button>
+          <image-preview :src="scope.row.temperatureImagePath" :width="30" :height="30" ></image-preview>
         </template>
       </el-table-column>
       <el-table-column label="表面速度分布图" align="center" prop="velocityImage">
@@ -134,11 +135,12 @@
           <el-button
               size ="mini"
               type="text"
-              icon="el-icon-download"
-              @click="downloadfile(scope.row.velocityImagePath)"
+              icon="el-icon-folder-opened"
+              @click="openFolder(scope.row.velocityImagePath)"
               v-haspermi="['data:model:edit']">
             {{getFileName(scope.row.velocityImagePath)}}
           </el-button>
+          <image-preview :src="scope.row.velocityImagePath" :width="30" :height="30" ></image-preview>
         </template>
       </el-table-column>
       <el-table-column label="表面压力分布图" align="center" prop="pressureImage">
@@ -146,11 +148,12 @@
           <el-button
               size ="mini"
               type="text"
-              icon="el-icon-download"
-              @click="downloadfile(scope.row.pressureImagePath)"
+              icon="el-icon-folder-opened"
+              @click="openFolder(scope.row.pressureImagePath)"
               v-haspermi="['data:model:edit']">
             {{getFileName(scope.row.pressureImagePath)}}
           </el-button>
+          <image-preview :src="scope.row.pressureImagePath" :width="30" :height="30" ></image-preview>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -233,7 +236,7 @@
 </template>
 
 <script>
-import { listFlowOut, getFlowOut, delFlowOut, addFlowOut, updateFlowOut } from "@/api/data/flowOut";
+import { listFlowOut, getFlowOut, delFlowOut, addFlowOut, updateFlowOut,getFolder } from "@/api/data/flowOut";
 import { getFlowFieldInOption} from "@/api/data/flowIn";
 export default {
   name: "FlowOut",
@@ -435,8 +438,14 @@ export default {
       getFlowFieldInOption().then(resp=>{
         this.flowFieldInputOption = resp.data
       })
+    },
+    openFolder(path){
+      const newName = path.slice(0,path.lastIndexOf("/"))
+      getFolder(newName);
     }
 
+
+
   }
 };
 </script>

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

@@ -88,6 +88,7 @@
     <el-table v-loading="loading" :data="infraredInList" @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="flowFieldOutputID" />
       <el-table-column label="完好发射率" align="center" prop="fullLaunchRate"/>
       <el-table-column label="损伤发射率" align="center" prop="damageLaunchRate" />
       <el-table-column label="损伤区域" align="center" prop="damageArea" />
@@ -126,6 +127,15 @@
     <!-- 添加或修改红外输入对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+        <el-form-item label="对应流场输出编号"  prop="flowFieldOutputID">
+          <el-select v-model="form.flowFieldOutputID" placeholder="请输入对应流场输出编号">
+            <el-option v-for="item in flowFieldOutputOption"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="完好发射率" prop="fullLaunchRate">
           <el-input v-model="form.fullLaunchRate" placeholder="请输入完好发射率" :controls="false" precision="6" />
         </el-form-item>
@@ -161,6 +171,8 @@
 
 <script>
 import { listInfraredIn, getInfraredIn, delInfraredIn, addInfraredIn, updateInfraredIn } from "@/api/data/infraredIn";
+import { getFlowFieldOutputID } from "@/api/data/flowOut";
+
 
 export default {
   name: "InfraredIn",
@@ -188,6 +200,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        flowFieldOutputID:null,
         damageArea: null,
         detectDistance: null,
         detectAngle: null,
@@ -201,11 +214,13 @@ export default {
           { required: true, message: "流场输出结果不能为空", trigger: "change" }
         ],
       },
+      flowFieldOutputOption:[],
       fileType: ['cas', 'dat']
     };
   },
   created() {
     this.getList();
+    this.getOption();
   },
   methods: {
     /** 查询红外输入列表 */
@@ -226,6 +241,7 @@ export default {
     reset() {
       this.form = {
         id: null,
+        flowFieldOutputID:null,
         fullLaunchRate: null,
         damageLaunchRate: null,
         damageArea: null,
@@ -322,6 +338,9 @@ export default {
     },
     download(path) {
       this.$download.resource(path);
+    },
+    getOption() {
+      getFlowFieldOutputID().then(resp=>{this.flowFieldOutputOption=resp.data})
     }
   }
 };

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

@@ -64,22 +64,21 @@
     <el-table v-loading="loading" :data="infraredOutList" @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="flowFieldOutputID" />
       <el-table-column label="对应红外输入编号" align="center" prop="infraredInputID" />
       <el-table-column label="文件输出" align="center" prop="outputFilePath">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-download"
-            @click="downloadfile(scope.row.outputFilePath)"
+            icon="el-icon-folder-opened"
+            @click="openFolder(scope.row.outputFilePath)"
             v-hasPermi="['data:model:edit']"
           >{{ getFileName(scope.row.outputFilePath) }}
           </el-button>
         </template>
       </el-table-column>
       <el-table-column label="红外辐射强度" align="center" prop="radiationIntensity" />
-      <el-table-column label="红外图像" align="center" prop="infraredImagePath">
+      <!--<el-table-column label="红外图像" align="center" prop="infraredImagePath">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -90,6 +89,19 @@
             {{getFileName(scope.row.infraredImagePath)}}
           </el-button>
         </template>
+      </el-table-column>-->
+      <el-table-column label="红外图像" align="center" prop="infraredImagePath">
+        <template slot-scope="scope">
+        <el-button
+            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>
+          <image-preview :src="scope.row.infraredImagePath" :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">
@@ -121,15 +133,6 @@
     <!-- 添加或修改红外输出对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="对应流场输出编号"  prop="flowFieldOutputID">
-          <el-select v-model="form.flowFieldOutputID" placeholder="请输入对应流场输出编号">
-            <el-option v-for="item in flowFieldOutputOption"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="对应红外输入编号"  prop="infraredInputID">
           <el-select v-model="form.infraredInputID" placeholder="请输入对应红外输入编号">
             <el-option v-for="item in infraredInputOption"
@@ -158,8 +161,7 @@
 </template>
 
 <script>
-import { listInfraredOut, getInfraredOut, delInfraredOut, addInfraredOut, updateInfraredOut } from "@/api/data/infraredOut";
-import { getFlowFieldOutputID } from "@/api/data/flowOut";
+import { listInfraredOut, getInfraredOut, delInfraredOut, addInfraredOut, updateInfraredOut,getFolder } from "@/api/data/infraredOut";
 import { getInfraredInputID }from "@/api/data/infraredIn";
 
 export default {
@@ -188,7 +190,6 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        flowFieldOutputID:null,
         infraredInputID:null,
         outputFile: null,
         outputFilePath: null,
@@ -207,7 +208,6 @@ export default {
           { required: true, message: "文件输出不能为空", trigger: "blur" }
         ]
       },
-      flowFieldOutputOption:[],
       infraredInputOption:[],
       fileType: ['dat', 'xls', 'jpg', 'png'],
       imageType:['jpg','png']
@@ -236,7 +236,6 @@ export default {
     reset() {
       this.form = {
         id: null,
-        flowFieldOutputID:null,
         infraredInputID:null,
         outputFile: null,
         outputFilePath: null,
@@ -314,6 +313,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
+
       this.download('data/infraredOut/export', {
         ...this.queryParams
       }, `infraredOut_${new Date().getTime()}.xlsx`)
@@ -337,8 +337,11 @@ export default {
       this.$download.resource(path);
     },
     getOption() {
-      getFlowFieldOutputID().then(resp=>{this.flowFieldOutputOption=resp.data})
       getInfraredInputID().then(resp=>{this.infraredInputOption = resp.data})
+    },
+    openFolder(path){
+      const newName = path.slice(0,path.lastIndexOf("/"))
+      getFolder(newName);
     }
   }
 };

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

@@ -48,7 +48,7 @@
           v-hasPermi="['data:model:remove']"
         >删除</el-button>
       </el-col>
-      <!-- <el-col :span="1.5">
+      <!--<el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -57,7 +57,7 @@
           @click="handleExport"
           v-hasPermi="['data:model:export']"
         >导出</el-button>
-      </el-col> -->
+      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -71,8 +71,8 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-download"
-            @click="download(scope.row.model3dFilePath)"
+            icon="el-icon-folder-opened"
+            @click="openFolder(scope.row.model3dFilePath)"
             v-hasPermi="['data:model:edit']"
           >{{ getFileName(scope.row.model3dFilePath) }}
           </el-button>
@@ -130,7 +130,7 @@
 </template>
 
 <script>
-import { listModel, getModel, delModel, addModel, updateModel } from "@/api/data/model";
+import { listModel, getModel, delModel, addModel, updateModel,getFolder } from "@/api/data/model";
 
 export default {
   name: "Model",
@@ -293,8 +293,12 @@ export default {
         return '';
       }
     },
-    download(path) {
+    downloadfile(path) {
       this.$download.resource(path);
+    },
+    openFolder(path){
+      const newName = path.slice(0,path.lastIndexOf("/"))
+      getFolder(newName);
     }
   }
 };