李扬

master/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

@@ -846,7 +846,7 @@ public class ExcelUtil<T>
     /**
      * 编码文件名
      */
-    public String encodingFilename(String filename)
+    public static String encodingFilename(String filename)
     {
         filename = UUID.randomUUID().toString() + "_" + filename + ".xlsx";
         return filename;
@@ -857,7 +857,7 @@ public class ExcelUtil<T>
      *
      * @param filename 文件名称
      */
-    public String getAbsoluteFile(String filename)
+    public static String getAbsoluteFile(String filename)
     {
         String downloadPath = RuoYiConfig.getDownloadPath() + filename;
         File desc = new File(downloadPath);

master/src/main/java/com/ruoyi/project/common/CommonController.java

@@ -7,9 +7,15 @@ import javax.servlet.http.HttpServletResponse;
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.export.JxlsTemplateEnum;
 import com.ruoyi.common.utils.export.JxlsView;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.project.sems.domain.*;
 import com.ruoyi.project.sems.service.*;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellReference;
+import org.apache.poi.xssf.streaming.SXSSFSheet;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,14 +30,12 @@ import com.ruoyi.framework.config.ServerConfig;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 /**
  * 通用请求处理
@@ -412,72 +416,124 @@ public class CommonController extends BaseController
         }
     }
 
-    @RequestMapping("/common/download/exportDevList")
-    public ModelAndView exportbmy(@RequestParam Map<String, Object> params, HttpServletRequest request, HttpServletResponse response) throws ParseException {
-        logger.info(JSON.toJSONString(params));
-        String id = (String) params.get("ids");
-        int devType = Integer.parseInt((String) params.get("devType"));
-        String[] ids = id.split(",");
-        logger.info("ids" + ids);
-        int downloadType = Integer.parseInt((String) params.get("downloadType"));
-        logger.info("downloadType" + downloadType);
-        List<Object> list = new ArrayList<>();
-        switch (devType) {
-            case 1:
-                for (String i : ids
-                ) {
-                    TSpecdevYlrq ylrqEntity = tSpecdevYlrqService.getById(i);
-                    list.add(ylrqEntity);
-                }
-                break;
-            case 2:
-                for (String i : ids
-                ) {
-                    TSpecdevYlgd ylgdEntity = tSpecdevYlgdService.getById(i);
-                    list.add(ylgdEntity);
-                }
-                break;
-            case 3:
-                for (String i : ids
-                ) {
-                    TSpecdevDzsb dzsbEntity = tSpecdevDzsbService.getById(i);
-                    list.add(dzsbEntity);
-                }
-                break;
-            case 4:
-                for (String i : ids
-                ) {
-                    TSpecdevGl glEntity = tSpecdevGlService.getById(i);
-                    list.add(glEntity);
-                }
-                break;
-            case 5:
-                for (String i : ids
-                ) {
-                    TSpecdevDt dtEntity = tSpecdevDtService.getById(i);
-                    list.add(dtEntity);
-                }
-                break;
-            case 6:
-                for (String i : ids
-                ) {
-                    TSpecdevCc ccEntity = tSpecdevCcService.getById(i);
-                    list.add(ccEntity);
-                }
-                break;
-            case 7:
+//    @RequestMapping("/common/download/exportDevList")
+//    public ModelAndView exportbmy(@RequestParam Map<String, Object> params, HttpServletRequest request, HttpServletResponse response) throws ParseException {
+//        logger.info(JSON.toJSONString(params));
+//        String id = (String) params.get("ids");
+//        int devType = Integer.parseInt((String) params.get("devType"));
+//        String[] ids = id.split(",");
+//        logger.info("ids" + ids);
+//        int downloadType = Integer.parseInt((String) params.get("downloadType"));
+//        logger.info("downloadType" + downloadType);
+//        List<Object> list = new ArrayList<>();
+//        switch (devType) {
+//            case 1:
+//                for (String i : ids
+//                ) {
+//                    TSpecdevYlrq ylrqEntity = tSpecdevYlrqService.getById(i);
+//                    list.add(ylrqEntity);
+//                }
+//                break;
+//            case 2:
+//                for (String i : ids
+//                ) {
+//                    TSpecdevYlgd ylgdEntity = tSpecdevYlgdService.getById(i);
+//                    list.add(ylgdEntity);
+//                }
+//                break;
+//            case 3:
+//                for (String i : ids
+//                ) {
+//                    TSpecdevDzsb dzsbEntity = tSpecdevDzsbService.getById(i);
+//                    list.add(dzsbEntity);
+//                }
+//                break;
+//            case 4:
+//                for (String i : ids
+//                ) {
+//                    TSpecdevGl glEntity = tSpecdevGlService.getById(i);
+//                    list.add(glEntity);
+//                }
+//                break;
+//            case 5:
 //                for (String i : ids
 //                ) {
-//                    TOtherTankEntity tankEntity = tOtherTankService.getById(i);
-//                    list.add(tankEntity);
+//                    TSpecdevDt dtEntity = tSpecdevDtService.getById(i);
+//                    list.add(dtEntity);
 //                }
+//                break;
+//            case 6:
+//                for (String i : ids
+//                ) {
+//                    TSpecdevCc ccEntity = tSpecdevCcService.getById(i);
+//                    list.add(ccEntity);
+//                }
+//                break;
+//            case 7:
+////                for (String i : ids
+////                ) {
+////                    TOtherTankEntity tankEntity = tOtherTankService.getById(i);
+////                    list.add(tankEntity);
+////                }
+//        }
+//        if(devType == 1 && downloadType == 2){ return new ModelAndView(new JxlsView(JxlsTemplateEnum.DEV_YLRQ_UPDATE, list)); }
+//        else if(devType == 2 && downloadType == 2){ return new ModelAndView(new JxlsView(JxlsTemplateEnum.DEV_YLGD_UPDATE, list)); }
+//        else if(devType == 3 && downloadType == 2){ return new ModelAndView(new JxlsView(JxlsTemplateEnum.DEV_DZSB_UPDATE, list)); }
+//        else if(devType == 4 && downloadType == 2){ return new ModelAndView(new JxlsView(JxlsTemplateEnum.DEV_GL_UPDATE, list)); }
+//        else if(devType == 5 && downloadType == 2){ return new ModelAndView(new JxlsView(JxlsTemplateEnum.DEV_DT_UPDATE, list)); }
+//        else if(devType == 6 && downloadType == 2){ return new ModelAndView(new JxlsView(JxlsTemplateEnum.DEV_CC_UPDATE, list)); }
+//        return null;
+//    }
+    @GetMapping("/common/download/exportDevList")
+    public AjaxResult exportbmy(TSpecdevGl tSpecdevGl) throws IOException {
+        logger.info("kaishi");
+        SXSSFWorkbook wb = new SXSSFWorkbook(1000);
+        CellStyle wrapStyle = wb.createCellStyle();
+        wrapStyle.setWrapText(true);    //设置自动换行
+        //创建sheet页
+        Sheet sheet = wb.createSheet("sheetName");
+    //设置列的宽度，第一个参数为列的序号，从0开始，第二参数为列宽，单位1/256个字节
+        sheet.setColumnWidth(0, 12*256);
+        sheet.setColumnWidth(2, 16*256);
+        sheet.setColumnWidth(5, 12*256);
+        sheet.setColumnWidth(6, 26*256);
+        sheet.setColumnWidth(7, 26*256);
+        //设置开始行和开始列
+        int rowIndex = 0;
+        int columnIndex = 0;
+        Row row = sheet.createRow(rowIndex);
+
+        OutputStream out = null;
+        String filename = encodingFilename("sheetName");
+        out = new FileOutputStream(getAbsoluteFile(filename));
+        wb.write(out);
+        wb.close();
+        out.close();
+       return AjaxResult.success(filename);
+    }
+
+    /**
+     * 编码文件名
+     */
+    public String encodingFilename(String filename)
+    {
+        filename = UUID.randomUUID().toString() + "_" + filename + ".xlsx";
+        return filename;
+    }
+
+    /**
+     * 获取下载路径
+     *
+     * @param filename 文件名称
+     */
+    public String getAbsoluteFile(String filename)
+    {
+        String downloadPath = RuoYiConfig.getDownloadPath() + filename;
+        File desc = new File(downloadPath);
+        if (!desc.getParentFile().exists())
+        {
+            desc.getParentFile().mkdirs();
         }
-        if(devType == 1 && downloadType == 2){ return new ModelAndView(new JxlsView(JxlsTemplateEnum.DEV_YLRQ_UPDATE, list)); }
-        else if(devType == 2 && downloadType == 2){ return new ModelAndView(new JxlsView(JxlsTemplateEnum.DEV_YLGD_UPDATE, list)); }
-        else if(devType == 3 && downloadType == 2){ return new ModelAndView(new JxlsView(JxlsTemplateEnum.DEV_DZSB_UPDATE, list)); }
-        else if(devType == 4 && downloadType == 2){ return new ModelAndView(new JxlsView(JxlsTemplateEnum.DEV_GL_UPDATE, list)); }
-        else if(devType == 5 && downloadType == 2){ return new ModelAndView(new JxlsView(JxlsTemplateEnum.DEV_DT_UPDATE, list)); }
-        else if(devType == 6 && downloadType == 2){ return new ModelAndView(new JxlsView(JxlsTemplateEnum.DEV_CC_UPDATE, list)); }
-        return null;
+        return downloadPath;
     }
 }

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

@@ -1,17 +1,21 @@
 package com.ruoyi.project.sems.controller;
 
+import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
-import com.ruoyi.project.sems.domain.TSpecCheck;
-import com.ruoyi.project.sems.domain.TSpecdevDzsb;
-import com.ruoyi.project.sems.domain.TSpecdevYlgd;
+import com.ruoyi.framework.config.RuoYiConfig;
+import com.ruoyi.project.sems.domain.*;
 import com.ruoyi.project.sems.service.ITSpecCheckService;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysDictData;
@@ -19,12 +23,12 @@ import com.ruoyi.project.system.service.ISysDeptService;
 import com.ruoyi.project.system.service.ISysDictTypeService;
 import org.apache.poi.ss.formula.functions.T;
 import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.project.sems.domain.TSpecdevCc;
 import com.ruoyi.project.sems.service.ITSpecdevCcService;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
@@ -259,6 +263,8 @@ public class TSpecdevCcController extends BaseController
         return AjaxResult.success(String.valueOf(successNumber), failRow);
     }
 
+
+
     /**
      * 批量导入
      * 检验更新中的批量导入
@@ -320,6 +326,9 @@ public class TSpecdevCcController extends BaseController
                     } else if (j == 6) {
                         entity.setReportNo(cellValue);
                     }
+                    else if (j == 7) {
+                        entity.setPerTestConclusion(cellValue);
+                    }
                 }
                 logger.info("entity:" + entity);
                 list.add(entity);
@@ -367,4 +376,84 @@ public class TSpecdevCcController extends BaseController
         return AjaxResult.success(String.valueOf(successNumber),failRow);
     }
 
+
+    @GetMapping("/exportDevList")
+    public AjaxResult exportbmy(ParamData params) throws IOException {
+        logger.info(JSON.toJSONString(params));
+        String id = params.getIds();
+        String[] ids = id.split(",");
+        List<TSpecdevCc> list = new ArrayList<>();
+        for (String i : ids
+                ) {
+                    TSpecdevCc ccEntity = tSpecdevCcService.getById(i);
+                    list.add(ccEntity);
+                }
+        SXSSFWorkbook wb = new SXSSFWorkbook(1000);
+        CellStyle wrapStyle = wb.createCellStyle();
+        wrapStyle.setWrapText(true);    //设置自动换行
+        //创建sheet页
+        Sheet sheet = wb.createSheet("sheet1");
+        //设置列的宽度，第一个参数为列的序号，从0开始，第二参数为列宽，单位1/256个字节
+        sheet.setColumnWidth(0, 12*256);
+        sheet.setColumnWidth(1, 26*256);
+        sheet.setColumnWidth(2, 26*256);
+        sheet.setColumnWidth(3, 26*256);
+        sheet.setColumnWidth(4, 26*256);
+        sheet.setColumnWidth(5, 26*256);
+        sheet.setColumnWidth(6, 26*256);
+        sheet.setColumnWidth(7, 26*256);
+        sheet.setColumnWidth(8, 40*256);
+        //设置开始行和开始列
+
+        Row row0 = sheet.createRow(0);
+        CellStyle style = wb.createCellStyle();
+        style.setFillForegroundColor(IndexedColors.YELLOW.getIndex());
+        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+//        Font headerFont = wb.createFont();
+//        headerFont.setFontName("Arial");
+//        headerFont.setFontHeightInPoints((short) 12);
+//        headerFont.setBold(false);
+//        headerFont.setColor(IndexedColors.BLACK.getIndex());
+//        style.setFont(headerFont);
+        Cell cell0 = row0.createCell(0);
+        row0.createCell(0).setCellValue("No.\n" + "序号");
+        row0.createCell(1).setCellValue("Plant\n" + "装置");
+        row0.createCell(2).setCellValue("Plate No.\n" + "车牌号");
+        row0.createCell(3).setCellValue("Archive\n" +
+                "档案号");
+        row0.createCell(4).setCellValue("Inspection\n" +
+                "检验日期");row0.getCell(4).setCellStyle(style);
+        row0.createCell(5).setCellValue("Next Inspection\n" +
+                "下次检验日期");row0.getCell(5).setCellStyle(style);
+        row0.createCell(6).setCellValue("Report number\n" +
+                "报告编号");row0.getCell(6).setCellStyle(style);
+        row0.createCell(7).setCellValue("Inspection Conclusion\n" +
+                "定期检验结论");row0.getCell(7).setCellStyle(style);
+        //填充数据
+        int rowIndex = 1;
+        int columnIndex = 1;
+        for (TSpecdevCc t: list
+             ) {
+            Row row = sheet.createRow(rowIndex);
+            row.createCell(0).setCellValue(t.getId());
+            row.createCell(1).setCellValue(t.getPlantCode());
+            row.createCell(2).setCellValue(t.getCarNo());
+            row.createCell(3).setCellValue(t.getDocno());
+            row.createCell(4).setCellValue(t.getWarnDate());
+            row.createCell(5).setCellValue(t.getNextWarnDate());
+            row.createCell(6).setCellValue(t.getReportNo());
+            row.createCell(7).setCellValue(t.getPerTestConclusion());
+            rowIndex++;
+        }
+
+        OutputStream out = null;
+        String filename = ExcelUtil.encodingFilename("叉车批量更新");
+        out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
+        wb.write(out);
+        wb.close();
+        out.close();
+        return AjaxResult.success(filename);
+    }
+
+
 }

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

@@ -1,6 +1,8 @@
 package com.ruoyi.project.sems.controller;
 
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
@@ -9,13 +11,14 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
-import com.ruoyi.project.sems.domain.TSpecCheck;
+import com.ruoyi.project.sems.domain.*;
 import com.ruoyi.project.sems.service.ITSpecCheckService;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysDictData;
 import com.ruoyi.project.system.service.ISysDeptService;
 import com.ruoyi.project.system.service.ISysDictTypeService;
 import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -305,6 +308,8 @@ public class TSpecdevDtController extends BaseController
                         if (cellValue.length() > 3) {
                             entity.setNextWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
+                    } else if (j == 9) {    //定期结论
+                        entity.setPerTestConclusion(cellValue);
                     }
                 }
                 logger.info("entity:" + JSON.toJSONString(entity));
@@ -351,4 +356,89 @@ public class TSpecdevDtController extends BaseController
         logger.info("failRow:" +String.valueOf(failRow));
         return AjaxResult.success(String.valueOf(successNumber),failRow);
     }
+
+    @GetMapping("/exportDevList")
+    public AjaxResult exportbmy(ParamData params) throws IOException {
+        logger.info(JSON.toJSONString(params));
+        String id = params.getIds();
+        String[] ids = id.split(",");
+        List<TSpecdevDt> list = new ArrayList<>();
+        for (String i : ids
+        ) {
+            TSpecdevDt t = tSpecdevDtService.getById(i);
+            list.add(t);
+        }
+        SXSSFWorkbook wb = new SXSSFWorkbook(1000);
+        CellStyle wrapStyle = wb.createCellStyle();
+        wrapStyle.setWrapText(true);    //设置自动换行
+        //创建sheet页
+        Sheet sheet = wb.createSheet("sheet1");
+        //设置列的宽度，第一个参数为列的序号，从0开始，第二参数为列宽，单位1/256个字节
+        sheet.setColumnWidth(0, 12*256);
+        sheet.setColumnWidth(1, 26*256);
+        sheet.setColumnWidth(2, 26*256);
+        sheet.setColumnWidth(3, 26*256);
+        sheet.setColumnWidth(4, 26*256);
+        sheet.setColumnWidth(5, 26*256);
+        sheet.setColumnWidth(6, 26*256);
+        sheet.setColumnWidth(7, 26*256);
+        sheet.setColumnWidth(8, 40*256);
+        //设置开始行和开始列
+
+        Row row0 = sheet.createRow(0);
+        CellStyle style = wb.createCellStyle();
+        style.setFillForegroundColor(IndexedColors.YELLOW.getIndex());
+        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+//        Font headerFont = wb.createFont();
+//        headerFont.setFontName("Arial");
+//        headerFont.setFontHeightInPoints((short) 12);
+//        headerFont.setBold(false);
+//        headerFont.setColor(IndexedColors.BLACK.getIndex());
+//        style.setFont(headerFont);
+        Cell cell0 = row0.createCell(0);
+        row0.createCell(0).setCellValue("No.\n" + "序号");
+        row0.createCell(1).setCellValue("Plant\n" + "装置");
+        row0.createCell(2).setCellValue("Doc. No.\n" +
+                "档案号");
+        row0.createCell(3).setCellValue("Model\n" +
+                "型号");
+        row0.createCell(4).setCellValue("Location\n" +
+                "使用地点");
+        row0.createCell(5).setCellValue("Inspection Date\n" +
+                "检验日期");row0.getCell(5).setCellStyle(style);
+        row0.createCell(6).setCellValue("Inspected By\n" +
+                "检验单位");row0.getCell(6).setCellStyle(style);
+        row0.createCell(7).setCellValue("Report No.\n" +
+                "报告编号");row0.getCell(7).setCellStyle(style);
+        row0.createCell(8).setCellValue("Next start check date\n" +
+                "下次年检日期");row0.getCell(8).setCellStyle(style);
+        row0.createCell(9).setCellValue("Inspection Conclusion\n" +
+                "定期检验结论");row0.getCell(9).setCellStyle(style);
+        //填充数据
+        int rowIndex = 1;
+        int columnIndex = 1;
+        for (TSpecdevDt t: list
+        ) {
+            Row row = sheet.createRow(rowIndex);
+            row.createCell(0).setCellValue(t.getId());
+            row.createCell(1).setCellValue(t.getPlantCode());
+            row.createCell(2).setCellValue(t.getDocno());
+            row.createCell(3).setCellValue(t.getModel());
+            row.createCell(4).setCellValue(t.getLocation());
+            row.createCell(5).setCellValue(new SimpleDateFormat("yyyy-mm-dd").format(t.getWarnDate()));
+            row.createCell(6).setCellValue(t.getCheckUnit());
+            row.createCell(7).setCellValue(t.getReportNo());
+            row.createCell(8).setCellValue(new SimpleDateFormat("yyyy-mm-dd").format(t.getNextWarnDate()));
+            row.createCell(9).setCellValue(t.getPerTestConclusion());
+            rowIndex++;
+        }
+
+        OutputStream out = null;
+        String filename = ExcelUtil.encodingFilename("电梯批量更新");
+        out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
+        wb.write(out);
+        wb.close();
+        out.close();
+        return AjaxResult.success(filename);
+    }
 }

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

@@ -0,0 +1,11 @@
+package com.ruoyi.project.sems.domain;
+
+import lombok.Data;
+
+@Data
+public class ParamData {
+
+    private String ids;
+    private Long num;
+}
+

ui/src/api/sems/specCc.js

@@ -70,3 +70,12 @@ export function exportSpecCc(query) {
     params: query
   })
 }
+
+// 导出特种设备叉车台账
+export function exportSpecList(query) {
+  return request({
+    url: '/sems/specCc/exportDevList',
+    method: 'get',
+    params: query
+  })
+}

ui/src/api/sems/specDt.js

@@ -70,3 +70,12 @@ export function exportSpecDt(query) {
     params: query
   })
 }
+
+// 导出特种设备电梯台账
+export function exportSpecList(query) {
+  return request({
+    url: '/sems/specDt/exportDevList',
+    method: 'get',
+    params: query
+  })
+}

ui/src/api/sems/specYlrq.js

@@ -70,3 +70,12 @@ export function exportSpecYlrq(query) {
     params: query
   })
 }
+
+// 导出特种设备叉车台账
+export function exportSpecList(query) {
+  return request({
+    url: '/common/download/exportDevList',
+    method: 'get',
+    params: query
+  })
+}

ui/src/lang/en.js

@@ -271,7 +271,7 @@ export default {
   分级确认: 'Confirm',
   隐患类型: 'Accident Type',
   单元: 'Unit',
-  介质: 'Medium',
+  介质: 'Media',
   系统: 'System',
   盲板编号: 'Blind No.',
   尺寸: 'Sizes',
@@ -440,7 +440,7 @@ export default {
   是否有节约: 'Saving',
   创意管理编号: 'Creative No.',
   位号: 'Tag No.',
-  设备名称: 'Description',
+  设备名称: 'Equipment Name',
   设备类型: 'Equipment Type',
   优先级: 'Priority',
   专业: 'Discipline',
@@ -545,8 +545,8 @@ export default {
   裂化工艺: 'Cracking',
   姓名: 'Name',
   员工号: 'Employee Id',
-  压力容器: 'Container',
-  压力管道: 'Pipe',
+  压力容器: 'Pressure Vessel',
+  压力管道: 'Pressure Pipe',
   身份证件号: 'ID Number',
   复证日期: 'Review Date',
   下次复审: 'Next Review Date',
@@ -830,7 +830,7 @@ export default {
   指定岗位: 'Designated Post',
   是否涉及: 'Is Involved ',
   其他部门: 'other device',
-  装置: 'Device',
+  装置: 'Plant',
   培训级别: 'Training Level',
   需要培训: 'Needs Training',
   '当被此项目涉及到时，如MOC、事件调查，需要培训': 'When involved in this project, such as MOC, incident investigation, training is needed',
@@ -1187,26 +1187,26 @@ export default {
   检验结论: 'Inspection Conclusion',
   年度维保日期: 'Annual Maintenance Date',
   维修组: 'Maintenance team',
-  装置维修组: 'Unit Maintenance Team',
-  装置维修工程师: 'Unit Maintenance Engineer',
+  装置维修组: 'Plant Maintenance Team',
+  装置维修工程师: 'Plant Maintenance Engineer',
   设备使用地点: 'Place Of Equipment Use',
   在用: 'In Use',
   特种设备: 'Special Equipment',
-  特种设备2: 'Special',
+  特种设备2: 'Special EQP',
   压力管道定期检验计划: 'PpQty by Year and Plant',
   锅炉定期检验计划: 'BiolerQty by Year and Plant',
   压力容器定期检验计划: 'PvQty by Year and Plant',
   '叉车、起重机械、电梯定期检验计划': 'ForkLiftQty,Lifting,MahineryQty and LiftQty by Year and Month',
   devTotalChart: 'devTotal',
-  internalInspection: 'internalInspection',
-  externalInspection: 'externalInspection',
+  internalInspection: 'internal',
+  externalInspection: 'external',
   downloadSelect: 'Download Selected',
   压力容器安全状况等级: 'PressureVessel SafetyLevel',
   压力管道安全状况等级: 'PressurePiping SafetyLevel',
   锅炉台账: 'Boiler Account',
   压力容器台账: 'Pressure Vessel Account',
   压力管道台账: 'Penstock Account',
-  起重机械台账: 'Lifting Machinery Account',
+  起重机械台账: 'Lifting Appliances Account',
   电梯台账: 'Elevator Account',
   定点测厚: 'Fixed Point Thickness Measurement',
   申请管理: 'Application Management',
@@ -1236,8 +1236,8 @@ export default {
   '是否确认导出所有特种设备压力容器台账数据项?': 'Whether to export all special equipment and pressure vessel account data items?',
   '是否确认导出所有特种设备压力管道台账数据项?': 'Whether to export all special equipment and pressure pipeline account data items?',
   审请状态: 'Application Status',
-  注册编号: 'Registration Number',
-  容器类别: 'Container Category',
+  注册编号: ' Registration No.',
+  容器类别: 'Category of Pressure Vessel',
   外形尺寸: 'Overall Dimension',
   涉危化品: 'Hazardous Chemicals',
   国家: 'Country',
@@ -1303,9 +1303,9 @@ export default {
   趋势图:'Trend',
   测厚数据:'Thickness Measurement Data',
   实测记录:'Value',
-  使用证号码:'Use No.',
+  使用证号码:'Use Registration Certificate No.',
   '材料(管/壳)':'Material',
-  '介质(管/壳)':'Medium (Tube/Shell)',
+  '介质(管/壳)':'Media (Tube/Shell)',
   '设计压力MPa':'Design Pressure MPa',
   '操作压力MPa':'Operation Pressure MPa',
   '设计温度℃':'Design Temperature℃',
@@ -1348,11 +1348,11 @@ export default {
   安装年月:'Installation Date',
   公称直径:'Nominal Diameter',
   定期检验结论:'Periodic Inspection Conclusion',
-  设备注册编号:'Equipment Registration Number',
+  设备注册编号:'Equipment Registration No.',
   是否防爆:'Whether Explosion-proof',
   检验报告编号:'Inspection Report No.',
-  特种设备起重机械台账:'Special Equipment Lifting Machinery Account',
-  '是否确认导出所有特种设备起重机械台账数据项?':'Whether to export all special equipment Lifting machinery ledger data items?',
+  特种设备起重机械台账:'Special Equipment Lifting Appliances Account',
+  '是否确认导出所有特种设备起重机械台账数据项?':'Whether to export all special equipment Lifting Appliances ledger data items?',
   '设备品种(名称)':'Equipment Variety (Name)',
   '车架（底盘）编号':'Frame (Site) No.',
   产品编号:'Product No.',
@@ -1579,13 +1579,13 @@ export default {
   预防性管理:'Preventive Management',
   台:'Set',
   设备数:'Number',
-  条:'Strip',
+  条:'PIECE',
   总长度:'Total',
   米:'Meter',
   辆:'Vehicles',
   叉车:'Forklift',
-  非特种设备:'Non-special',
-  起重机械:'Lifting Machinery',
+  非特种设备:'Non-special EQP',
+  起重机械:'Lifting Appliances',
   电梯:'Elevator',
   锅炉允许运行:'The boiler is allowed to run ',
   当前正在审批:'Currently under review',
@@ -1598,7 +1598,7 @@ export default {
   '日常维护保养、定期安全检查记录':'Daily maintenance, regular safety inspection records',
   '年度检查、定期检验报告齐全，报告中问题解决':'The annual inspection and periodic inspection reports are complete, and the problems in the report are solved',
   作业人员定期培训情况:'Regular training of operators',
-  '设备铭牌、漆色、标志、使用证号码':'Equipment nameplate, paint color, logo, license number',
+  '设备铭牌、漆色、标志、使用证号码':'Equipment nameplate, paint color, logo, Use Registration Certificate No.',
   '本体裂、过热、变形、泄漏、损伤情况':'The body is cracked, overheated, deformed, leaked, and damaged',
   '接口部位、焊接接头等裂纹、泄漏、损伤情况':'Cracks, leaks, and damages in interface parts, welded joints, etc.',
   '外表面腐蚀、异常结霜、结露情况':'External surface corrosion, abnormal frosting, and condensation',

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

@@ -153,7 +153,7 @@
       <el-table-column :label="$t('资产归属形式')" align="center" prop="assetOwner" :show-overflow-tooltip="true"/>
 
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('定期检验结论')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
+
       <el-table-column :label="$t('操作')" align="center" fixed="right" width="140" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -367,11 +367,6 @@
           <el-input v-model="form.remarks" :placeholder="$t('请输入')+ $t('备注')" />
         </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item :label="$t('定期检验结论')" prop="perTestConclusion">
-              <el-input v-model="form.perTestConclusion" type="textarea" :placeholder="$t('请输入')+ $t('定期检验结论')" />
-            </el-form-item>
-          </el-col>
 <!--          <el-col :span="12">
           <el-form-item :label="$t('归属部门')" prop="deptId">
               <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" :placeholder="$t('请选择')+ $t('归属部门')" />
@@ -475,7 +470,7 @@
 </template>
 
 <script>
-  import {addSpecCc, delSpecCc, exportSpecCc, getSpecCc, listSpecCc, updateSpecCcPre} from "@/api/sems/specCc";
+  import {addSpecCc, exportSpecCc, getSpecCc, listSpecCc, updateSpecCcPre,exportSpecList} from "@/api/sems/specCc";
   import {treeselect} from "@/api/system/dept";
   import {getToken} from "@/utils/auth";
   import Treeselect from "@riophae/vue-treeselect";
@@ -662,7 +657,6 @@
         updatedate: null,
         deptId: null,
         remarks: null,
-        perTestConclusion:null,
         approveStatus: 0,
         regno: null,
         useno: null,
@@ -928,15 +922,23 @@
       var rows = this.dataListSelections.map(item => {
         return item.id
       })
-      this.ids = rows
-      if (type == 1){
-        this.downloadType = 1
-      }else if (type == 2){
-        this.downloadType = 2
-      }
-      this.$nextTick(() => {
-        this.$refs['downloadDevForm'].submit()
-      })
+      const queryParams = {ids: null};
+      queryParams.ids = rows.join()
+      exportSpecList(queryParams).then(response => {
+          this.download(response.msg);
+        })
+      // var rows = this.dataListSelections.map(item => {
+      //   return item.id
+      // })
+      // this.ids = rows
+      // if (type == 1){
+      //   this.downloadType = 1
+      // }else if (type == 2){
+      //   this.downloadType = 2
+      // }
+      // this.$nextTick(() => {
+      //   this.$refs['downloadDevForm'].submit()
+      // })
     },
     uploadUrl (uploadType) {
       return process.env.VUE_APP_BASE_API + "/sems/specCc/updateData"

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

@@ -411,7 +411,7 @@
 </template>
 
 <script>
-  import {addSpecDt, delSpecDt, exportSpecDt, getSpecDt, listSpecDt, updateSpecDtPre} from "@/api/sems/specDt";
+  import {addSpecDt, delSpecDt, exportSpecDt, getSpecDt, listSpecDt, updateSpecDtPre,exportSpecList} from "@/api/sems/specDt";
   import {treeselect} from "@/api/system/dept";
   import {getToken} from "@/utils/auth";
   import Treeselect from "@riophae/vue-treeselect";
@@ -423,7 +423,6 @@
   import {listPostUser} from "@/api/system/user";
   import {addModify} from "@/api/sems/his/modify";
   import HisReform from "./specDt-hisReform";
-  import {listSpecGl} from "@/api/sems/specGl";
 
   export default {
   name: "SpecDt",
@@ -832,15 +831,23 @@
       var rows = this.dataListSelections.map(item => {
         return item.id
       })
-      this.ids = rows
-      if (type == 1){
-        this.downloadType = 1
-      }else if (type == 2){
-        this.downloadType = 2
-      }
-      this.$nextTick(() => {
-        this.$refs['downloadDevForm'].submit()
+      const queryParams = {ids: null};
+      queryParams.ids = rows.join()
+      exportSpecList(queryParams).then(response => {
+        this.download(response.msg);
       })
+      // var rows = this.dataListSelections.map(item => {
+      //   return item.id
+      // })
+      // this.ids = rows
+      // if (type == 1){
+      //   this.downloadType = 1
+      // }else if (type == 2){
+      //   this.downloadType = 2
+      // }
+      // this.$nextTick(() => {
+      //   this.$refs['downloadDevForm'].submit()
+      // })
     },
     uploadUrl (uploadType) {
       return process.env.VUE_APP_BASE_API + "/sems/specDt/updateData"