ly %!s(int64=3) %!d(string=hai) anos
pai
achega
d9eb5d6ece

+ 6 - 6
master/src/main/java/com/ruoyi/common/utils/export/JxlsTemplateEnum.java

@@ -7,12 +7,12 @@ package com.ruoyi.common.utils.export;
 public enum JxlsTemplateEnum implements JxlsTemplate {
 
     DONE_TASK_LIST("/template/document/export/plant.xls", "程序请单.xls"),
-    DEV_YLRQ_UPDATE("/static/template/sems/info/ylrqInspectionInfo.xlsx", "压力容器检验信息更新清单.xlsx"),
-    DEV_YLGD_UPDATE("/static/template/sems/info/ylgdInspectionInfo.xlsx", "压力管道检验信息更新清单.xlsx"),
-    DEV_DZSB_UPDATE("/static/template/sems/info/dzsbInspectionInfo.xlsx", "起重机械检验信息更新清单.xlsx"),
-    DEV_GL_UPDATE("/static/template/sems/info/glInspectionInfo.xlsx", "锅炉设备检验信息更新清单.xlsx"),
-    DEV_DT_UPDATE("/static/template/sems/info/dtInspectionInfo.xlsx", "电梯设备检验信息更新清单.xlsx"),
-    DEV_CC_UPDATE("/static/template/sems/info/ccInspectionInfo.xlsx", "叉车设备检验信息更新清单.xlsx");
+    DEV_YLRQ_UPDATE("static/template/sems/info/ylrqInspectionInfo.xlsx", "压力容器检验信息更新清单.xlsx"),
+    DEV_YLGD_UPDATE("static/template/sems/info/ylgdInspectionInfo.xlsx", "压力管道检验信息更新清单.xlsx"),
+    DEV_DZSB_UPDATE("static/template/sems/info/dzsbInspectionInfo.xlsx", "起重机械检验信息更新清单.xlsx"),
+    DEV_GL_UPDATE("static/template/sems/info/glInspectionInfo.xlsx", "锅炉设备检验信息更新清单.xlsx"),
+    DEV_DT_UPDATE("static/template/sems/info/dtInspectionInfo.xlsx", "电梯设备检验信息更新清单.xlsx"),
+    DEV_CC_UPDATE("static/template/sems/info/ccInspectionInfo.xlsx", "叉车设备检验信息更新清单.xlsx");
 
     private String path;
     private String name;

+ 2 - 1
master/src/main/java/com/ruoyi/common/utils/export/JxlsView.java

@@ -52,7 +52,8 @@ public class JxlsView extends AbstractView {
 
         InputStream is = null;
         try {
-            is = JxlsView.class.getResourceAsStream(template.getPath());
+            is = Thread.currentThread().getContextClassLoader().getResourceAsStream(template.getPath());
+//            is = JxlsView.class.getResourceAsStream(template.getPath());
             Context context = new Context();
             context.putVar("data", data);
             context.putVar("sheetNames", sheetdata);

+ 1 - 0
ui/src/lang/en.js

@@ -1200,6 +1200,7 @@ export default {
   devTotalChart: 'devTotal',
   internalInspection: 'internalInspection',
   externalInspection: 'externalInspection',
+  downloadSelect: 'Download Selected',
   压力容器安全状况等级: 'PressureVessel SafetyLevel',
   压力管道安全状况等级: 'PressurePiping SafetyLevel',
   锅炉台账: 'Boiler Account',

+ 1 - 0
ui/src/lang/zh.js

@@ -1200,6 +1200,7 @@ export default {
   devTotalChart: '设备数量',
   internalInspection: '内检',
   externalInspection: '外检',
+  downloadSelect: '下载选中的设备',
   压力容器安全状况等级: '压力容器安全状况等级',
   压力管道安全状况等级: '压力管道安全状况等级',
   锅炉台账: '锅炉台账',