Merge remote-tracking branch 'origin/master'

master/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -122,7 +122,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/plant/meeting/meetingReport").anonymous()
                 .antMatchers("/training/training/trainingReport").anonymous()
                 .antMatchers("/pdf/**").anonymous()
-                .antMatchers("/**/exportPDF").anonymous()
+//                .antMatchers("/**/exportPDF").anonymous()
                 .antMatchers("/ehs/approvedanger/processImg/**").anonymous()
                 .antMatchers("/sems/historyYlrq/exportPDFForYear").anonymous()
                 .antMatchers("/sems/historyYlgd/exportPDFForYear").anonymous()

master/src/main/java/com/ruoyi/project/sems/controller/TReportHiYlgdController.java

@@ -9,6 +9,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.alibaba.fastjson.JSON;
+import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.document.PDFTemplateUtil;
 import com.ruoyi.common.utils.document.ZipUtil;
@@ -127,11 +128,11 @@ public class TReportHiYlgdController extends BaseController {
         return toAjax(tReportHiYlgdService.deleteTReportHiYlgdByIds(ids));
     }
 
-    @RequestMapping("/exportPDF")
+    @GetMapping("/exportPDF")
     public String exportPDF(@RequestParam String id, HttpServletRequest request, HttpServletResponse response) {
-        OutputStream out = null;
+//        OutputStream out = null;
         try {
-            out = response.getOutputStream();
+//            out = response.getOutputStream();
             //获取信息，就是上面的结构
             HashMap<String, Object> map = new HashMap<>();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -194,20 +195,22 @@ public class TReportHiYlgdController extends BaseController {
             String pdfName = reportHiYlgd.getPlantCode()
                     + "-" + check
                     + "-" + reportHiYlgd.getDevno()
-                    + "-压力管道年度检查报告.pdf"
+                    + "-压力管道年度检查报告" +reportHiYlgd.getId() + ".pdf"
                     .replace(" ", "")
                     .replace("\\s", "")
                     .replace("\n", "");
-            PDFTemplateUtil.exportPdf("yearYlgdFMaker.ftl", pdfName, "file:/" + RuoYiConfig.getProfile(), map, response);
+            pdfName = FileUtils.isValidFilenameAndReplace(pdfName); //验证合规
+            // 生成PDF文件
+            PDFTemplateUtil.createPdf("yearYlgdFMaker.ftl", pdfName,
+                    RuoYiConfig.getProfile() + "/reportHiYlgd/" ,
+                    "file:" + RuoYiConfig.getProfile(), map, response);
+            reportHiYlgd.setReportUrl(pdfName);
+            tReportHiYlgdService.updateTReportHiYlgd(reportHiYlgd);
+            return Constants.RESOURCE_PREFIX + "/" + "/reportHiYlgd/"  + pdfName;
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
-            if (out != null)
-                try {
-                    out.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
+
         }
         return null;
     }
@@ -232,6 +235,10 @@ public class TReportHiYlgdController extends BaseController {
             //存放所有pdf文件路径
             List<String> list = new ArrayList<>();
             for (TReportHiYlgd tReportHiYlgd : tReportHiYlgds) {
+                if (tReportHiYlgd.getReportUrl()!= null) {
+                    list.add(tReportHiYlgd.getReportUrl());
+                    continue;
+                }
                 if (StringUtils.isNotEmpty(tReportHiYlgd.getCon())) {
                     for (SysDictData c : con) {
                         if (tReportHiYlgd.getCon().equals(c.getDictValue())) {
@@ -290,18 +297,20 @@ public class TReportHiYlgdController extends BaseController {
                 String pdfName = tReportHiYlgd.getPlantCode()
                         + "-" + sdf.format(tReportHiYlgd.getCheckDate())
                         + "-" + tReportHiYlgd.getDevno()
-                        + "-压力管道年度检查报告" +tReportHiYlgd.getReportId() + ".pdf"
+                        + "-压力管道年度检查报告" +tReportHiYlgd.getId() + ".pdf"
                         .replace(" ", "")
                         .replace("\\s", "")
                         .replace("\n", "");
                 pdfName = FileUtils.isValidFilenameAndReplace(pdfName); //验证合规
                 // 生成PDF文件
                 PDFTemplateUtil.createPdf("yearYlgdFMaker.ftl", pdfName,
-                        RuoYiConfig.getProfile() + "/reportHi/" + now,
+                        RuoYiConfig.getProfile() + "/reportHiYlgd/",
                         "file:" + RuoYiConfig.getProfile(), map, response);
+                tReportHiYlgd.setReportUrl(pdfName);
+                tReportHiYlgdService.updateTReportHiYlgd(tReportHiYlgd);
                 list.add(pdfName);
             }
-            ZipUtil.createZip(RuoYiConfig.getProfile() + "/reportHi/", now + "", year + "年压力管道年度检查历史报告.zip", list, response);
+            ZipUtil.createZip(RuoYiConfig.getProfile() + "/reportHiYlgd/", "", year + "年压力管道年度检查历史报告.zip", list, response);
         } catch (Exception e) {
             e.printStackTrace();
         } finally {

master/src/main/java/com/ruoyi/project/sems/controller/TReportHiYlrqController.java

@@ -10,6 +10,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.alibaba.fastjson.JSON;
+import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.document.PDFTemplateUtil;
 import com.ruoyi.common.utils.document.ZipUtil;
@@ -128,11 +129,11 @@ public class TReportHiYlrqController extends BaseController {
         return toAjax(tReportHiYlrqService.deleteTReportHiYlrqByIds(ids));
     }
 
-    @RequestMapping("/exportPDF")
+    @GetMapping("/exportPDF")
     public String exportPDF(@RequestParam String id, HttpServletRequest request, HttpServletResponse response) {
-        OutputStream out = null;
+//        OutputStream out = null;
         try {
-            out = response.getOutputStream();
+//            out = response.getOutputStream();
             //获取信息，就是上面的结构
             HashMap<String, Object> map = new HashMap<>();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -200,16 +201,17 @@ public class TReportHiYlrqController extends BaseController {
                     .replace("\\s", "")
                     .replace("\n", "");
             pdfName = FileUtils.isValidFilenameAndReplace(pdfName); //验证合规
-            PDFTemplateUtil.exportPdf("yearYlrqFMaker.ftl", pdfName, "file:/" + RuoYiConfig.getProfile(), map, response);
+            // 生成PDF文件
+            PDFTemplateUtil.createPdf("yearYlrqFMaker.ftl", pdfName,
+                    RuoYiConfig.getProfile() + "/reportHiYlrq/",
+                    "file:/" + RuoYiConfig.getProfile(), map, response);
+//            PDFTemplateUtil.exportPdf("yearYlrqFMaker.ftl", pdfName, "file:/" + RuoYiConfig.getProfile(), map, response);
+            reportYlrq.setReportUrl(pdfName);
+            this.tReportHiYlrqService.updateTReportHiYlrq(reportYlrq);
+            return Constants.RESOURCE_PREFIX + "/" + "/reportHiYlrq/"  + pdfName;
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
-            if (out != null)
-                try {
-                    out.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
         }
         return null;
     }
@@ -234,6 +236,10 @@ public class TReportHiYlrqController extends BaseController {
             //存放所有pdf文件路径
             List<String> list = new ArrayList<>();
             for (TReportHiYlrq tReportHiYlrq : tReportHiYlrqs) {
+                if (tReportHiYlrq.getReportUrl()!= null) { //生成过得pdf不需要重复生成
+                    list.add(tReportHiYlrq.getReportUrl());
+                    continue;
+                }
                 if (StringUtils.isNotEmpty(tReportHiYlrq.getCon())) {
                     for (SysDictData c : con) {
                         if (tReportHiYlrq.getCon().equals(c.getDictValue())) {
@@ -292,18 +298,23 @@ public class TReportHiYlrqController extends BaseController {
                 String pdfName = tReportHiYlrq.getPlantCode()
                         + "-" + sdf.format(tReportHiYlrq.getCheckDate())
                         + "-" + tReportHiYlrq.getDevno()
-                        + "-压力容器年度检查报告.pdf"
+                        + "-压力容器年度检查报告" +tReportHiYlrq.getId() + ".pdf"
                         .replace(" ", "")
                         .replace("\\s", "")
-                        .replace("\n", "");
+                        .replace("\n", "")
+                        .replace("\r", "")
+                .replace("\t", "");
+                pdfName = FileUtils.isValidFilenameAndReplace(pdfName); //验证合规
                 // 生成PDF文件
                 PDFTemplateUtil.createPdf("yearYlrqFMaker.ftl", pdfName,
-                        RuoYiConfig.getProfile() + "/reportHi/" + now,
+                        RuoYiConfig.getProfile() + "/reportHiYlrq/" + now,
                         "file:/" + RuoYiConfig.getProfile(), map, response);
+                tReportHiYlrq.setReportUrl(pdfName);
+                this.tReportHiYlrqService.updateTReportHiYlrq(tReportHiYlrq);
                 list.add(pdfName);
                 //PDFTemplateUtil.exportPdf("yearYlrqFMaker.ftl", pdfName, "file:/" + RuoYiConfig.getProfile(), map, response);
             }
-            ZipUtil.createZip(RuoYiConfig.getProfile() + "/reportHi/", now + "", year + "年压力容器年度检查历史报告.zip", list, response);
+            ZipUtil.createZip(RuoYiConfig.getProfile() + "/reportHiYlrq/", now + "", year + "年压力容器年度检查历史报告.zip", list, response);
         } catch (Exception e) {
             e.printStackTrace();
         } finally {

master/src/main/java/com/ruoyi/project/sems/domain/TReportHiYlgd.java

@@ -153,7 +153,7 @@ public class TReportHiYlgd extends BaseEntity
     /** 修改时间 */
     private Date updatedate;
 
-    private String reportUrll;
+    private String reportUrl;
 
     public void setId(Long id)
     {
@@ -552,12 +552,12 @@ public class TReportHiYlgd extends BaseEntity
         return updatedate;
     }
 
-    public String getReportUrll() {
-        return reportUrll;
+    public String getReportUrl() {
+        return reportUrl;
     }
 
-    public void setReportUrll(String reportUrll) {
-        this.reportUrll = reportUrll;
+    public void setReportUrl(String reportUrl) {
+        this.reportUrl = reportUrl;
     }
 
     @Override

master/src/main/java/com/ruoyi/project/sems/domain/TReportHiYlrq.java

@@ -201,6 +201,8 @@ public class TReportHiYlrq extends BaseEntity
     /** 修改时间 */
     private Date updatedate;
 
+    private String reportUrl;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -742,6 +744,14 @@ public class TReportHiYlrq extends BaseEntity
         return updatedate;
     }
 
+    public String getReportUrl() {
+        return reportUrl;
+    }
+
+    public void setReportUrl(String reportUrl) {
+        this.reportUrl = reportUrl;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

master/src/main/resources/mybatis/sems/TReportHiYlgdMapper.xml

@@ -49,10 +49,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createdate"    column="createdate"    />
         <result property="updaterCode"    column="updater_code"    />
         <result property="updatedate"    column="updatedate"    />
+        <result property="reportUrl"    column="report_url"    />
+
     </resultMap>
 
     <sql id="selectTReportHiYlgdVo">
-        select d.id, d.report_id, d.plant_code, d.unit, d.devname, d.devno, d.grade, d.medium, d.des_pressure, d.des_temp, d.opt_pressure, d.safe_class, d.next_warn_date, d.opt_temp, d.year_report_no, d.pj1, d.pj2, d.pj3, d.pj4, d.pj5, d.pj6, d.pj7, d.pj8, d.pj9, d.pj10, d.pj11, d.pj12, d.pj13, d.pj14, d.pj15, d.pj16, d.pj17, d.remarks, d.check_date, d.next_check_date, d.problem, d.con, d.build_date, d.approve_id, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate from t_report_hi_ylgd d
+        select d.id, d.report_id, d.plant_code, d.unit,d.report_url, d.devname, d.devno, d.grade, d.medium, d.des_pressure, d.des_temp, d.opt_pressure, d.safe_class, d.next_warn_date, d.opt_temp, d.year_report_no, d.pj1, d.pj2, d.pj3, d.pj4, d.pj5, d.pj6, d.pj7, d.pj8, d.pj9, d.pj10, d.pj11, d.pj12, d.pj13, d.pj14, d.pj15, d.pj16, d.pj17, d.remarks, d.check_date, d.next_check_date, d.problem, d.con, d.build_date, d.approve_id, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate from t_report_hi_ylgd d
     </sql>
 
     <select id="selectTReportHiYlgdForYear" parameterType="String" resultMap="TReportHiYlgdResult">
@@ -223,6 +225,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="reportUrl != null">report_url = #{reportUrl},</if>
         </trim>
         where id = #{id}
     </update>

master/src/main/resources/mybatis/sems/TReportHiYlrqMapper.xml

@@ -65,10 +65,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createdate"    column="createdate"    />
         <result property="updaterCode"    column="updater_code"    />
         <result property="updatedate"    column="updatedate"    />
+        <result property="reportUrl"    column="report_url"    />
     </resultMap>
 
     <sql id="selectTReportHiYlrqVo">
-        select d.id, d.report_id, d.plant_code, d.unit, d.devno, d.devname, d.useno, d.regno, d.medium, d.des_pressure, d.des_temp, d.opt_pressure, d.opt_temp, d.safe_class, d.next_warn_date, d.year_report_no, d.pj1, d.pj2, d.pj3, d.pj4, d.pj5, d.pj6, d.pj7, d.pj8, d.pj9, d.pj10, d.pj11, d.pj12, d.pj13, d.pj14, d.pj15, d.pj16, d.pj17, d.pj18, d.pj19, d.pj20, d.pj21, d.pj22, d.pj23, d.pj24, d.pj25, d.pj26, d.pj27, d.pj28, d.pj29, d.pj30, d.pj31, d.pj32, d.remarks, d.check_date, d.next_check_date, d.problem, d.con, d.build_date, d.approve_id, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate from t_report_hi_ylrq d
+        select d.id, d.report_id, d.plant_code,d.report_url, d.unit, d.devno, d.devname, d.useno, d.regno, d.medium, d.des_pressure, d.des_temp, d.opt_pressure, d.opt_temp, d.safe_class, d.next_warn_date, d.year_report_no, d.pj1, d.pj2, d.pj3, d.pj4, d.pj5, d.pj6, d.pj7, d.pj8, d.pj9, d.pj10, d.pj11, d.pj12, d.pj13, d.pj14, d.pj15, d.pj16, d.pj17, d.pj18, d.pj19, d.pj20, d.pj21, d.pj22, d.pj23, d.pj24, d.pj25, d.pj26, d.pj27, d.pj28, d.pj29, d.pj30, d.pj31, d.pj32, d.remarks, d.check_date, d.next_check_date, d.problem, d.con, d.build_date, d.approve_id, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate from t_report_hi_ylrq d
     </sql>
 
     <select id="selectTReportHiYlrqList" parameterType="TReportHiYlrq" resultMap="TReportHiYlrqResult">
@@ -287,6 +288,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="reportUrl != null">report_url = #{reportUrl},</if>
         </trim>
         where id = #{id}
     </update>

ui/src/api/sems/reportYlgd.js

@@ -68,3 +68,12 @@ export function exportReportYlgdSelected(query) {
     data: query
   })
 }
+
+// 导出pdf
+export function exportPDF(query) {
+  return request({
+    url: '/sems/historyYlgd/exportPDF',
+    method: 'get',
+    params: query
+  })
+}

ui/src/api/sems/reportYlrq.js

@@ -69,3 +69,13 @@ export function exportReportYlrqSelected(query) {
   })
 }
 
+// 导出pdf
+export function exportPDF(query) {
+  return request({
+    url: '/sems/historyYlrq/exportPDF',
+    method: 'get',
+    params: query
+  })
+}
+
+

ui/src/views/login.vue

@@ -83,7 +83,7 @@
           style="width:100%;"
           @click.native.prevent="doAzureLogin"
         >
-          <span v-if="!loading"> BASF员工卡登录(Beta) </span>
+          <span v-if="!loading">BASF员工卡登录</span>
           <span v-else>{{ $t('login.loading') }}</span>
         </el-button>
       </el-form-item>

ui/src/views/production/daily/index.vue

@@ -2831,8 +2831,8 @@
       </div>
     </el-dialog>
     <!-- 趋势分析对话框 -->
-    <el-dialog @close="disposeChart" :title="analysis.title" :visible.sync="analysis.open" width="1400px" append-to-body>
-      <el-form :model="analysisQueryParams" ref="queryForm" :inline="true" label-width="68px">
+    <el-dialog @close="handleDialogClose" :title="analysis.title" :visible.sync="analysis.open" width="1400px" append-to-body>
+      <el-form :model="analysisQueryParams" ref="queryForm" :inline="true" label-width="102px">
         <el-form-item label="开始日期" prop="startDate">
           <el-date-picker
             @change="handleAnalysisQuery"
@@ -2864,6 +2864,13 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <br/>
+        <el-form-item label="纵坐标最小值" prop="minY">
+          <el-input v-model="minY" placeholder="请输入" @change="handleAnalysisQuery"></el-input>
+        </el-form-item>
+        <el-form-item label="纵坐标最大值" prop="maxY">
+          <el-input v-model="maxY" placeholder="请输入" @change="handleAnalysisQuery"></el-input>
+        </el-form-item>
       </el-form>
       <div id="trendChart" style="width:1340px;height:600px;"></div>
     </el-dialog>
@@ -2883,10 +2890,12 @@ export default {
   components: { Treeselect },
   data() {
     return {
+      // 纵坐标最小值
+      minY: null,
+      // 纵坐标最大值
+      maxY: null,
       fileList: [], // 上传文件列表
       uploading: false,  // 是否正在上传文件
-
-
       // 选中的对比指标
       chemicalChosen: null,
       // 对比指标下拉框
@@ -4143,6 +4152,12 @@ export default {
         this.handleAnalysisQuery();
       }
     },
+    handleDialogClose() {
+      this.disposeChart();
+      this.minY = null;
+      this.maxY = null;
+      this.chemicalChosen = null;
+    },
     /** 销毁趋势图 */
     disposeChart() {
       this.echarts.dispose(this.chart);
@@ -4162,7 +4177,7 @@ export default {
         let startDate = new Date(this.analysisQueryParams.startDate);
         this.analysisQueryParams.endDate = endDate.getFullYear() + "-" + Number(endDate.getMonth() + 1) + "-" + endDate.getDate();
         this.analysisQueryParams.startDate = startDate.getFullYear() + "-" + Number(startDate.getMonth() + 1) + "-" + startDate.getDate();
-        this.draw2();
+        this.draw2(this.minY, this.maxY);
       } else {
         this.disposeChart();
         this.valueList = [];
@@ -4171,28 +4186,59 @@ export default {
         let startDate = new Date(this.analysisQueryParams.startDate);
         this.analysisQueryParams.endDate = endDate.getFullYear() + "-" + Number(endDate.getMonth() + 1) + "-" + endDate.getDate();
         this.analysisQueryParams.startDate = startDate.getFullYear() + "-" + Number(startDate.getMonth() + 1) + "-" + startDate.getDate();
-        this.draw();
+        this.draw(this.minY, this.maxY);
       }
     },
     /** 绘制趋势图 */
-    draw() {
+    draw(minY, maxY) {
+      let yValueIsNull = false;
+      if (minY != null && maxY != null) {
+        yValueIsNull = false;
+      } else {
+        yValueIsNull = true;
+      }
       getAnalysisData(this.analysisQueryParams).then(response => {
         let data = response.data;
-        this.maxValue = 0;
-        this.minValue = data[0].valueData;
-        for (let i = 0; i < data.length; i++) {
-          if (data[i].valueData != null) {
-            if (data[i].valueData.toString().search("%") != -1) {
-              this.valueList[i] = data[i].valueData.substr(0, data[i].valueData.length - 1);
-            } else {
-              this.valueList[i] = data[i].valueData;
+        if (yValueIsNull == false) {
+          this.maxValue = maxY;
+          this.minValue = minY;
+          for (let i = 0; i < data.length; i++) {
+            if (data[i].valueData != null) {
+              if (data[i].valueData.toString().search("%") != -1) {
+                this.valueList[i] = data[i].valueData.substr(0, data[i].valueData.length - 1);
+              } else {
+                this.valueList[i] = data[i].valueData;
+              }
+              this.dateList[i] = data[i].dateData;
             }
-            this.dateList[i] = data[i].dateData;
-            if (data[i].valueData > this.maxValue) {
-              this.maxValue = data[i].valueData;
+          }
+          let tempValueList = [];
+          let tempDateList = [];
+          for (let i = 0; i < this.valueList.length; i++) {
+            if (Number(this.valueList[i]) >= Number(minY) && Number(this.valueList[i]) <= Number(maxY)) {
+              tempValueList.push(this.valueList[i]);
+              tempDateList.push(this.dateList[i]);
             }
-            if (data[i].valueData < this.minValue) {
-              this.minValue = data[i].valueData;
+          }
+          this.valueList = tempValueList;
+          this.dateList = tempDateList;
+        } else {
+          this.maxValue = 0;
+          this.minValue = data[0].valueData;
+          for (let i = 0; i < data.length; i++) {
+            if (data[i].valueData != null) {
+              if (data[i].valueData.toString().search("%") != -1) {
+                this.valueList[i] = data[i].valueData.substr(0, data[i].valueData.length - 1);
+              } else {
+                this.valueList[i] = data[i].valueData;
+              }
+              this.dateList[i] = data[i].dateData;
+              if (data[i].valueData > this.maxValue) {
+                this.maxValue = data[i].valueData;
+              }
+              if (data[i].valueData < this.minValue) {
+                this.minValue = data[i].valueData;
+              }
             }
           }
         }
@@ -4242,7 +4288,7 @@ export default {
       });
     },
     /** 绘制包含对比指标的趋势图 */
-    draw2() {
+    draw2(minY, maxY) {
       getAnalysisData(this.analysisQueryParams).then(response => {
         let data = response.data;
         this.maxValue2 = 0;

ui/src/views/sems/reportYlgd/index.vue

@@ -491,68 +491,68 @@
     <!-- 历史报告对话框 -->
     <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="90%" append-to-body>
       <el-table :data="historyYlgdList" border>
-        <u-table-column :label="$t('生成时间')" align="center" prop="buildDate" fixed="left" width="100">
+        <el-table-column :label="$t('生成时间')" align="center" prop="buildDate" fixed="left" width="100">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.buildDate, '{y}-{m}-{d}') }}</span>
           </template>
-        </u-table-column>
-        <u-table-column :label="$t('装置名称')" align="center" prop="plantCode" :show-overflow-tooltip="true"/>
-        <u-table-column :label="$t('单元')" align="center" prop="unit" :show-overflow-tooltip="true"/>
-        <u-table-column :label="$t('管道名称')" align="center" prop="devname" :show-overflow-tooltip="true"/>
-        <u-table-column :label="$t('管道编号')" align="center" prop="devno" :show-overflow-tooltip="true"/>
-        <u-table-column :label="$t('管道级别')" align="center" prop="grade" :show-overflow-tooltip="true"/>
-        <u-table-column :label="$t('介质')" align="center" prop="medium" :show-overflow-tooltip="true"/>
-        <u-table-column :label="$t('设计压力')+'(MPa)'" align="center" prop="desPressure" :show-overflow-tooltip="true"/>
-        <u-table-column :label="$t('设计温度')+'(℃)'" align="center" prop="desTemp" :show-overflow-tooltip="true"/>
-        <u-table-column :label="$t('操作压力')+'(MPa)'" align="center" prop="optPressure" :show-overflow-tooltip="true"/>
-        <u-table-column :label="$t('操作温度')+'(℃)'" align="center" prop="optTemp" :show-overflow-tooltip="true"/>
-        <u-table-column :label="$t('安全状况等级')" align="center" prop="safeClass" :show-overflow-tooltip="true"/>
-        <u-table-column :label="$t('下次定期检验日期')" align="center" prop="nextWarnDate" width="100">
+        </el-table-column>
+        <el-table-column :label="$t('装置名称')" align="center" prop="plantCode" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('单元')" align="center" prop="unit" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('管道名称')" align="center" prop="devname" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('管道编号')" align="center" prop="devno" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('管道级别')" align="center" prop="grade" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('介质')" align="center" prop="medium" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('设计压力')+'(MPa)'" align="center" prop="desPressure" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('设计温度')+'(℃)'" align="center" prop="desTemp" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('操作压力')+'(MPa)'" align="center" prop="optPressure" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('操作温度')+'(℃)'" align="center" prop="optTemp" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('安全状况等级')" align="center" prop="safeClass" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('下次定期检验日期')" align="center" prop="nextWarnDate" width="100">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
           </template>
-        </u-table-column>
-        <u-table-column :label="$t('年检报告编号')" align="center" prop="yearReportNo" :show-overflow-tooltip="true"/>
-        <u-table-column label="1" align="center" prop="pj1" :render-header="renderHeader" :formatter="pj1Format"/>
-        <u-table-column label="2" align="center" prop="pj2" :render-header="renderHeader" :formatter="pj2Format"/>
-        <u-table-column label="3" align="center" prop="pj3" :render-header="renderHeader" :formatter="pj3Format"/>
-        <u-table-column label="4" align="center" prop="pj4" :render-header="renderHeader" :formatter="pj4Format"/>
-        <u-table-column label="5" align="center" prop="pj5" :render-header="renderHeader" :formatter="pj5Format"/>
-        <u-table-column :label="$t('安全附件仪表及检查情况')" align="center">
-          <u-table-column label="6" align="center" prop="pj6" :render-header="renderHeader" :formatter="pj6Format"/>
-          <u-table-column label="7" align="center" prop="pj7" :render-header="renderHeader" :formatter="pj7Format"/>
-          <u-table-column label="8" align="center" prop="pj8" :render-header="renderHeader" :formatter="pj8Format"/>
-          <u-table-column label="9" align="center" prop="pj9" :render-header="renderHeader" :formatter="pj9Format"/>
-          <u-table-column label="10" align="center" prop="pj10" :render-header="renderHeader" :formatter="pj10Format"/>
-          <u-table-column label="11" align="center" prop="pj11" :render-header="renderHeader" :formatter="pj11Format"/>
-        </u-table-column>
-        <u-table-column label="12" align="center" prop="pj12" :render-header="renderHeader" :formatter="pj12Format"/>
-        <u-table-column label="13" align="center" prop="pj13" :render-header="renderHeader" :formatter="pj13Format"/>
-        <u-table-column label="14" align="center" prop="pj14" :render-header="renderHeader" :formatter="pj14Format"/>
-        <u-table-column label="15" align="center" prop="pj15" :render-header="renderHeader" :formatter="pj15Format"/>
-        <u-table-column label="16" align="center" prop="pj16" :render-header="renderHeader" :formatter="pj16Format"/>
-        <u-table-column label="17" align="center" prop="pj17" :render-header="renderHeader" :formatter="pj17Format"/>
-        <u-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-        <u-table-column :label="$t('检查日期')" align="center" prop="checkDate" width="100">
+        </el-table-column>
+        <el-table-column :label="$t('年检报告编号')" align="center" prop="yearReportNo" :show-overflow-tooltip="true"/>
+        <el-table-column label="1" align="center" prop="pj1" :render-header="renderHeader" :formatter="pj1Format"/>
+        <el-table-column label="2" align="center" prop="pj2" :render-header="renderHeader" :formatter="pj2Format"/>
+        <el-table-column label="3" align="center" prop="pj3" :render-header="renderHeader" :formatter="pj3Format"/>
+        <el-table-column label="4" align="center" prop="pj4" :render-header="renderHeader" :formatter="pj4Format"/>
+        <el-table-column label="5" align="center" prop="pj5" :render-header="renderHeader" :formatter="pj5Format"/>
+        <el-table-column :label="$t('安全附件仪表及检查情况')" align="center">
+          <el-table-column label="6" align="center" prop="pj6" :render-header="renderHeader" :formatter="pj6Format"/>
+          <el-table-column label="7" align="center" prop="pj7" :render-header="renderHeader" :formatter="pj7Format"/>
+          <el-table-column label="8" align="center" prop="pj8" :render-header="renderHeader" :formatter="pj8Format"/>
+          <el-table-column label="9" align="center" prop="pj9" :render-header="renderHeader" :formatter="pj9Format"/>
+          <el-table-column label="10" align="center" prop="pj10" :render-header="renderHeader" :formatter="pj10Format"/>
+          <el-table-column label="11" align="center" prop="pj11" :render-header="renderHeader" :formatter="pj11Format"/>
+        </el-table-column>
+        <el-table-column label="12" align="center" prop="pj12" :render-header="renderHeader" :formatter="pj12Format"/>
+        <el-table-column label="13" align="center" prop="pj13" :render-header="renderHeader" :formatter="pj13Format"/>
+        <el-table-column label="14" align="center" prop="pj14" :render-header="renderHeader" :formatter="pj14Format"/>
+        <el-table-column label="15" align="center" prop="pj15" :render-header="renderHeader" :formatter="pj15Format"/>
+        <el-table-column label="16" align="center" prop="pj16" :render-header="renderHeader" :formatter="pj16Format"/>
+        <el-table-column label="17" align="center" prop="pj17" :render-header="renderHeader" :formatter="pj17Format"/>
+        <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+        <eltable-column :label="$t('检查日期')" align="center" prop="checkDate" width="100">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.checkDate, '{y}-{m}-{d}') }}</span>
           </template>
-        </u-table-column>
-        <u-table-column :label="$t('下次年度检查日期')" align="center" prop="nextCheckDate" width="100">
+        </eltable-column>
+        <el-table-column :label="$t('下次年度检查日期')" align="center" prop="nextCheckDate" width="100">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.nextCheckDate, '{y}-{m}-{d}') }}</span>
           </template>
-        </u-table-column>
-        <u-table-column :label="$t('问题及处理')" align="center" prop="problem" :show-overflow-tooltip="true"/>
-        <u-table-column :label="$t('检查结论')" align="center" prop="con" :formatter="conFormat"/>
-        <u-table-column :label="$t('操作')" align="center" fixed="right" width="120"
+        </el-table-column>
+        <el-table-column :label="$t('问题及处理')" align="center" prop="problem" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('检查结论')" align="center" prop="con" :formatter="conFormat"/>
+        <el-table-column :label="$t('操作')" align="center" fixed="right" width="120"
                         class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button v-hasPermi="['sems:historyYlgd:export']" type="text" size="small"
-                       @click="downloadReport(scope.row)">{{ $t('下载报告') }}
+                       @click="handleDownloadReport(scope.row)">{{ $t('下载报告') }}
             </el-button>
           </template>
-        </u-table-column>
+        </el-table-column>
       </el-table>
       <form ref="downloadForm" :action="downloadAction" target="FORMSUBMIT">
         <input name="id" v-model="downloadForm.id" hidden/>
@@ -718,7 +718,8 @@ import {
   updateReportYlgd,
   exportReportYlgd,
   syncReportYlgd,
-  exportReportYlgdSelected
+  exportReportYlgdSelected,
+  exportPDF
 } from "@/api/sems/reportYlgd";
 import {listHistoryYlgd} from "@/api/sems/historyYlgd";
 import {treeselect} from "@/api/system/dept";
@@ -1296,6 +1297,23 @@ export default {
         this.$refs['downloadForm'].submit()
       })
     },
+    // 文件下载处理
+    handleDownloadReport(row) {
+      let param = {
+        id: row.id
+      }
+      exportPDF(param).then(response => {
+        let url = response;
+        var name = response;
+        var suffix = url.substring(url.lastIndexOf("."), url.length);
+        console.log(url)
+        const a = document.createElement('a')
+        a.setAttribute('download', name)
+        a.setAttribute('target', '_blank')
+        a.setAttribute('href', process.env.VUE_APP_BASE_API + url)
+        a.click()
+      });
+    },
     //批量下载某年份的历史报告
     exportDataForYear() {
       //将控件时间转为年,如果未选中年份，默认当前年

ui/src/views/sems/reportYlrq/index.vue

@@ -778,7 +778,7 @@
                          class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button v-hasPermi="['sems:historyYlgd:export']" type="text" size="small"
-                       @click="downloadReport(scope.row)">{{ $t('下载报告') }}
+                       @click="handleDownloadReport(scope.row)">{{ $t('下载报告') }}
             </el-button>
           </template>
         </el-table-column>
@@ -945,7 +945,7 @@ import {
   updateReportYlrq,
   exportReportYlrq,
   syncReportYlrq,
-  exportReportYlrqSelected
+  exportReportYlrqSelected,exportPDF
 } from "@/api/sems/reportYlrq";
 import {listHistoryYlrq} from "@/api/sems/historyYlrq";
 import {treeselect} from "@/api/system/dept";
@@ -1708,6 +1708,23 @@ export default {
         this.$refs['downloadForm'].submit()
       })
     },
+    // 文件下载处理
+    handleDownloadReport(row) {
+      let param = {
+        id: row.id
+      }
+      exportPDF(param).then(response => {
+        let url = response;
+        var name = response;
+        var suffix = url.substring(url.lastIndexOf("."), url.length);
+        console.log(url)
+        const a = document.createElement('a')
+        a.setAttribute('download', name)
+        a.setAttribute('target', '_blank')
+        a.setAttribute('href', process.env.VUE_APP_BASE_API + url)
+        a.click()
+      });
+    },
     //批量下载某年份的历史报告
     exportDataForYear() {
       //将控件时间转为年,如果未选中年份，默认当前年