PSSR附件导出

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrApproveController.java

@@ -2234,8 +2234,12 @@ public class TPssrApproveController extends BaseController {
                     result = instrumentCalibrationController.export(calibration);
                     msg = (String) result.get("msg");
                     path = downloadPath + msg;
-                    this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
-//                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+//                    this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
+                    try {
+                        Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                    } catch (IOException e) {
+                        throw new Exception(e);
+                    }
 //                    files.add(new File(rootPath + subTitle + msg));
                     break;
                 case "yblscs"://仪表联锁测试
@@ -2247,8 +2251,12 @@ public class TPssrApproveController extends BaseController {
                     for (TPssrInstrumentTest test : instrumentTests) {
                         String fileUrl = test.getFileUrl();
                         String newFileUrl = getProfile() + fileUrl.replace("/profile", "");
-                        this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
-//                        Files.copy(Paths.get(newFileUrl), Paths.get(rootPath + subTitle + fileUrl.substring(fileUrl.lastIndexOf("/"))), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+//                        this.copyFileIgnoreException(newFileUrl, rootPath + subTitle + fileUrl.substring(fileUrl.lastIndexOf("/")), files, rootPath + subTitle + msg);
+                        try {
+                            Files.copy(Paths.get(newFileUrl), Paths.get(rootPath + subTitle + fileUrl.substring(fileUrl.lastIndexOf("/"))), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                        } catch (IOException e) {
+                            throw new Exception(e);
+                        }
                     }
                     break;
                 case "bjlszqr"://报警/联锁值确认

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrBlindController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.project.pssr.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -256,11 +257,12 @@ public class TPssrBlindController extends BaseController {
                 } catch (NumberFormatException e) {
                     throw new RuntimeException(e);
                 }
-                row.createCell(16).setCellValue(t.getRemarks());
+                row.createCell(16).setCellValue(DateUtils.dateTime(t.getInstallDate()));
+                row.createCell(17).setCellValue(t.getRemarks());
 
 
                 //渲染样式
-                for (int i = 0; i < 17; i++) {
+                for (int i = 0; i < 18; i++) {
                     row.getCell(i).setCellStyle(originalStyle);
                 }
                 num++;

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrInstrumentCalibrationController.java

@@ -173,284 +173,420 @@ public class TPssrInstrumentCalibrationController extends BaseController {
     @GetMapping("/export")
     public AjaxResult export(TPssrInstrumentCalibration tPssrInstrumentCalibration) {
         List<TPssrInstrumentCalibration> list = tPssrInstrumentCalibrationService.selectTPssrInstrumentCalibrationList(tPssrInstrumentCalibration);
-        return AjaxResult.success(exportTmpl(list));
+        if (tPssrInstrumentCalibration.getDevType().equals("1")) {
+            return AjaxResult.success(exportTmpl3(list));
+        } else if (tPssrInstrumentCalibration.getDevType().equals("2")) {
+            return AjaxResult.success(exportTmpl2(list));
+        } else if (tPssrInstrumentCalibration.getDevType().equals("3")) {
+            return AjaxResult.success(exportTmpl1(list));
+        }
+        return AjaxResult.error("导出失败，请联系管理员！");
     }
 
-    public String exportTmpl(List<TPssrInstrumentCalibration> list) {
-        OutputStream out = null;
-        String filename = null;
-        try {
-            String tempUrl = "static/word/pssr/ybjy.xlsx"; // 模板文件
-            InputStream is = null;
-            is = Thread.currentThread().getContextClassLoader().getResourceAsStream(tempUrl);
-            XSSFWorkbook wb = null;
-            wb = new XSSFWorkbook(is);
-            XSSFSheet sheet = wb.getSheetAt(0);
-
-            //填充数据
-            int rowIndex = 3;
-            int num = 1;
-
-            Row originalRow = sheet.getRow(3);
-            Cell originalcell = originalRow.getCell(0);
-            // 获取单元格样式
-            CellStyle originalStyle = originalcell.getCellStyle();
-
-            for (TPssrInstrumentCalibration t : list) {
-                Row row = sheet.createRow(rowIndex);
-                row.setHeight((short) 800);
-                row.createCell(0).setCellValue(num);
-                row.createCell(1).setCellValue(t.getUnit());
-                row.createCell(2).setCellValue(t.getDevNo());
-                row.createCell(3).setCellValue(t.getVisualInspection());
-                row.createCell(4).setCellValue(t.getInstallationInspection());
-                row.createCell(5).setCellValue(t.getFunctionalCheck());
-                row.createCell(6);
-                row.createCell(7);
-                try {
-                    SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getConfirm1()));
-                    SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirm2()));
-                    String confirm1 = sysUser.getSignUrl();
-                    String confirm2 = sysUser2.getSignUrl();
-                    ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 6, 1, 1);
-                    ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 7, 1, 1);
-                } catch (NumberFormatException e) {
-                    throw new RuntimeException(e);
-                }
-                row.createCell(8).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
-                row.createCell(9).setCellValue(t.getRemarks());
+        public String exportTmpl1 (List < TPssrInstrumentCalibration > list) {
+            OutputStream out = null;
+            String filename = null;
+            try {
+                String tempUrl = "static/word/pssr/ybjytjf.xlsx"; // 模板文件
+                InputStream is = null;
+                is = Thread.currentThread().getContextClassLoader().getResourceAsStream(tempUrl);
+                XSSFWorkbook wb = null;
+                wb = new XSSFWorkbook(is);
+                XSSFSheet sheet = wb.getSheetAt(0);
+
+                //填充数据
+                int rowIndex = 2;
+                int num = 1;
+
+                Row originalRow = sheet.getRow(2);
+                Cell originalcell = originalRow.getCell(0);
+                // 获取单元格样式
+                CellStyle originalStyle = originalcell.getCellStyle();
+
+                for (TPssrInstrumentCalibration t : list) {
+                    Row row = sheet.createRow(rowIndex);
+                    row.setHeight((short) 800);
+                    row.createCell(0).setCellValue(num);
+                    row.createCell(1).setCellValue(t.getUnit());
+                    row.createCell(2).setCellValue(t.getDevNo());
+                    row.createCell(3).setCellValue(t.getVisualInspection());
+                    row.createCell(4).setCellValue(t.getFlowCheck());
+                    row.createCell(5).setCellValue(t.getFileCheck());
+                    row.createCell(6).setCellValue(t.getFunctionalCheck());
+                    row.createCell(7);
+                    row.createCell(8);
+                    try {
+                        SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getConfirm1()));
+                        SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirm2()));
+                        String confirm1 = sysUser.getSignUrl();
+                        String confirm2 = sysUser2.getSignUrl();
+                        ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 7, 1, 1);
+                        ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 8, 1, 1);
+                    } catch (NumberFormatException e) {
+                        throw new RuntimeException(e);
+                    }
+                    row.createCell(9).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
+                    row.createCell(10).setCellValue(t.getRemarks());
 
 
-                //渲染样式
-                for (int i = 0; i < 10; i++) {
-                    row.getCell(i).setCellStyle(originalStyle);
+                    //渲染样式
+                    for (int i = 0; i < 11; i++) {
+                        row.getCell(i).setCellStyle(originalStyle);
+                    }
+                    num++;
+                    rowIndex++;
                 }
-                num++;
-                rowIndex++;
+                filename = "PSSR_23_仪表校验_调节阀" + ".xlsx";
+                out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
+                wb.write(out);
+                wb.close();
+
+            } catch (IOException e) {
+                e.printStackTrace();
             }
-            filename = "PSSR_23_仪表校验" + ".xlsx";
-            out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
-            wb.write(out);
-            wb.close();
+            return filename;
+        }
+
+        public String exportTmpl2 (List < TPssrInstrumentCalibration > list) {
+            OutputStream out = null;
+            String filename = null;
+            try {
+                String tempUrl = "static/word/pssr/ybjyywj.xlsx"; // 模板文件
+                InputStream is = null;
+                is = Thread.currentThread().getContextClassLoader().getResourceAsStream(tempUrl);
+                XSSFWorkbook wb = null;
+                wb = new XSSFWorkbook(is);
+                XSSFSheet sheet = wb.getSheetAt(0);
+
+                //填充数据
+                int rowIndex = 3;
+                int num = 1;
+
+                Row originalRow = sheet.getRow(3);
+                Cell originalcell = originalRow.getCell(0);
+                // 获取单元格样式
+                CellStyle originalStyle = originalcell.getCellStyle();
+
+                for (TPssrInstrumentCalibration t : list) {
+                    Row row = sheet.createRow(rowIndex);
+                    row.setHeight((short) 800);
+                    row.createCell(0).setCellValue(num);
+                    row.createCell(1).setCellValue(t.getUnit());
+                    row.createCell(2).setCellValue(t.getDevNo());
+                    row.createCell(3).setCellValue(t.getVisualInspection());
+                    row.createCell(4).setCellValue(t.getInstallationInspection());
+                    row.createCell(5).setCellValue(t.getFunctionalCheck());
+                    row.createCell(6);
+                    row.createCell(7);
+                    try {
+                        SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getConfirm1()));
+                        SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirm2()));
+                        String confirm1 = sysUser.getSignUrl();
+                        String confirm2 = sysUser2.getSignUrl();
+                        ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 6, 1, 1);
+                        ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 7, 1, 1);
+                    } catch (NumberFormatException e) {
+                        throw new RuntimeException(e);
+                    }
+                    row.createCell(8).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
+                    row.createCell(9).setCellValue(t.getRemarks());
 
-        } catch (IOException e) {
-            e.printStackTrace();
+
+                    //渲染样式
+                    for (int i = 0; i < 10; i++) {
+                        row.getCell(i).setCellStyle(originalStyle);
+                    }
+                    num++;
+                    rowIndex++;
+                }
+                filename = "PSSR_23_仪表校验_液位计" + ".xlsx";
+                out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
+                wb.write(out);
+                wb.close();
+
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            return filename;
         }
-        return filename;
-    }
 
-    /**
-     * 获取仪表校验详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('pssr:instrumentCalibration:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
-        TPssrInstrumentCalibration item = tPssrInstrumentCalibrationService.selectTPssrInstrumentCalibrationById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "ybjy"));
-        if (item.getApproveStatus() != 2)
-            item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "ybjy"));
-        return AjaxResult.success(item);
-    }
+        public String exportTmpl3 (List < TPssrInstrumentCalibration > list) {
+            OutputStream out = null;
+            String filename = null;
+            try {
+                String tempUrl = "static/word/pssr/ybjyllj.xlsx"; // 模板文件
+                InputStream is = null;
+                is = Thread.currentThread().getContextClassLoader().getResourceAsStream(tempUrl);
+                XSSFWorkbook wb = null;
+                wb = new XSSFWorkbook(is);
+                XSSFSheet sheet = wb.getSheetAt(0);
+
+                //填充数据
+                int rowIndex = 2;
+                int num = 1;
+
+                Row originalRow = sheet.getRow(2);
+                Cell originalcell = originalRow.getCell(0);
+                // 获取单元格样式
+                CellStyle originalStyle = originalcell.getCellStyle();
+
+                for (TPssrInstrumentCalibration t : list) {
+                    Row row = sheet.createRow(rowIndex);
+                    row.setHeight((short) 800);
+                    row.createCell(0).setCellValue(num);
+                    row.createCell(1).setCellValue(t.getUnit());
+                    row.createCell(2).setCellValue(t.getDevNo());
+                    row.createCell(3).setCellValue(t.getVisualInspection());
+                    row.createCell(4).setCellValue(t.getInstallationInspection());
+                    row.createCell(5).setCellValue(t.getFunctionalCheck());
+                    row.createCell(6);
+                    row.createCell(7);
+                    try {
+                        SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getConfirm1()));
+                        SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirm2()));
+                        String confirm1 = sysUser.getSignUrl();
+                        String confirm2 = sysUser2.getSignUrl();
+                        ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 6, 1, 1);
+                        ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 7, 1, 1);
+                    } catch (NumberFormatException e) {
+                        throw new RuntimeException(e);
+                    }
+                    row.createCell(8).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
+                    row.createCell(9).setCellValue(t.getRemarks());
 
-    /**
-     * 新增仪表校验
-     */
-    @PreAuthorize("@ss.hasPermi('pssr:instrumentCalibration:add')")
-    @Log(title = "仪表校验", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody TPssrInstrumentCalibration tPssrInstrumentCalibration) {
-        if (StringUtils.isNotEmpty(tPssrInstrumentCalibration.getConfirm1()) && tPssrInstrumentCalibration.getConfirm1().equals(tPssrInstrumentCalibration.getConfirm2())) {
-            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+
+                    //渲染样式
+                    for (int i = 0; i < 10; i++) {
+                        row.getCell(i).setCellStyle(originalStyle);
+                    }
+                    num++;
+                    rowIndex++;
+                }
+                filename = "PSSR_23_仪表校验_流量计" + ".xlsx";
+                out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
+                wb.write(out);
+                wb.close();
+
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            return filename;
         }
-        tPssrInstrumentCalibration.setApproveStatus(0L);
-        return toAjax(tPssrInstrumentCalibrationService.insertTPssrInstrumentCalibration(tPssrInstrumentCalibration));
-    }
 
-    /**
-     * 修改仪表校验
-     */
-    @PreAuthorize("@ss.hasPermi('pssr:instrumentCalibration:edit')")
-    @Log(title = "仪表校验", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody TPssrInstrumentCalibration tPssrInstrumentCalibration) {
-        if (tPssrInstrumentCalibration.getConfirm1().equals(tPssrInstrumentCalibration.getConfirm2())) {
-            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        /**
+         * 获取仪表校验详细信息
+         */
+        @PreAuthorize("@ss.hasPermi('pssr:instrumentCalibration:query')")
+        @GetMapping(value = "/{id}")
+        public AjaxResult getInfo (@PathVariable("id") Long id){
+            TPssrInstrumentCalibration item = tPssrInstrumentCalibrationService.selectTPssrInstrumentCalibrationById(id);
+            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "ybjy"));
+            if (item.getApproveStatus() != 2)
+                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "ybjy"));
+            return AjaxResult.success(item);
         }
-        tPssrFileService.updateFileRelevance(tPssrInstrumentCalibration.getFileIds(), "ybjy", tPssrInstrumentCalibration.getId(), tPssrInstrumentCalibration.getSubId());
-        return toAjax(tPssrInstrumentCalibrationService.updateTPssrInstrumentCalibration(tPssrInstrumentCalibration));
-    }
 
-    /**
-     * 修改仪表校验
-     */
-    @PreAuthorize("@ss.hasPermi('pssr:instrumentCalibration:edit')")
-    @Log(title = "仪表校验", businessType = BusinessType.UPDATE)
-    @PutMapping("/editBatch")
-    public AjaxResult editb(@RequestBody TPssrInstrumentCalibration tPssrInstrumentCalibration) {
-        if (tPssrInstrumentCalibration.getConfirm1().equals(tPssrInstrumentCalibration.getConfirm2())) {
-            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        /**
+         * 新增仪表校验
+         */
+        @PreAuthorize("@ss.hasPermi('pssr:instrumentCalibration:add')")
+        @Log(title = "仪表校验", businessType = BusinessType.INSERT)
+        @PostMapping
+        public AjaxResult add (@RequestBody TPssrInstrumentCalibration tPssrInstrumentCalibration){
+            if (StringUtils.isNotEmpty(tPssrInstrumentCalibration.getConfirm1()) && tPssrInstrumentCalibration.getConfirm1().equals(tPssrInstrumentCalibration.getConfirm2())) {
+                return AjaxResult.error("确认人不能为同一人，请重新选择！");
+            }
+            tPssrInstrumentCalibration.setApproveStatus(0L);
+            return toAjax(tPssrInstrumentCalibrationService.insertTPssrInstrumentCalibration(tPssrInstrumentCalibration));
         }
-        return toAjax(tPssrInstrumentCalibrationMapper.updateTPssrInstrumentCalibrationByIds(tPssrInstrumentCalibration));
-    }
 
-    /**
-     * 删除仪表校验
-     */
-    @PreAuthorize("@ss.hasPermi('pssr:instrumentCalibration:remove')")
-    @Log(title = "仪表校验", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(tPssrInstrumentCalibrationService.deleteTPssrInstrumentCalibrationByIds(ids));
-    }
+        /**
+         * 修改仪表校验
+         */
+        @PreAuthorize("@ss.hasPermi('pssr:instrumentCalibration:edit')")
+        @Log(title = "仪表校验", businessType = BusinessType.UPDATE)
+        @PutMapping
+        public AjaxResult edit (@RequestBody TPssrInstrumentCalibration tPssrInstrumentCalibration){
+            if (tPssrInstrumentCalibration.getConfirm1().equals(tPssrInstrumentCalibration.getConfirm2())) {
+                return AjaxResult.error("确认人不能为同一人，请重新选择！");
+            }
+            tPssrFileService.updateFileRelevance(tPssrInstrumentCalibration.getFileIds(), "ybjy", tPssrInstrumentCalibration.getId(), tPssrInstrumentCalibration.getSubId());
+            return toAjax(tPssrInstrumentCalibrationService.updateTPssrInstrumentCalibration(tPssrInstrumentCalibration));
+        }
 
+        /**
+         * 修改仪表校验
+         */
+        @PreAuthorize("@ss.hasPermi('pssr:instrumentCalibration:edit')")
+        @Log(title = "仪表校验", businessType = BusinessType.UPDATE)
+        @PutMapping("/editBatch")
+        public AjaxResult editb (@RequestBody TPssrInstrumentCalibration tPssrInstrumentCalibration){
+            if (tPssrInstrumentCalibration.getConfirm1().equals(tPssrInstrumentCalibration.getConfirm2())) {
+                return AjaxResult.error("确认人不能为同一人，请重新选择！");
+            }
+            return toAjax(tPssrInstrumentCalibrationMapper.updateTPssrInstrumentCalibrationByIds(tPssrInstrumentCalibration));
+        }
 
-    /**
-     * 确认仪表校验
-     */
-    @PreAuthorize("@ss.hasPermi('pssr:instrumentCalibration:edit')")
-    @Log(title = "仪表校验", businessType = BusinessType.UPDATE)
-    @PutMapping("/confirmInstrumentCalibration")
-    public AjaxResult confirmInstrumentCalibration(@RequestBody TPssrInstrumentCalibration tPssrInstrumentCalibration) {
-        long queryStatus = 0;
-        long approveStatus = 0;
-        Date date = null;
-        if (tPssrInstrumentCalibration.getTaskType() == 4) {
-            //拆锁确认
-            queryStatus = 1;
-            approveStatus = 3;
-            date = new Date();
-        } else if (tPssrInstrumentCalibration.getTaskType() == 5) {
-            //上锁确认
-            queryStatus = 3;
-            approveStatus = 2;
-            date = new Date();
+        /**
+         * 删除仪表校验
+         */
+        @PreAuthorize("@ss.hasPermi('pssr:instrumentCalibration:remove')")
+        @Log(title = "仪表校验", businessType = BusinessType.DELETE)
+        @DeleteMapping("/{ids}")
+        public AjaxResult remove (@PathVariable Long[]ids){
+            return toAjax(tPssrInstrumentCalibrationService.deleteTPssrInstrumentCalibrationByIds(ids));
         }
-        // 修改状态
-        if (tPssrInstrumentCalibration.getIds() != null && tPssrInstrumentCalibration.getIds().length > 0) {
-            for (Long id : tPssrInstrumentCalibration.getIds()) {
-                TPssrInstrumentCalibration item = tPssrInstrumentCalibrationService.selectTPssrInstrumentCalibrationById(id);
-                item.setApproveStatus(approveStatus);
-                if (queryStatus == 3) {
-                    item.setConfirmationDate(date);
-                }
-                tPssrInstrumentCalibrationService.updateTPssrInstrumentCalibration(item);
+
+
+        /**
+         * 确认仪表校验
+         */
+        @PreAuthorize("@ss.hasPermi('pssr:instrumentCalibration:edit')")
+        @Log(title = "仪表校验", businessType = BusinessType.UPDATE)
+        @PutMapping("/confirmInstrumentCalibration")
+        public AjaxResult confirmInstrumentCalibration (@RequestBody TPssrInstrumentCalibration
+        tPssrInstrumentCalibration){
+            long queryStatus = 0;
+            long approveStatus = 0;
+            Date date = null;
+            if (tPssrInstrumentCalibration.getTaskType() == 4) {
+                //拆锁确认
+                queryStatus = 1;
+                approveStatus = 3;
+                date = new Date();
+            } else if (tPssrInstrumentCalibration.getTaskType() == 5) {
+                //上锁确认
+                queryStatus = 3;
+                approveStatus = 2;
+                date = new Date();
             }
-        } else {
-            TPssrInstrumentCalibration lock = new TPssrInstrumentCalibration();
-            lock.setSubId(tPssrInstrumentCalibration.getSubId());
-            lock.setApproveStatus(queryStatus);
-            lock.setDevType(tPssrInstrumentCalibration.getDevType());
-            for (TPssrInstrumentCalibration item : tPssrInstrumentCalibrationService.selectTPssrInstrumentCalibrationList(lock)) {
-                if (queryStatus == 3) {
-                    item.setConfirmationDate(date);
+            // 修改状态
+            if (tPssrInstrumentCalibration.getIds() != null && tPssrInstrumentCalibration.getIds().length > 0) {
+                for (Long id : tPssrInstrumentCalibration.getIds()) {
+                    TPssrInstrumentCalibration item = tPssrInstrumentCalibrationService.selectTPssrInstrumentCalibrationById(id);
+                    item.setApproveStatus(approveStatus);
+                    if (queryStatus == 3) {
+                        item.setConfirmationDate(date);
+                    }
+                    tPssrInstrumentCalibrationService.updateTPssrInstrumentCalibration(item);
                 }
-                item.setApproveStatus(approveStatus);
-                tPssrInstrumentCalibrationService.updateTPssrInstrumentCalibration(item);
-            }
-        }
-        //查询当前待审批的确认人
-        TPssrInstrumentCalibration entity = new TPssrInstrumentCalibration();
-        entity.setSubId(tPssrInstrumentCalibration.getSubId());
-        entity.setApproveStatus(queryStatus);
-        entity.setDevType(tPssrInstrumentCalibration.getDevType());
-        for (TPssrInstrumentCalibration item : tPssrInstrumentCalibrationService.selectTPssrInstrumentCalibrationList(entity)) {
-            if (tPssrInstrumentCalibration.getTaskType() == 4) {
-                if (item.getConfirm1().equals(getUserId().toString())) {
-                    return AjaxResult.success();
+            } else {
+                TPssrInstrumentCalibration lock = new TPssrInstrumentCalibration();
+                lock.setSubId(tPssrInstrumentCalibration.getSubId());
+                lock.setApproveStatus(queryStatus);
+                lock.setDevType(tPssrInstrumentCalibration.getDevType());
+                for (TPssrInstrumentCalibration item : tPssrInstrumentCalibrationService.selectTPssrInstrumentCalibrationList(lock)) {
+                    if (queryStatus == 3) {
+                        item.setConfirmationDate(date);
+                    }
+                    item.setApproveStatus(approveStatus);
+                    tPssrInstrumentCalibrationService.updateTPssrInstrumentCalibration(item);
                 }
-            } else if (tPssrInstrumentCalibration.getTaskType() == 5) {
-                if (item.getConfirm2().equals(getUserId().toString())) {
-                    return AjaxResult.success();
+            }
+            //查询当前待审批的确认人
+            TPssrInstrumentCalibration entity = new TPssrInstrumentCalibration();
+            entity.setSubId(tPssrInstrumentCalibration.getSubId());
+            entity.setApproveStatus(queryStatus);
+            entity.setDevType(tPssrInstrumentCalibration.getDevType());
+            for (TPssrInstrumentCalibration item : tPssrInstrumentCalibrationService.selectTPssrInstrumentCalibrationList(entity)) {
+                if (tPssrInstrumentCalibration.getTaskType() == 4) {
+                    if (item.getConfirm1().equals(getUserId().toString())) {
+                        return AjaxResult.success();
+                    }
+                } else if (tPssrInstrumentCalibration.getTaskType() == 5) {
+                    if (item.getConfirm2().equals(getUserId().toString())) {
+                        return AjaxResult.success();
+                    }
                 }
             }
-        }
 
-        //无待审批任务结束当前用户流程
+            //无待审批任务结束当前用户流程
 
-        // 因为流程关系所以approve一定会有且只有一条数据
-        TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrInstrumentCalibration.getSubId());
-        TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
-        return AjaxResult.success();
+            // 因为流程关系所以approve一定会有且只有一条数据
+            TPssrApprove tPssrApprove = tPssrApproveService.selectTPssrApproveBySubId(tPssrInstrumentCalibration.getSubId());
+            TPssrApproveController.handleConfirmApprove(tPssrApprove, getUserId().toString());
+            return AjaxResult.success();
 
-    }
+        }
 
-    /**
-     * 驳回仪表校验
-     */
-    @PutMapping("/turnDownInstrumentCalibration")
-    public AjaxResult turnDownInstrumentCalibration(@RequestBody List<TPssrInstrumentCalibration> tPssrInstrumentCalibration) {
-        if (CollectionUtils.isNotEmpty(tPssrInstrumentCalibration)) {
-            String userId = getUserId().toString();
-            Long subId = tPssrInstrumentCalibration.get(0).getSubId();
-            // 修改已选择数据的状态
-            for (TPssrInstrumentCalibration item : tPssrInstrumentCalibration) {
+        /**
+         * 驳回仪表校验
+         */
+        @PutMapping("/turnDownInstrumentCalibration")
+        public AjaxResult turnDownInstrumentCalibration
+        (@RequestBody List < TPssrInstrumentCalibration > tPssrInstrumentCalibration) {
+            if (CollectionUtils.isNotEmpty(tPssrInstrumentCalibration)) {
+                String userId = getUserId().toString();
+                Long subId = tPssrInstrumentCalibration.get(0).getSubId();
+                // 修改已选择数据的状态
+                for (TPssrInstrumentCalibration item : tPssrInstrumentCalibration) {
+                    TPssrInstrumentCalibration blind = new TPssrInstrumentCalibration();
+                    blind.setId(item.getId());
+                    blind.setApproveStatus(1L);
+                    blind.setUpdatedate(new Date());
+                    blind.setUpdaterCode(getUserId().toString());
+                    tPssrInstrumentCalibrationService.updateTPssrInstrumentCalibration(blind);
+                    // 新增驳回原因数据
+                    TPssrTurndown turndown = new TPssrTurndown();
+                    turndown.setForShort(forShort);
+                    turndown.setSubId(item.getSubId());
+                    turndown.setItemId(item.getId());
+                    turndown.setReason(item.getReason());
+                    turndown.setCreatedate(new Date());
+                    turndown.setCreaterCode(getUserId().toString());
+                    tPssrTurndownService.insertTPssrTurndown(turndown);
+                }
+                // 查询当前流程
+                TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
+
+                ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
+                TaskService taskService = processEngine.getTaskService();
+                Task task = processEngine.getTaskService()//获取任务service
+                        .createTaskQuery()//创建查询对象
+                        .taskAssignee(userId)
+                        .processInstanceId(approve.getProcessId()).singleResult();
+                String taskId = task.getId();
+
+                // 驳回 查询所有待审批的人员
                 TPssrInstrumentCalibration blind = new TPssrInstrumentCalibration();
-                blind.setId(item.getId());
+                blind.setSubId(subId);
                 blind.setApproveStatus(1L);
-                blind.setUpdatedate(new Date());
-                blind.setUpdaterCode(getUserId().toString());
-                tPssrInstrumentCalibrationService.updateTPssrInstrumentCalibration(blind);
-                // 新增驳回原因数据
-                TPssrTurndown turndown = new TPssrTurndown();
-                turndown.setForShort(forShort);
-                turndown.setSubId(item.getSubId());
-                turndown.setItemId(item.getId());
-                turndown.setReason(item.getReason());
-                turndown.setCreatedate(new Date());
-                turndown.setCreaterCode(getUserId().toString());
-                tPssrTurndownService.insertTPssrTurndown(turndown);
-            }
-            // 查询当前流程
-            TPssrApprove approve = tPssrApproveService.selectTPssrApproveBySubId(subId);
-
-            ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
-            TaskService taskService = processEngine.getTaskService();
-            Task task = processEngine.getTaskService()//获取任务service
-                    .createTaskQuery()//创建查询对象
-                    .taskAssignee(userId)
-                    .processInstanceId(approve.getProcessId()).singleResult();
-            String taskId = task.getId();
-
-            // 驳回 查询所有待审批的人员
-            TPssrInstrumentCalibration blind = new TPssrInstrumentCalibration();
-            blind.setSubId(subId);
-            blind.setApproveStatus(1L);
-            Set<String> installer = new HashSet<>();
-            Set<String> remover = new HashSet<>();
-            for (TPssrInstrumentCalibration item : tPssrInstrumentCalibrationService.selectTPssrInstrumentCalibrationList(blind)) {
-
-                // 安装人员
-                installer.add(item.getConfirm1());
-
-                //拆除人员
-                remover.add(item.getConfirm2());
-            }
+                Set<String> installer = new HashSet<>();
+                Set<String> remover = new HashSet<>();
+                for (TPssrInstrumentCalibration item : tPssrInstrumentCalibrationService.selectTPssrInstrumentCalibrationList(blind)) {
 
+                    // 安装人员
+                    installer.add(item.getConfirm1());
 
-            //处理流程节点
-            Map<String, Object> param = new HashMap<>();
-            param.put("condition", 1);
-            param.put("confirmUsers1", new ArrayList<>(installer));
-            param.put("confirmUsers2", new ArrayList<>(remover));
-            //认领任务
-            processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回");
-            taskService.complete(taskId, param);
-
-            // 修改审批表和sub表
-            approve.setApproveStatus(1L);
-            approve.setUpdatedate(new Date());
-            approve.setUpdaterCode(getUserId().toString());
-            tPssrApproveService.updateTPssrApprove(approve);
-
-            TPssrSubcontent subcontent = new TPssrSubcontent();
-            subcontent.setId(approve.getSubId());
-            subcontent.setApproveStatus(1L);
-            subcontent.setUpdatedate(new Date());
-            subcontent.setUpdaterCode(getUserId().toString());
-            tPssrSubcontentService.updateTPssrSubcontent(subcontent);
-            return AjaxResult.success();
+                    //拆除人员
+                    remover.add(item.getConfirm2());
+                }
+
+
+                //处理流程节点
+                Map<String, Object> param = new HashMap<>();
+                param.put("condition", 1);
+                param.put("confirmUsers1", new ArrayList<>(installer));
+                param.put("confirmUsers2", new ArrayList<>(remover));
+                //认领任务
+                processEngine.getTaskService().claim(taskId, userId);
+                taskService.addComment(taskId, approve.getProcessId(), "驳回");
+                taskService.complete(taskId, param);
+
+                // 修改审批表和sub表
+                approve.setApproveStatus(1L);
+                approve.setUpdatedate(new Date());
+                approve.setUpdaterCode(getUserId().toString());
+                tPssrApproveService.updateTPssrApprove(approve);
+
+                TPssrSubcontent subcontent = new TPssrSubcontent();
+                subcontent.setId(approve.getSubId());
+                subcontent.setApproveStatus(1L);
+                subcontent.setUpdatedate(new Date());
+                subcontent.setUpdaterCode(getUserId().toString());
+                tPssrSubcontentService.updateTPssrSubcontent(subcontent);
+                return AjaxResult.success();
+            }
+            return AjaxResult.error();
         }
-        return AjaxResult.error();
     }
-}

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMaterialController.java

@@ -135,7 +135,7 @@ public class TPssrMaterialController extends BaseController {
                 row.createCell(1).setCellValue(t.getUtilityQuantity());
                 row.createCell(2).setCellValue(t.getQuantity());
                 row.createCell(3).setCellValue(t.getUnit());
-                row.createCell(4).setCellValue(t.getNote());
+                row.createCell(4).setCellValue(t.getRemarks());
                 //渲染样式
                 for (int i = 0; i < 5; i++) {
                     row.getCell(i).setCellStyle(originalStyle);
@@ -187,7 +187,7 @@ public class TPssrMaterialController extends BaseController {
                 row2.createCell(1).setCellValue(t2.getRawMaterial());
                 row2.createCell(2).setCellValue(t2.getQuantity());
                 row2.createCell(3).setCellValue(t2.getUnit());
-                row2.createCell(4).setCellValue(t2.getNote());
+                row2.createCell(4).setCellValue(t2.getRemarks());
                 //渲染样式
                 for (int i = 0; i < 5; i++) {
                     row2.getCell(i).setCellStyle(originalStyle);

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrNitrogenController.java

@@ -202,7 +202,7 @@ public class TPssrNitrogenController extends BaseController {
                 row.setHeight((short) 800);
                 row.createCell(0).setCellValue(num);
                 row.createCell(1).setCellValue(t.getSystemName());
-                row.createCell(2).setCellValue(DateUtils.dateTime(t.getSamplingDate()));
+                row.createCell(2).setCellValue(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM,t.getSamplingDate()));
                 row.createCell(3).setCellValue(t.getSampleName());
                 row.createCell(4).setCellValue(t.getOxygen());
                 row.createCell(5).setCellValue(t.getDewPoint());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulExchangerController.java

@@ -123,6 +123,28 @@ public class TPssrOverhaulExchangerController extends BaseController {
             XSSFWorkbook wb = null;
             wb = new XSSFWorkbook(is);
             XSSFSheet sheet = wb.getSheetAt(0);
+            switch (devType.toString()) {
+                case "1":
+                    filename = "PSSR_01_检修项目_换热器"  + ".xlsx";
+                    sheet.getRow(0).getCell(0).setCellValue("换热器检修清单");
+                    break;
+                case "2":
+                    filename = "PSSR_01_检修项目_电仪"  + ".xlsx";
+                    sheet.getRow(0).getCell(0).setCellValue("电仪检修清单");
+                    break;
+                case "3":
+                    filename = "PSSR_01_检修项目_反应器"  + ".xlsx";
+                    sheet.getRow(0).getCell(0).setCellValue("反应器检修清单");
+                    break;
+                case "4":
+                    filename = "PSSR_01_检修项目_裂解炉"  + ".xlsx";
+                    sheet.getRow(0).getCell(0).setCellValue("裂解炉检修清单");
+                    break;
+                case "5":
+                    filename = "PSSR_01_检修项目_其他"  + ".xlsx";
+                    sheet.getRow(0).getCell(0).setCellValue("其他检修清单");
+                    break;
+            }
 
             //填充数据
             int rowIndex = 2;
@@ -139,9 +161,9 @@ public class TPssrOverhaulExchangerController extends BaseController {
                 row.createCell(0).setCellValue(num);
                 row.createCell(1).setCellValue(t.getTagNo());
                 row.createCell(2).setCellValue(t.getEquipmentName());
-                row.createCell(3).setCellValue(t.getWorkDes());
-                row.createCell(4).setCellValue(t.getPidNo());
-                row.createCell(5).setCellValue(DateUtils.dateTime(t.getCompletionDate()));
+                row.createCell(3).setCellValue(t.getPidNo());
+                row.createCell(4).setCellValue(t.getWorkDes());
+                row.createCell(5).setCellValue(t.getCompletionStatus());
                 row.createCell(6);
                 try {
                     SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getConfirmedPerson()));
@@ -150,32 +172,16 @@ public class TPssrOverhaulExchangerController extends BaseController {
                 } catch (NumberFormatException e) {
                     throw new RuntimeException(e);
                 }
-                row.createCell(7).setCellValue(t.getRemarks());
+                row.createCell(7).setCellValue(DateUtils.dateTime(t.getCompletionDate()));
+                row.createCell(8).setCellValue(t.getRemarks());
 
                 //渲染样式
-                for (int i = 0; i < 8; i++) {
+                for (int i = 0; i < 9; i++) {
                     row.getCell(i).setCellStyle(originalStyle);
                 }
                 num++;
                 rowIndex++;
             }
-            switch (devType.toString()) {
-                case "1":
-                    filename = "PSSR_01_检修项目_换热器"  + ".xlsx";
-                    break;
-                case "2":
-                    filename = "PSSR_01_检修项目_电仪"  + ".xlsx";
-                    break;
-                case "3":
-                    filename = "PSSR_01_检修项目_反应器"  + ".xlsx";
-                    break;
-                case "4":
-                    filename = "PSSR_01_检修项目_裂解炉"  + ".xlsx";
-                    break;
-                case "5":
-                    filename = "PSSR_01_检修项目_其他"  + ".xlsx";
-                    break;
-            }
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulFilterController.java

@@ -294,15 +294,14 @@ public class TPssrOverhaulFilterController extends BaseController {
                 Row row = sheet.createRow(rowIndex);
                 row.setHeight((short) 800);
                 row.createCell(0).setCellValue(num);
-                row.createCell(1).setCellValue(t.getPlant());
-                row.createCell(2).setCellValue(t.getUnit());
-                row.createCell(3).setCellValue(t.getStrainerLocation());
-                row.createCell(4).setCellValue(t.getPidNo());
-                row.createCell(5).setCellValue(t.getIsoDwgNo());
-                row.createCell(6).setCellValue(t.getFlangeSize());
-                row.createCell(7).setCellValue(t.getQtyNum());
-                row.createCell(8).setCellValue(DateUtils.dateTime(t.getCompletionDate()));
-                row.createCell(9);
+                row.createCell(1).setCellValue(t.getUnit());
+                row.createCell(2).setCellValue(t.getStrainerLocation());
+                row.createCell(3).setCellValue(t.getPidNo());
+                row.createCell(4).setCellValue(t.getIsoDwgNo());
+                row.createCell(5).setCellValue(t.getFlangeSize());
+                row.createCell(6).setCellValue(t.getChangeClean());
+                row.createCell(7).setCellValue(t.getCompletionStatus());
+                row.createCell(8);
                 try {
                     SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getRespPerson()));
                     String confirm1 = sysUser.getSignUrl();
@@ -310,6 +309,7 @@ public class TPssrOverhaulFilterController extends BaseController {
                 } catch (NumberFormatException e) {
                     throw new RuntimeException(e);
                 }
+                row.createCell(9).setCellValue(DateUtils.dateTime(t.getCompletionDate()));
                 row.createCell(10).setCellValue(t.getRemarks());
 
                 //渲染样式

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulTowerController.java

@@ -291,9 +291,9 @@ public class TPssrOverhaulTowerController extends BaseController {
                 row.createCell(0).setCellValue(num);
                 row.createCell(1).setCellValue(t.getTagNo());
                 row.createCell(2).setCellValue(t.getEquipmentName());
-                row.createCell(3).setCellValue(t.getWorkDes());
-                row.createCell(4).setCellValue(t.getPidNo());
-                row.createCell(5).setCellValue(DateUtils.dateTime(t.getCompletionDate()));
+                row.createCell(3).setCellValue(t.getPidNo());
+                row.createCell(4).setCellValue(t.getWorkDes());
+                row.createCell(5).setCellValue(t.getCompletionStatus());
                 row.createCell(6);
                 try {
                     SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getConfirmedPerson()));
@@ -302,10 +302,11 @@ public class TPssrOverhaulTowerController extends BaseController {
                 } catch (NumberFormatException e) {
                     throw new RuntimeException(e);
                 }
-                row.createCell(7).setCellValue(t.getRemarks());
+                row.createCell(7).setCellValue(DateUtils.dateTime(t.getCompletionDate()));
+                row.createCell(8).setCellValue(t.getRemarks());
 
                 //渲染样式
-                for (int i = 0; i < 8; i++) {
+                for (int i = 0; i < 9; i++) {
                     row.getCell(i).setCellStyle(originalStyle);
                 }
                 num++;

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulValveController.java

@@ -319,27 +319,26 @@ public class TPssrOverhaulValveController extends BaseController {
                 Row row = sheet.createRow(rowIndex);
                 row.setHeight((short) 800);
                 row.createCell(0).setCellValue(num);
-                row.createCell(1).setCellValue(t.getChangeType());
-                row.createCell(2).setCellValue(t.getItem());
-                row.createCell(3).setCellValue(t.getPlant());
-                row.createCell(4).setCellValue(t.getValvePosition());
-                row.createCell(5).setCellValue(t.getType());
-                row.createCell(6).setCellValue(t.getPipeSize());
-                row.createCell(7).setCellValue(t.getValveClass());
-                row.createCell(8).setCellValue(t.getPidNo());
-                row.createCell(9).setCellValue(DateUtils.dateTime(t.getDoneDate()));
-                row.createCell(10);
+                row.createCell(1).setCellValue(t.getValvePosition());
+                row.createCell(2).setCellValue(t.getType());
+                row.createCell(3).setCellValue(t.getPipeSize());
+                row.createCell(4).setCellValue(t.getValveClass());
+                row.createCell(5).setCellValue(t.getPidNo());
+                row.createCell(6).setCellValue(t.getChangeType());
+                row.createCell(7).setCellValue(t.getCompletionStatus());
+                row.createCell(8);
                 try {
                     SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getIdentifyingPerson()));
                     String confirm1 = sysUser.getSignUrl();
-                    ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 10, 1, 1);
+                    ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 8, 1, 1);
                 } catch (NumberFormatException e) {
                     throw new RuntimeException(e);
                 }
-                row.createCell(11).setCellValue(t.getRemarks());
+                row.createCell(9).setCellValue(DateUtils.dateTime(t.getDoneDate()));
+                row.createCell(10).setCellValue(t.getRemarks());
 
                 //渲染样式
-                for (int i = 0; i < 12; i++) {
+                for (int i = 0; i < 11; i++) {
                     row.getCell(i).setCellStyle(originalStyle);
                 }
                 num++;

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPublicController.java

@@ -121,8 +121,8 @@ public class TPssrPublicController extends BaseController {
                 row.setHeight((short) 800);
                 row.createCell(0).setCellValue(num);
                 row.createCell(1).setCellValue(t.getCheckContent());
-                row.createCell(2).setCellValue(t.getCheckContent());
-                row.createCell(3).setCellValue(t.getCheckContent());
+                row.createCell(2).setCellValue(t.getCheckRequire());
+                row.createCell(3).setCellValue("界区阀"+t.getValveStatus()+"；"+t.getCheckCondition());
                 row.createCell(4).setCellValue(t.getCheckResult());
                 row.createCell(5);
                 row.createCell(6);
@@ -141,7 +141,7 @@ public class TPssrPublicController extends BaseController {
 
 
                 //渲染样式
-                for (int i = 0; i < 8; i++) {
+                for (int i = 0; i < 9; i++) {
                     row.getCell(i).setCellStyle(originalStyle);
                 }
                 num++;

ui/src/views/pssr/nitrogen/index.vue

@@ -145,7 +145,11 @@
         </template>
       </el-table-column>
       <el-table-column label="系统名称" align="center" prop="systemName" :show-overflow-tooltip="true" width="180"/>
-      <el-table-column label="采样日期" align="center" prop="samplingDate" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="采样日期" align="center" prop="samplingDate" :show-overflow-tooltip="true" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.samplingDate, '{y}-{m}-{d} {h}:{i}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="样品名称" align="center" prop="sampleName" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="氧气（%vol）" align="center" prop="oxygen" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="露点" align="center" prop="dewPoint" :show-overflow-tooltip="true" width="180"/>