From 31b35bf9787838d850a7a01a50d2047509ee54ac Mon Sep 17 00:00:00 2001 From: gaosong Date: Thu, 18 Aug 2022 09:41:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=A4=96?= =?UTF-8?q?=E6=8A=A5=E5=91=8A-=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/extRepo/controller/ExtRepoDataController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java index 0fec9671c..4c6513783 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java @@ -86,7 +86,7 @@ public class ExtRepoDataController extends JeroController= 2) { - queryWrapper.between(ExtRepoData::getCreateTime, createTimeArr[0], createTimeArr[1]); + queryWrapper.between(ExtRepoData::getCreateTime, createTimeArr[0]+" 00:00:00", createTimeArr[1]+" 23:59:59"); } } queryWrapper.eq(ExtRepoData::getSupFolder, extRepoData.getSupFolder()); From 6c192e478360de49f76f1f3e9ad426e8548dc776 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 18 Aug 2022 09:43:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 +- .../src/views/businessSupport/technologyAssessment/index.vue | 2 +- .../views/processCenter/components/evaluatorFeedbackList.vue | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index a94cf3b59..ebc7b9d62 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -822,7 +822,7 @@ module.exports = { sendBack: 'Reject', taskConfirmationProcess: 'Task confirmation process', notFinished: 'Assigned', - Finished: 'Complete', + Finished: 'Completed', theRequirementst: 'The engineering interface person confirms the compliance requirements', dataLoading: 'Data loading...', Submitting: 'Submitting', diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index acee733dc..0f8a305c5 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -203,7 +203,7 @@ gatherResultList: [ { value: 'Underway', - name: this.$t('inProgress') + name: this.$t('Underway') }, { value: 'Completed', diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue index ae801d9a7..68a37617b 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue @@ -278,7 +278,9 @@ if (this.dataSource && this.dataSource.length == 1 && this.$route.query.taskDefinitionKey == 'pgrqr') { this.$nextTick(() => { let antTableBody = document.getElementsByClassName('ant-table-body') - antTableBody[0].style = 'position:auto' + antTableBody[0].style = 'overflow: scroll;max-height: 500px;position: inherit' + let antTableHeader = document.getElementsByClassName('ant-table-header') + antTableHeader[0].style = 'margin-bottom: -8px;padding-bottom: 0px;min-width: 8px;overflow: hidden' }) } if (this.$route.query.taskDefinitionKey != 'pgrqr') { From 3cf78ccaee530d8edb85ba1d7fa67f3e171318f7 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 18 Aug 2022 10:23:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 5 + jero-web/src/common/lang/zh-cn.js | 125 +++---- .../components/modules/fillAdd.vue | 10 + .../components/modules/industryTemplate.vue | 326 ++++++++++++++++++ 4 files changed, 406 insertions(+), 60 deletions(-) create mode 100644 jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index ebc7b9d62..e87ecc102 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1262,4 +1262,9 @@ module.exports = { currentlyTheLastOneCannotmovedDown:'Currently the last one cannot be moved down', weilaiRegulationMonthlyReport:'Weilai Regulation Monthly Report', thereTitleWhichCannotBeDeleted:'There are new contents under this title, which cannot be deleted', + industryInformationDynamicTemplate:'Industry information dynamic template', + relatedFields:'Related fields', + relatedFieldsEn:'Related fields (English)', + source:'Source', + sourceEn:'Source (English)', } \ 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 89622c213..c2f54ad35 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -874,7 +874,7 @@ module.exports = { experimentFailed: '实验失败', toBeStarted: '待开始', inProgress: '进行中', - Underway:'进行中', + Underway: '进行中', green: '绿', red: '红', blue: '蓝', @@ -1302,66 +1302,71 @@ module.exports = { Inthecollection: '收集中', Notatthe: '未开始', Thepercentage: '百分比', - problemKnowledgeBase:'问题知识库', - recentHotSpots:'近期热点', - disseminationMaterials:'传播物料', - informationSafety:'信息安全', - blueBook:'蓝皮书', - invoiceCollection:'发票合集', - productHighlights:'产品亮点', - financialReimbursement:'财务报销', - classificationMaintenance:'分类维护', - managePublishing:'管理发布', - displayPermission:'展示权限', - authorizedUser:'权限用户', - problemClassification:'问题分类', - market:'市场', - documentNumber:'文档编号', - documentTitle:'文档标题', - bringInDocumentInformation:'带入文档信息', - thereWhichCannotDeleted:'该标题下存在子标题无法进行删除', - sdt:'工程接口人', - dre:'填写人', - applicableInstructionsMarketList:'市场清单适用说明', - pleaseSelectTheDataCompared:'请选择需要对比的数据', - problemLabel:'问题标签', - personCharge:'负责人', - addLabel:'新增标签', - editLabel:'编辑标签', - applicableMarket:'适用市场', - templateMaintenance:'模板维护', - associatedWebsite:'关联网址', - dropDownOptions:'下拉选项', - dropDownOptionMaintenance:'下拉选项维护', - displayInformation:'展示信息', - addComparison:'添加对比', - showOrNot:'是否展示', - comparisonMarket:'对比市场', - share:'分享', - simplifiedChinese:'简体中文', - uploadOnly:'只能上传', - turnOnAutoMatch:'打开自动匹配', - Adjustareasofresponsibility:'调整责任领域', - regulatoryTechnicalAssessment:'法规技术评估', - OpenOne:'公开', - Privacy:'私密', - punctuationmark:'只能输入除#号和逗号外的英文标点符号', + problemKnowledgeBase: '问题知识库', + recentHotSpots: '近期热点', + disseminationMaterials: '传播物料', + informationSafety: '信息安全', + blueBook: '蓝皮书', + invoiceCollection: '发票合集', + productHighlights: '产品亮点', + financialReimbursement: '财务报销', + classificationMaintenance: '分类维护', + managePublishing: '管理发布', + displayPermission: '展示权限', + authorizedUser: '权限用户', + problemClassification: '问题分类', + market: '市场', + documentNumber: '文档编号', + documentTitle: '文档标题', + bringInDocumentInformation: '带入文档信息', + thereWhichCannotDeleted: '该标题下存在子标题无法进行删除', + sdt: '工程接口人', + dre: '填写人', + applicableInstructionsMarketList: '市场清单适用说明', + pleaseSelectTheDataCompared: '请选择需要对比的数据', + problemLabel: '问题标签', + personCharge: '负责人', + addLabel: '新增标签', + editLabel: '编辑标签', + applicableMarket: '适用市场', + templateMaintenance: '模板维护', + associatedWebsite: '关联网址', + dropDownOptions: '下拉选项', + dropDownOptionMaintenance: '下拉选项维护', + displayInformation: '展示信息', + addComparison: '添加对比', + showOrNot: '是否展示', + comparisonMarket: '对比市场', + share: '分享', + simplifiedChinese: '简体中文', + uploadOnly: '只能上传', + turnOnAutoMatch: '打开自动匹配', + Adjustareasofresponsibility: '调整责任领域', + regulatoryTechnicalAssessment: '法规技术评估', + OpenOne: '公开', + Privacy: '私密', + punctuationmark: '只能输入除#号和逗号外的英文标点符号', created: '创建时间', - updated:'更新时间', - optionDropDownBox:'下拉选择', - attachmentUpload:'附件上传', - textInput:'文本输入', + updated: '更新时间', + optionDropDownBox: '下拉选择', + attachmentUpload: '附件上传', + textInput: '文本输入', Paraname: '参数名称', Parabatch: '参数批次', - freeze:'请选择冻结配置', - deleteNode:'若有文件信息将同步删除，确认删除该条数据？', - HaveReleased:'已发布', - forward:'转发', - areResponsibilityAreaInformationBatch:'确实是否批量修改责任领域信息', - issuedBy:'发布人', - pleaseDecompositionStandardOrder:'请导入或带入至少一条分解标准单', - currentlyTheFirstOneThatCannotMovedUp:'当前已是第一个无法进行上移', - currentlyTheLastOneCannotmovedDown:'当前已是最后一个无法进行下移', - weilaiRegulationMonthlyReport:'蔚来法规月报', - thereTitleWhichCannotBeDeleted:'该标题下存在新增内容,不能删除', + freeze: '请选择冻结配置', + deleteNode: '若有文件信息将同步删除，确认删除该条数据？', + HaveReleased: '已发布', + forward: '转发', + areResponsibilityAreaInformationBatch: '确实是否批量修改责任领域信息', + issuedBy: '发布人', + pleaseDecompositionStandardOrder: '请导入或带入至少一条分解标准单', + currentlyTheFirstOneThatCannotMovedUp: '当前已是第一个无法进行上移', + currentlyTheLastOneCannotmovedDown: '当前已是最后一个无法进行下移', + weilaiRegulationMonthlyReport: '蔚来法规月报', + thereTitleWhichCannotBeDeleted: '该标题下存在新增内容,不能删除', + industryInformationDynamicTemplate: '行业资讯动态模板', + relatedFields: '相关领域', + relatedFieldsEn: '相关领域(英文)', + source: '来源', + sourceEn: '来源(英文)' } \ 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 index 3f9010c48..aa509cd1f 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue @@ -93,6 +93,8 @@ v-else-if="formInline.contentTemplate == '2' && isTrue"/> +
@@ -109,6 +111,7 @@ import defaultTemplate from './defaultTemplate' import solicitOpinions from './solicitOpinions' import releaseStandard from './releaseStandard' + import industryTemplate from './industryTemplate' import addModel from './addModel' import { getAction, postAction, downloadFile } from '@/api/manage' import moment from 'moment' @@ -119,6 +122,7 @@ defaultTemplate, solicitOpinions, releaseStandard, + industryTemplate, addModel }, data() { @@ -166,6 +170,10 @@ { id: '3', text: this.$t('NewReleasedStandardTemplate') + }, + { + id: '4', + text: this.$t('industryInformationDynamicTemplate') } ], url: { @@ -266,6 +274,8 @@ text = 'solicitOpinionsRef' } else if (this.$refs.releaseStandardRef) { text = 'releaseStandardRef' + }else if (this.$refs.industryTemplateRef) { + text = 'industryTemplateRef' } this.$refs[text].getData((val) => { this.confirmLoading = true diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue new file mode 100644 index 000000000..c0e6268d2 --- /dev/null +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue @@ -0,0 +1,326 @@ + + + + + + \ No newline at end of file