diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 0b93b1f6d..ff32910b2 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -953,9 +953,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl excelfilelist = FileUnZip.readExcelFile(zipEntryName); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java index 9962c9ba9..6b49c5eca 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java @@ -76,6 +76,55 @@ public class FileUnZip { return orgMkdirs; } + /** + * 解压zip文件 + * 解决解压文件下有多个文件夹时,读不到orgMkdirs问题 + * @param sourceFile,待解压的zip文件; descDir,解压后的存放路径 + * @throws Exception + * @author gaoyan + **/ + public static String unZipFiles2(String sourceFile, String descDir) throws IOException { + File zipFile = new File(sourceFile); + + File pathFile = new File(descDir); + if (!pathFile.exists()) { + pathFile.mkdirs(); + } + ZipFile zip = new ZipFile(zipFile,"gbk"); + String orgMkdirsLast = ""; + for (Enumeration entries = zip.getEntries(); entries.hasMoreElements(); ) { + ZipEntry entry = (ZipEntry) entries.nextElement(); + String zipEntryName = entry.getName(); + String outPath = (descDir + "/" + zipEntryName).replaceAll("\\*", "/"); + orgMkdirsLast = zipEntryName.substring(0, zipEntryName.indexOf('/')); + //判断路径是否存在,不存在则创建文件路径 + File file = new File(outPath.substring(0, outPath.lastIndexOf('/'))); + if (!file.exists()) { + file.mkdirs(); + } + //判断文件全路径是否为文件夹,如果是上面已经上传,不需要解压 + if (new File(outPath).isDirectory()) { + continue; + } + //输出文件路径信息 +// InputStream in = null; +// OutputStream out = null; + try(InputStream in =zip.getInputStream(entry); + OutputStream out =new FileOutputStream(outPath)){ + byte[] buf1 = new byte[1024]; + int len; + while ((len = in.read(buf1)) > 0) { + out.write(buf1, 0, len); + } + }catch(IOException e){ + logger.error(e.getMessage(),e); + } + } + zip.close(); + String orgMkdirs = descDir + "/" + orgMkdirsLast; + return orgMkdirs; + } + /** * 递归删除文件及文件夹 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index 3a21d9da6..8fae259fd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -1484,7 +1484,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl excelfilelist = FileUnZip.readExcelFile(zipEntryName); diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml index eeba46cdd..cf284ac6f 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -143,7 +143,7 @@ spring: # password: 123456 # driver-class-name: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://121.36.69.172:3307/laws_weilai?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false - url: jdbc:mysql://121.36.69.172:3307/laws_weilai_stand?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://121.36.69.172:3307/laws_weilai?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root password: hzwlsoft.com driver-class-name: com.mysql.cj.jdbc.Driver diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 3c6c1ee00..b8afbfa7e 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -962,6 +962,23 @@ module.exports = { releaseStatus:'Release status', uploadedBy:'Uploaded by', uploadMonthly:'Upload monthly', + chapterContents:'Chapter contents', + chineseTitle:'Chinese title', + englishTitle:'English title', + regulatoryContact:'Regulatory contact', + exportStatus:'Export status', + monthlyTitleTemplate:'Monthly title template', + monthlyIntegrationAndExport:'Monthly integration and export', + addContent:'Add content', + editContent:'Edit content', + viewContent:'View content', + fillInTheMonth:'Fill in the month', + monthSelection:'Month selection', + bringInStandardInformation:'Bring in standard information', + contentTemplate:'Content template', + moveUp:'Move up', + moveDown:'Move down', // 上报库 - Enable: '启用', + Enable: 'Enable', + Latestupdatetime: 'Latest update time', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 0d434b1aa..0c5eff3cb 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -727,7 +727,7 @@ module.exports = { // 认证状态 timeoperation: '时,才有权限操作此按钮。', NiOnumberis: 'NIO编号为', - NoOperationPermissionForthisbutton:'没有此按钮的操作权限', + NoOperationPermissionForthisbutton: '没有此按钮的操作权限', Attentionfreeze: '注:冻结后该冻结配置内容不可进行编辑。', Filledperson: '工程接口人没有填写,请填写完工程接口人再进行下发收集。', Datastatusis: '数据状态为', @@ -956,18 +956,34 @@ module.exports = { documentLibraryDetails: '文档库详情', question: '催办', ConfirmQuestion: '确认催办?', - OnlyOrTaskconfirmationOut:'只有清单确认状态或任务确认状态为待确认时才可以进行催办', - disableInput:'禁止输入', + OnlyOrTaskconfirmationOut: '只有清单确认状态或任务确认状态为待确认时才可以进行催办', + disableInput: '禁止输入', or: '或', - warningTime:'预警时间', - RegulationMonthlyManagement:'法规月报管理', - RegulationMonthlyFill:'法规月报填写', - RegulationMonthlyName:'法规月报名称', - monthlyLanguage:'月报语种', - releaseStatus:'发布状态', - uploadedBy:'上传人', - uploadMonthly:'上传月报', + warningTime: '预警时间', + RegulationMonthlyManagement: '法规月报管理', + RegulationMonthlyFill: '法规月报填写', + RegulationMonthlyName: '法规月报名称', + monthlyLanguage: '月报语种', + releaseStatus: '发布状态', + uploadedBy: '上传人', + uploadMonthly: '上传月报', + chapterContents: '章节目录', + chineseTitle: '中文标题', + englishTitle: '英文标题', + regulatoryContact:'法规联系人', + exportStatus:'导出状态', + monthlyTitleTemplate:'月报标题模板', + monthlyIntegrationAndExport:'月报整合导出', + addContent:'新增内容', + editContent:'编辑内容', + viewContent:'查看内容', + monthSelection:'月份选择', + fillInTheMonth:'填写月份', + contentTemplate:'内容模板', + bringInStandardInformation:'带入标准信息', + moveUp:'上移', + moveDown:'下移', // 上报库 Enable: '启用', - + Latestupdatetime: '最新更新时间', } \ No newline at end of file diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index a0f50274f..82260a907 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -26,7 +26,7 @@ - + {{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}} diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue index 74f026074..2c85f06fd 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue @@ -5,11 +5,12 @@
-
- {{$t('RegulationMonthlyName')}} +
+ {{$t('monthSelection')}}
- +
@@ -22,9 +23,17 @@
-
- - {{$t('uploadMonthly')}} +
+ + {{$t('monthlyTitleTemplate')}} +
+
+ + {{$t('monthlyIntegrationAndExport')}} +
+
+ + {{$t('addContent')}}
@@ -43,6 +52,11 @@ :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns" > + + {{$t('view')}} + {{$t('edit')}} + {{$t('deleteLib')}} +
+ + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue new file mode 100644 index 000000000..83c82ca50 --- /dev/null +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue @@ -0,0 +1,245 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue new file mode 100644 index 000000000..1d7841f2e --- /dev/null +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue @@ -0,0 +1,155 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue new file mode 100644 index 000000000..628453061 --- /dev/null +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue @@ -0,0 +1,198 @@ + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/parameter/parameterexport/components/addModel.vue b/jero-web/src/views/parameter/parameterexport/components/addModel.vue index 2ba12c0c5..367f428f8 100644 --- a/jero-web/src/views/parameter/parameterexport/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterexport/components/addModel.vue @@ -1,100 +1,105 @@