From d68b6fef5c96931b404d85696b31f22a0660c515 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 2 Aug 2022 10:39:48 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=B8=83=E5=B1=80=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 10 + jero-web/src/common/lang/zh-cn.js | 226 ++++++------ .../components/countryCardList.vue | 13 + .../components/problemKnowledgeBaseList.vue | 323 ++++++++++++++++++ 4 files changed, 464 insertions(+), 108 deletions(-) create mode 100644 jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue create mode 100644 jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 26d39eb85..e81246812 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1199,4 +1199,14 @@ module.exports = { Inthecollection:'In the collection', Notatthe:'Not at the', Thepercentage:'The Percentage', + problemKnowledgeBase:'Problem Knowledge Base', + recentHotSpots:'Recent Hot Spots', + disseminationMaterials:'Dissemination Materials', + informationSafety:'Information Safety', + blueBook:'Blue Book', + invoiceCollection:'Invoice Collection', + productHighlights:'Product Highlights', + financialReimbursement:'Financial Reimbursement', + classificationMaintenance:'Classification Maintenance', + managePublishing:'Manage Publishing', } \ 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 72353771f..69b0d8324 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -730,7 +730,7 @@ module.exports = { confirmationOfRegulationsList: '法规清单确认', regulatoryTaskConfirmation: '法规任务确认', certificationStart: '认证试验结束', - preHomoCompletion:'摸底试验结束', + preHomoCompletion: '摸底试验结束', certificationEnd: '认证批准', directoryName: '目录名称', batch: '批次', @@ -1094,107 +1094,107 @@ module.exports = { Copyparameterlist: '复制参数清单', Templatenamelist: '模板名称-参数项收集清单', newNiONumber: 'NIO编号', - English:'英文', - requiredParametersEmpty:'必填参数不能为空', - theResponsiblePersonAndDeadlineClank:'的责任人、截止时间不能为空', - bringInTheProjectInterface:'带入工程接口人', - theCurrentListSaved:'当前列表数据已全部提交，无法进行暂存', - defaultTemplate:'默认模板', - newRequestCommentListTemplate:'新征求意见清单模板', - NewReleasedStandardTemplate:'新发布标准模板', - pleaseSelectStandard:'请选择标准', - theResponsiblePersonEmpty:'的责任人不能为空', - theDeadlineEmpty:'的截止时间不能为空', - theDeliveryTypeCannotBeEmpty:'的交付物类型不能为空', - For:'针对于', - markedRejection:'标注的驳回意见', - RegulationListConfirmationTask:'清单确认任务', - RegulationListConfirmationNotification:'清单确认通知', - RegulationTaskConfirmation:'任务确认任务', - DesignComplianceTask:'设计符合性任务', - PreHomoTask:'Pre-Homo任务', - ValidationTask:'验证符合性任务', - DesignComplianceNotification:'设计符合性通知', - PreHomoNotification:'Pre-Homo通知', - ValidationComplianceNotification:'验证符合性通知', - RegulationTaskConfirmationNotification:'任务确认通知', - evaluationMethod:'评估方式', - uploadRelevantMaterials:'相关资料上传', - RelevantMaterials:'相关资料', - processBackground:'流程背景', - selectedStandard:'所选标准', - standardDecompositionDocument:'带入标准分解单', - pleaseSelectStandardFirst:'请先选择标准', - evaluatorFeedback:'评估人反馈', - nameTechnicalDocument:'技术文件名称', - chapter:'章节', - problemDescription:'问题说明', - filingExternalOpinions:'对外意见归档', - initiateProcessForCurrentStandard:'针对当前标准发起流程', - engineerFeedbackResults:'工程师反馈结果', - fileExport:'文件导出', - feedbackTime:'反馈时间', - regulatoryTechnologyAssessmentProcess:'法规技术评估流程', - feedbackEvaluation:'反馈评估', - clauseEvaluation:'条款评估', - standardDocuments:'标准文件', - pleaseCompleteTheEvaluationMethodorEvaluator:'请补全列表中评估方式或评估人', - reviewComments:'审核意见', - PleaseCompleteList:'请补全列表中符合性结果', - sponsorFeedback:'发起人反馈', - processNumber:'流程编号', - processName:'流程名称', - feedbackResults:'反馈结果', - theDoesNotSupportPreview:'当前文件格式不支持预览', - releaseSituation:'发布情况', - comparisonResults:'对比结果', - Published:'已发布', - initiateComparison:'发起对比', - translationLanguage:'翻译语言', - translationResults:'翻译结果', - conversionTime:'转换时间', - category:'类别', - RegulatoryProcessEvaluationResults :'法规流程评估结果', - ViewConformanceResults:'查看符合性结果', - CommentsCollectionResultsForReference:'意见收集结果参考', - TechnicalEvaluationResultsForReference:'技术评估结果参考', - ComplianceConfirmationRecord:'符合性确认记录', - complianceConfirmation:'符合性确认', - Deriveconformanceresults:'导出符合性结果', - Regulatorycompliancekanban:'法规符合性看板', - noComparisonDocumentSelected:'未选择对比文档', - RemarkInfo:'备注信息', - initiateDocumentComparison:'发起文档对比', - comparativeComments:'对比评论', - viewTheComparisonResults:'查看对比结果', - addFullTextComment:'添加全文评论', - turnOffAutomaticMatching:'关闭自动匹配', - exportComparisonReport:'导出对比报告', - comparisonDifferenceComment:'对比差异评论', - fullTextComments:'全文评论', - fileDeclaration:'文件说明', - FileForDetails:'文件详情', - Converting:'转换中', - convertNetwork:'转换完成', - convertFailed:'转换失败', - standardData:'标准数据', - Theorganization:'组织机构', - Addingfolder:'新增文件夹', - Addingsubfolders:'新增子文件夹', - Editfolder:'编辑文件夹', - Deletefolders:'删除文件夹', - Foldername:'文件夹名称', - Folderpermissions:'文件夹权限', - Folderorder:'文件夹顺序', - Downloadprivileges:'下载权限', - Openpersonnel:'开放人员', - originalText:'原文', - translatedText:'译文', - Administrativeprivileges:'管理权限', - Checkthepermissions:'查看权限', - onlyFilesUploaded:'只能上传.docx、.doc文件', - uploadedbyyourself:'只能删除自己上传的文件数据', - Fileuploaded:'文件上传中，请稍后', + English: '英文', + requiredParametersEmpty: '必填参数不能为空', + theResponsiblePersonAndDeadlineClank: '的责任人、截止时间不能为空', + bringInTheProjectInterface: '带入工程接口人', + theCurrentListSaved: '当前列表数据已全部提交，无法进行暂存', + defaultTemplate: '默认模板', + newRequestCommentListTemplate: '新征求意见清单模板', + NewReleasedStandardTemplate: '新发布标准模板', + pleaseSelectStandard: '请选择标准', + theResponsiblePersonEmpty: '的责任人不能为空', + theDeadlineEmpty: '的截止时间不能为空', + theDeliveryTypeCannotBeEmpty: '的交付物类型不能为空', + For: '针对于', + markedRejection: '标注的驳回意见', + RegulationListConfirmationTask: '清单确认任务', + RegulationListConfirmationNotification: '清单确认通知', + RegulationTaskConfirmation: '任务确认任务', + DesignComplianceTask: '设计符合性任务', + PreHomoTask: 'Pre-Homo任务', + ValidationTask: '验证符合性任务', + DesignComplianceNotification: '设计符合性通知', + PreHomoNotification: 'Pre-Homo通知', + ValidationComplianceNotification: '验证符合性通知', + RegulationTaskConfirmationNotification: '任务确认通知', + evaluationMethod: '评估方式', + uploadRelevantMaterials: '相关资料上传', + RelevantMaterials: '相关资料', + processBackground: '流程背景', + selectedStandard: '所选标准', + standardDecompositionDocument: '带入标准分解单', + pleaseSelectStandardFirst: '请先选择标准', + evaluatorFeedback: '评估人反馈', + nameTechnicalDocument: '技术文件名称', + chapter: '章节', + problemDescription: '问题说明', + filingExternalOpinions: '对外意见归档', + initiateProcessForCurrentStandard: '针对当前标准发起流程', + engineerFeedbackResults: '工程师反馈结果', + fileExport: '文件导出', + feedbackTime: '反馈时间', + regulatoryTechnologyAssessmentProcess: '法规技术评估流程', + feedbackEvaluation: '反馈评估', + clauseEvaluation: '条款评估', + standardDocuments: '标准文件', + pleaseCompleteTheEvaluationMethodorEvaluator: '请补全列表中评估方式或评估人', + reviewComments: '审核意见', + PleaseCompleteList: '请补全列表中符合性结果', + sponsorFeedback: '发起人反馈', + processNumber: '流程编号', + processName: '流程名称', + feedbackResults: '反馈结果', + theDoesNotSupportPreview: '当前文件格式不支持预览', + releaseSituation: '发布情况', + comparisonResults: '对比结果', + Published: '已发布', + initiateComparison: '发起对比', + translationLanguage: '翻译语言', + translationResults: '翻译结果', + conversionTime: '转换时间', + category: '类别', + RegulatoryProcessEvaluationResults: '法规流程评估结果', + ViewConformanceResults: '查看符合性结果', + CommentsCollectionResultsForReference: '意见收集结果参考', + TechnicalEvaluationResultsForReference: '技术评估结果参考', + ComplianceConfirmationRecord: '符合性确认记录', + complianceConfirmation: '符合性确认', + Deriveconformanceresults: '导出符合性结果', + Regulatorycompliancekanban: '法规符合性看板', + noComparisonDocumentSelected: '未选择对比文档', + RemarkInfo: '备注信息', + initiateDocumentComparison: '发起文档对比', + comparativeComments: '对比评论', + viewTheComparisonResults: '查看对比结果', + addFullTextComment: '添加全文评论', + turnOffAutomaticMatching: '关闭自动匹配', + exportComparisonReport: '导出对比报告', + comparisonDifferenceComment: '对比差异评论', + fullTextComments: '全文评论', + fileDeclaration: '文件说明', + FileForDetails: '文件详情', + Converting: '转换中', + convertNetwork: '转换完成', + convertFailed: '转换失败', + standardData: '标准数据', + Theorganization: '组织机构', + Addingfolder: '新增文件夹', + Addingsubfolders: '新增子文件夹', + Editfolder: '编辑文件夹', + Deletefolders: '删除文件夹', + Foldername: '文件夹名称', + Folderpermissions: '文件夹权限', + Folderorder: '文件夹顺序', + Downloadprivileges: '下载权限', + Openpersonnel: '开放人员', + originalText: '原文', + translatedText: '译文', + Administrativeprivileges: '管理权限', + Checkthepermissions: '查看权限', + onlyFilesUploaded: '只能上传.docx、.doc文件', + uploadedbyyourself: '只能删除自己上传的文件数据', + Fileuploaded: '文件上传中，请稍后', English: '英文', requiredParametersEmpty: '必填参数不能为空', theResponsiblePersonAndDeadlineClank: '的责任人、截止时间不能为空', @@ -1296,10 +1296,20 @@ module.exports = { onlyFilesUploaded: '只能上传.docx、.doc文件', uploadedbyyourself: '只能删除自己上传的文件数据', doNotHavePermissionDeleteData: '没有权限删除此数据', - Parametercollection:'参数收集', - Collectlist:'收集清单', - Statisticalmodels:'统计模式', - Inthecollection:'收集中', - Notatthe:'未开始', - Thepercentage:'百分比', + Parametercollection: '参数收集', + Collectlist: '收集清单', + Statisticalmodels: '统计模式', + Inthecollection: '收集中', + Notatthe: '未开始', + Thepercentage: '百分比', + problemKnowledgeBase:'问题知识库', + recentHotSpots:'近期热点', + disseminationMaterials:'传播物料', + informationSafety:'信息安全', + blueBook:'蓝皮书', + invoiceCollection:'发票合集', + productHighlights:'产品亮点', + financialReimbursement:'财务报销', + classificationMaintenance:'分类维护', + managePublishing:'管理发布', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue new file mode 100644 index 000000000..af3faab72 --- /dev/null +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue new file mode 100644 index 000000000..8cac6b2ef --- /dev/null +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -0,0 +1,323 @@ + + + + + \ No newline at end of file From 093897e85acbdd21f2a4a2d1bf97ed7997ce99ff Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 2 Aug 2022 10:40:12 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E5=B8=83=E5=B1=80=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../problemKnowledgeBase/index.vue | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 jero-web/src/views/businessSupport/problemKnowledgeBase/index.vue diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/index.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/index.vue new file mode 100644 index 000000000..7a4a2757f --- /dev/null +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/index.vue @@ -0,0 +1,40 @@ + + + + \ No newline at end of file From 282c87e34287edce6c07f16285522c688244eac2 Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 2 Aug 2022 11:10:54 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=AF=A6=E6=83=85-=E5=8F=82=E6=95=B0=E6=94=B6?= =?UTF-8?q?=E9=9B=86=E7=BB=9F=E8=AE=A1-=E5=8E=BB=E6=8E=89=E7=99=BE?= =?UTF-8?q?=E5=88=86=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ParamsManifestEOServiceImpl.java | 6 ++++-- .../report/mapper/xml/ParamsReportDetailEOMapper.xml | 9 ++++++--- .../impl/ParamsExportTemplateEOServiceImpl.java | 12 ++++++------ 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index 85a5f5ed7..e62474aa9 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -720,12 +720,14 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl - AND cert_category LIKE CONCAT(CONCAT('%',#{paramsReportDetailEO.certCategory}),'%') + AND + + cert_category LIKE CONCAT(CONCAT('%',#{item}),'%') + AND sdt in @@ -102,7 +105,7 @@ select * from params_report_detail - order by nio_number asc, sync_time desc + order by sync_time desc, nio_number asc \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java index b53290e5c..c4bdbb34a 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java @@ -42,10 +42,10 @@ public class ParamsExportTemplateEOServiceImpl extends ServiceImpl Date: Tue, 2 Aug 2022 11:34:49 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E5=8F=82=E6=95=B0=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ParameterCollectionEchart.vue | 184 +++++++++--------- 1 file changed, 92 insertions(+), 92 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue index 97d2c7c23..77439939d 100644 --- a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue +++ b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue @@ -50,7 +50,8 @@ data() { return { queryParam:{ - value:1 + value:1, + ctype:'' }, options:[], collecting:[], @@ -89,33 +90,6 @@ this.submit = res.result.submit ? res.result.submit : [] this.syncReport = res.result.syncReport ? res.result.syncReport : [] this.dutyTerritory = res.result.dutyTerritory ? res.result.dutyTerritory : [] - this.collecting.forEach((item,index) => { - this.collectingpercentage.push(item.percentage) - this.collectingquantity.push(item.quantity) - }) - this.notStart.forEach((item,index) => { - this.notStartpercentage.push(item.percentage) - this.notStartquantity.push(item.quantity) - }) - this.submit.forEach((item,index) => { - this.submitpercentage.push(item.percentage) - this.submitquantity.push(item.quantity) - }) - this.syncReport.forEach((item,index) => { - this.syncReportpercentage.push(item.percentage) - this.syncReportquantity.push(item.quantity) - }) - if(this.queryParam.value = 1){ - this.collectingdata = this.collectingpercentage - this.notStartdata = this.notStartpercentage - this.submitdata = this.submitpercentage - this.syncReportdata = this.syncReportpercentage - }else{ - this.collectingdata = this.collectingquantity - this.notStartdata = this.notStartquantity - this.submitdata = this.submitquantity - this.syncReportdata = this.syncReportquantity - } setTimeout(() => { this.getEcharts() },1000) @@ -136,24 +110,67 @@ }) }, getonChange(value){ + this.collectingpercentage = [] + this.collectingquantity = [] + this.notStartpercentage = [] + this.notStartquantity = [] + this.submitpercentage = [] + this.submitquantity = [] + this.syncReportpercentage = [] + this.syncReportquantity = [] this.getData(value) }, - onChange(){ + onChange(value){ + this.collectingpercentage = [] + this.collectingquantity = [] + this.notStartpercentage = [] + this.notStartquantity = [] + this.submitpercentage = [] + this.submitquantity = [] + this.syncReportpercentage = [] + this.syncReportquantity = [] + this.getEcharts() }, getEcharts(chart, title, color, data, num) { + this.collecting.forEach((item,index) => { + this.collectingpercentage.push(item.percentage) + this.collectingquantity.push(item.quantity) + }) + this.notStart.forEach((item,index) => { + this.notStartpercentage.push(item.percentage) + this.notStartquantity.push(item.quantity) + }) + this.submit.forEach((item,index) => { + this.submitpercentage.push(item.percentage) + this.submitquantity.push(item.quantity) + }) + this.syncReport.forEach((item,index) => { + this.syncReportpercentage.push(item.percentage) + this.syncReportquantity.push(item.quantity) + }) + if(this.queryParam.value == 1){ + this.collectingdata = this.collectingpercentage + this.notStartdata = this.notStartpercentage + this.submitdata = this.submitpercentage + this.syncReportdata = this.syncReportpercentage + }else if(this.queryParam.value == 2){ + this.collectingdata = this.collectingquantity + this.notStartdata = this.notStartquantity + this.submitdata = this.submitquantity + this.syncReportdata = this.syncReportquantity + } var chartDom = document.getElementById('main-left'); var myChart = echarts.init(chartDom); var option; + var option1; let xAxisData = []; // let data1 = []; // let data2 = []; // let data3 = []; // let data4 = []; - this.dutyTerritory.forEach((item,index) => { - xAxisData.push(item); - }) + xAxisData = this.dutyTerritory // data1.push(+(Math.random() * 2).toFixed(2)); // data2.push(+(Math.random() * 100).toFixed(2)); // data3.push(+(Math.random() + 0.3).toFixed(2)); @@ -173,24 +190,47 @@ // dataView: {} // } }, - tooltip: {}, + tooltip: { + trigger:'axis', + axisPointer: { // 坐标轴指示器，坐标轴触发有效 + type: 'line'// 默认为直线，可选为：'line' | 'shadow' + }, + formatter: '{b}
{a0}: {c0}%
{a1}: {c1}%' + }, xAxis: { data: xAxisData, // name: 'X Axis', - axisLine: { onZero: true }, - splitLine: { show: false }, - splitArea: { show: false } + axisLabel: { + interval: 0, + // formatter: function(value) { + // return value.split("").join("\n"); + // } + }, + // axisLine: { onZero: true }, + // splitLine: { show: false }, + // splitArea: { show: false } }, - yAxis: {}, + yAxis: [ + { + type: 'value', + axisLabel: { + show: true, + interval: 'auto', + formatter: '{value} %' + }, + }, + + ], grid: { - bottom: 100 + left: '10%', + bottom: '15%' }, series: [ { name: this.$t('Notatthe'), type: 'bar', stack: 'one', - barWidth: 30, + barWidth: 40, barGap: '-100%', itemStyle: { color: "#707486", @@ -201,7 +241,7 @@ name: this.$t('Inthecollection'), type: 'bar', stack: 'one', - barWidth: 30, + barWidth: 40, barGap: '-100%', itemStyle: { color: "#00B3BE", @@ -212,7 +252,7 @@ name: this.$t('Submitted'), type: 'bar', stack: 'one', - barWidth: 30, + barWidth: 40, barGap: '-100%', itemStyle: { color: "#26BD4B", @@ -223,7 +263,7 @@ name: this.$t('SynchronizedLibrary'), type: 'bar', stack: 'one', - barWidth: 30, + barWidth: 40, barGap: '-100%', itemStyle: { color: "#E83030", @@ -234,60 +274,20 @@ dataZoom:[ { - - type: 'slider', - - show: false, - - start:0,//默认为0 - - end: 100,//默认为100 - + type: 'slider',//给x轴设置滚动条 + show: true, //flase直接隐藏图形 xAxisIndex: [0], - - handleSize: 0,//滑动条的 左右2个滑动条的大小 - - height: 5,//组件高度 - - bottom: 0,//右边的距离 - - borderColor: "#e3e3e3", - - fillerColor: '#51B7F9', - - borderRadius:10, - - backgroundColor: '#e3e3e3',//两边未选中的滑动条区域的颜色 - - showDataShadow: false,//是否显示数据阴影 默认auto - - showDetail: false,//即拖拽时候是否显示详细数值信息 默认true - - realtime:true, //是否实时更新 - - filterMode: 'filter', - - zlevel:-10, - - }, - //以下重点： 让鼠标滚动从缩放变成移动 - { - - type: 'inside', - - xAxisIndex: [0], - - zoomOnMouseWheel:false, //滚轮不触发缩放 - - moveOnMouseMove:true, //鼠标移动触发平移 - - moveOnMouseWheel:true, //鼠标滚轮触发平移 - - }, + bottom: 0, + height: 20, + showDetail: false, + startValue: 0,//滚动条的起始位置 + endValue: 9 //滚动条的截止位置（按比例分割你的柱状图x轴长度） + } ], }; - option && myChart.setOption(option); + option && myChart.setOption(option); + }, mainLeftEcharts(data, color) { this.getEcharts('main-left', this.$t('Parametercollection'), color, data, 1) From 5ff017b263a0189a0967b0eae5228042dd07a34a Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 2 Aug 2022 11:54:37 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E5=B8=83=E5=B1=80=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/package.json | 1 + jero-web/src/common/lang/en-us.js | 7 + jero-web/src/common/lang/zh-cn.js | 7 + jero-web/src/components/layouts/TabLayout.vue | 3 + jero-web/src/config/router.config.js | 15 + .../components/problemKnowledgeBaseAdd.vue | 408 ++++++++++++++++++ .../components/problemKnowledgeBaseList.vue | 22 +- .../problemKnowledgeBaseRelease.vue | 13 + .../components/problemKnowledgeBaseView.vue | 13 + 9 files changed, 484 insertions(+), 5 deletions(-) create mode 100644 jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue create mode 100644 jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue create mode 100644 jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue diff --git a/jero-web/package.json b/jero-web/package.json index 895530955..0a928ac24 100644 --- a/jero-web/package.json +++ b/jero-web/package.json @@ -43,6 +43,7 @@ "vue-ls": "^3.2.0", "vue-photo-preview": "^1.1.3", "vue-print-nb-jeecg": "^1.0.9", + "vue-quill-editor": "^3.0.6", "vue-router": "^3.0.1", "vue-splitpane": "^1.0.4", "vuedraggable": "^2.20.0", diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index e81246812..9cfe92ae3 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1209,4 +1209,11 @@ module.exports = { financialReimbursement:'Financial Reimbursement', classificationMaintenance:'Classification Maintenance', managePublishing:'Manage Publishing', + displayPermission:'Display permission', + authorizedUser:'Authorized user', + problemClassification:'Problem classification', + market:'market', + documentNumber:'Document Number', + documentTitle:'Document Title', + bringInDocumentInformation:'Bring in document information', } \ 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 69b0d8324..715a564bf 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1312,4 +1312,11 @@ module.exports = { financialReimbursement:'财务报销', classificationMaintenance:'分类维护', managePublishing:'管理发布', + displayPermission:'展示权限', + authorizedUser:'权限用户', + problemClassification:'问题分类', + market:'市场', + documentNumber:'文档编号', + documentTitle:'文档标题', + bringInDocumentInformation:'带入文档信息', } \ No newline at end of file diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue index 43d3b7322..eab0ee130 100644 --- a/jero-web/src/components/layouts/TabLayout.vue +++ b/jero-web/src/components/layouts/TabLayout.vue @@ -92,6 +92,9 @@ this.$route.path == '/virtualListDetails' || this.$route.path == '/taskListProcess' || this.$route.path == '/ProjectDetails' || + this.$route.path == '/problemKnowledgeBaseAdd' || + this.$route.path == '/problemKnowledgeBaseRelease' || + this.$route.path == '/problemKnowledgeBaseView' || this.$route.path == '/regulatoryInitiatingProcess' || this.$route.path == '/regulatoryProcessReview' || this.$route.path == '/handshakeProcess' || diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js index b4a8ba6b4..0ddd91599 100644 --- a/jero-web/src/config/router.config.js +++ b/jero-web/src/config/router.config.js @@ -357,6 +357,21 @@ export const constantRouterMap = [ name: 'evaluationResultsClause', component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/technologyAssessment/components/evaluationResultsClause') }, + { + path: '/problemKnowledgeBaseAdd', + name: 'problemKnowledgeBaseAdd', + component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd') + }, + { + path: '/problemKnowledgeBaseRelease', + name: 'problemKnowledgeBaseRelease', + component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease') + }, + { + path: '/problemKnowledgeBaseView', + name: 'problemKnowledgeBaseView', + component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView') + }, // { // path: '/ParameterItemCollection', // name: 'ParameterItemCollection', diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue new file mode 100644 index 000000000..2b654d9c4 --- /dev/null +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -0,0 +1,408 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 8cac6b2ef..a3631bcf8 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -27,11 +27,11 @@ {{$t('classificationMaintenance')}}
- + {{$t('managePublishing')}}
- + {{$t('newlyAdded')}}
@@ -125,13 +125,25 @@ }, classificationClick() { - + let newUrl = this.$router.resolve({ + path: '/problemKnowledgeBaseView', + query: {} + }) + window.open(newUrl.href, '_blank') }, managePublishingClick() { - + let newUrl = this.$router.resolve({ + path: '/problemKnowledgeBaseRelease', + query: {} + }) + window.open(newUrl.href, '_blank') }, newlyAddedClick() { - + let newUrl = this.$router.resolve({ + path: '/problemKnowledgeBaseAdd', + query: {} + }) + window.open(newUrl.href, '_blank') }, pageOnChange(page, pageSize) { this.pageNo = page diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue new file mode 100644 index 000000000..d1059e89b --- /dev/null +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue new file mode 100644 index 000000000..958c3f3a5 --- /dev/null +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file From 1ccee53a0f590a1201b4c70a5c2e3e4a5fbec1e8 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 2 Aug 2022 11:58:58 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86?= =?UTF-8?q?=E7=99=BE=E5=88=86=E6=AF=94=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ParameterCollectionEchart.vue | 47 +++++++++++++------ 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue index 77439939d..9c77c4b8e 100644 --- a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue +++ b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue @@ -176,7 +176,27 @@ // data3.push(+(Math.random() + 0.3).toFixed(2)); // data4.push(+Math.random().toFixed(2)); - + let yAxis=[]; + let tooltip= {}; + let _this = this + if(this.queryParam.value === 1){ + yAxis = [ + { + type: 'value', + axisLabel: { + show: true, + interval: 'auto', + formatter: '{value} %' + }, + }, + ] + }else{ + yAxis=[ + { + type: 'value', + }, + ]; + } option = { legend: { data: [this.$t('Notatthe'), this.$t('Inthecollection'), this.$t('Submitted'), this.$t('SynchronizedLibrary')], @@ -195,7 +215,16 @@ axisPointer: { // 坐标轴指示器，坐标轴触发有效 type: 'line'// 默认为直线，可选为：'line' | 'shadow' }, - formatter: '{b}
{a0}: {c0}%
{a1}: {c1}%' + formatter: function (params) { + var html = params[0].name + "
"; + for (var i = 0; i < params.length; i++) { + html += params[i].marker + params[i].seriesName + ":" + params[i].value; + if (_this.queryParam.value == 1) { + html += "%"; + } + } + return html + "
"; + } }, xAxis: { data: xAxisData, @@ -210,17 +239,7 @@ // splitLine: { show: false }, // splitArea: { show: false } }, - yAxis: [ - { - type: 'value', - axisLabel: { - show: true, - interval: 'auto', - formatter: '{value} %' - }, - }, - - ], + yAxis: yAxis, grid: { left: '10%', bottom: '15%' @@ -286,7 +305,7 @@ ], }; - option && myChart.setOption(option); + option && myChart.setOption(option, true); }, mainLeftEcharts(data, color) { From fc92c5d2a5585834497be9439ef9dd25f560fe81 Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 2 Aug 2022 13:44:38 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=BA=93-=E5=AF=BC=E5=87=BA=E8=8B=B1=E6=96=87=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsReportDetailEOServiceImpl.java | 57 +++++++++++++++---- 1 file changed, 45 insertions(+), 12 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index cd176e7ac..7810e4dd3 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -499,9 +499,9 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl allRelevFileList = (List) allParamsInfoList.get(2).get("fileListAll"); if (allRelevFileList != null && !allRelevFileList.isEmpty()) { allRelevFileList = allRelevFileList.stream().distinct().collect(Collectors.toList()); - downLoadFileList(allRelevFileList,fileNowPath + File.separator + "导出文件"); + String exportFile = "导出文件"; + if (CutEnum.EN.getValue().equals(paramsReportDetailVO.getCut())) { + exportFile = "Export file"; + } + downLoadFileList(allRelevFileList,fileNowPath + File.separator + exportFile); } // 拿取模板 @@ -764,7 +785,11 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl allRelevFileList = (List) allParamsInfoList.get(2).get("fileListAll"); if (allRelevFileList != null && !allRelevFileList.isEmpty()) { allRelevFileList = allRelevFileList.stream().distinct().collect(Collectors.toList()); - downLoadFileList(allRelevFileList,fileNowPath + File.separator + "导出文件"); + String exportFile = "导出文件"; + if (CutEnum.EN.getValue().equals(paramsReportDetailVO.getCut())) { + exportFile = "Export file"; + } + downLoadFileList(allRelevFileList,fileNowPath + File.separator + exportFile); } // 拿取模板 @@ -881,7 +910,11 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl Date: Tue, 2 Aug 2022 14:07:18 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E8=AE=A4=E8=AF=81=E7=B1=BB?= =?UTF-8?q?=E5=88=AB=E5=8F=96=E6=B6=88=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index fa55336d4..95420e13b 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -548,4 +548,9 @@ CREATE TABLE `ext_repo_data` ( `file_description` varchar(255) DEFAULT NULL COMMENT '文件说明', `sup_folder` varchar(36) DEFAULT NULL COMMENT '所属文件夹', PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; \ No newline at end of file +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +-- 参数项收集清单 认证类别取消列表显示 2022-08-02 +UPDATE `laws_weilai`.`onl_cgform_field` +SET `is_show_list` = 0, `update_by` = 'admin', `update_time` = '2022-08-02 09:36:09' +WHERE `id` = '7b8ef9f8da124ed93e5c10a14b903390'; From 654b2876e776868f61c7aac78e76c4f8ee8d754f Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 2 Aug 2022 14:07:52 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 ++ jero-web/src/common/lang/zh-cn.js | 2 ++ .../commponts/conventionalmodle.vue | 17 +++++++++++-- .../commponts/customexportmodle.vue | 6 +++++ .../parameter/managementdetails/index.vue | 24 +++++++++---------- .../components/ParameterCollectionEchart.vue | 14 +++++------ 6 files changed, 44 insertions(+), 21 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 9cfe92ae3..8fb825c0e 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1216,4 +1216,6 @@ module.exports = { documentNumber:'Document Number', documentTitle:'Document Title', bringInDocumentInformation:'Bring in document information', + sdt:'sdt', + dre:'dre', } \ 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 715a564bf..33dc196e6 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1319,4 +1319,6 @@ module.exports = { documentNumber:'文档编号', documentTitle:'文档标题', bringInDocumentInformation:'带入文档信息', + sdt:'工程接口人', + dre:'填写人', } \ No newline at end of file diff --git a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue index 56a23cacc..8875d7e86 100644 --- a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue +++ b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue @@ -242,13 +242,20 @@ export default { getAction('sys/dict/getDictItems/cert_category', { }).then((res) => { if (res.success) { let tt = '' + let tten = '' res.result.forEach((item) => { if(item.value == value){ tt=item.title + tten=item.textEn } }) - this.contentListStart = tt - console.log(this.contentListStart) + let long = localStorage.getItem('language') + this.cut = '' + if (long && long === 'zh-cn') { + this.contentListStart = tt + } else if (long && long === 'en-us') { + this.contentListStart = tten + } } }) console.log(value) @@ -268,6 +275,12 @@ export default { query.certCategoryName = this.contentListStart } query.paramsManifestId = this.$route.query.id + let long = localStorage.getItem('language') + if (long && long === 'zh-cn') { + query.exportName = '常规导出' + } else if (long && long === 'en-us') { + query.exportName = 'normal' + } this.confirmLoading = true downloadFile('report/detail/exportNormal', this.$t('GeneralExportInformation')+'.zip', query) this.confirmLoading = false diff --git a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue index c413fbf9e..a102af0ec 100644 --- a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue +++ b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue @@ -243,6 +243,12 @@ export default { // query.certCategoryName = this.contentListStart // } query.paramsManifestId = this.$route.query.id + let long = localStorage.getItem('language') + if (long && long === 'zh-cn') { + query.exportName = '自定义导出' + } else if (long && long === 'en-us') { + query.exportName = 'custom' + } this.confirmLoading = true downloadFile('report/detail/exportCustom', this.$t('CustomizeExportInformation')+'.zip', query) this.confirmLoading = false diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index ac2fd70f2..47bc18363 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -15,11 +15,11 @@
-
- {{$t('certificationCategory')}} +
+ {{$t('NcertificationCategory')}}
@@ -35,20 +35,20 @@
-
- {{$t('ParameterName')}} +
+ {{$t('NParameterName')}}
-
-
- {{$t('completedBy')}} +
+ {{$t('dre')}}
-
- {{$t('engineeringInterfacePerson')}} +
+ {{$t('sdt')}}
- + {{ d.label }} - + - + {{$t('Thepercentage')}} @@ -90,9 +90,7 @@ this.submit = res.result.submit ? res.result.submit : [] this.syncReport = res.result.syncReport ? res.result.syncReport : [] this.dutyTerritory = res.result.dutyTerritory ? res.result.dutyTerritory : [] - setTimeout(() => { this.getEcharts() - },1000) } @@ -220,10 +218,11 @@ for (var i = 0; i < params.length; i++) { html += params[i].marker + params[i].seriesName + ":" + params[i].value; if (_this.queryParam.value == 1) { - html += "%"; + html += "%" + "
"; } } - return html + "
"; + return html; + } }, xAxis: { @@ -231,6 +230,7 @@ // name: 'X Axis', axisLabel: { interval: 0, + rotate:25, // formatter: function(value) { // return value.split("").join("\n"); // } From 1e6f8c24601a6f1f5d7d9cdb304107c45773afbe Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 2 Aug 2022 15:32:17 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=AF=A6=E6=83=85-=E5=8F=82=E6=95=B0=E6=94=B6?= =?UTF-8?q?=E9=9B=86=E7=BB=9F=E8=AE=A1-=E7=99=BE=E5=88=86=E6=AF=94?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/service/impl/ParamsManifestEOServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index e62474aa9..18b513804 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -652,8 +652,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl> listAll = paramsCollectManifestEOMapper.listInfoForExport(paramsCollectManifestEO); - double total = listAll.size(); - + // 循环责任领域，计算每个责任领域中的四种状态数据 dutyTerritoryDictList.forEach(item->{ if (CutEnum.EN.getValue().equals(cut)) { @@ -683,6 +682,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl Date: Tue, 2 Aug 2022 15:49:43 +0800 Subject: [PATCH 11/12] =?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 | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../problemKnowledgeBaseRelease.vue | 263 +++++++++++++++++- .../components/modules/defaultTemplate.vue | 9 +- .../components/modules/fillTable.vue | 4 + .../components/modules/fillTableAdd.vue | 46 ++- 6 files changed, 313 insertions(+), 11 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 8fb825c0e..db7e44757 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1216,6 +1216,7 @@ module.exports = { documentNumber:'Document Number', documentTitle:'Document Title', bringInDocumentInformation:'Bring in document information', + thereWhichCannotDeleted:'There are sub headings under this title, which cannot be deleted', sdt:'sdt', dre:'dre', } \ 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 33dc196e6..13a03d29c 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1319,6 +1319,7 @@ module.exports = { documentNumber:'文档编号', documentTitle:'文档标题', bringInDocumentInformation:'带入文档信息', + thereWhichCannotDeleted:'该标题下存在子标题无法进行删除', sdt:'工程接口人', dre:'填写人', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue index d1059e89b..1cb6d2823 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue @@ -1,13 +1,270 @@ - \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue index 61e2611e2..f8b17a2ce 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue @@ -379,6 +379,8 @@ this.formInline = JSON.parse(JSON.stringify(this.formInlineQuery)) if (this.formInline.technologyTerritory) { this.formInline.technologyTerritory = this.formInline.technologyTerritory.split(',') + } else { + this.formInline.technologyTerritory = [] } this.formInline = { ...this.formInline } } else { @@ -396,6 +398,11 @@ this.formInline.titleCn = value.serial_number + ' ' + value.title this.formInline.titleEn = value.serial_number + ' ' + value.title_en this.formInline.technologyTerritory = value.technology_territory_dict + if (this.formInline.technologyTerritory) { + this.formInline.technologyTerritory = this.formInline.technologyTerritory.split(',') + } else { + this.formInline.technologyTerritory = [] + } this.formInline.applyCar = value.shi4_yong4_che1_xing2_dict this.formInline.applyScope = value.shi4_yong4_fan4_wei2_dict this.formInline.state = value.state_dict @@ -406,7 +413,7 @@ var pos = curPath.indexOf(pathname) var localhostPath = curPath.substring(0, pos) this.formInline.link = localhostPath + '/docManage/library/detail?id=' + value.id - this.formInline = {...this.formInline} + this.formInline = { ...this.formInline } }, getSysCategoryTree() { getAction('/sys/category/getSysCategoryTree', {}).then((res) => { diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue index 7d2abf4fb..a93e3f426 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue @@ -192,6 +192,10 @@ }) }, deleteLib(val) { + if (val.children && val.children.length > 0) { + this.$message.warning(this.$t('thereWhichCannotDeleted')) + return + } let _this = this this.$confirm({ content: _this.$t('ConfirmDelete'), diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue index d33391169..15940fc5e 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTableAdd.vue @@ -14,12 +14,13 @@
- {{$t('chineseTitle')}} + * + {{$t('chineseTitle')}}
- +
@@ -27,11 +28,12 @@
+ * {{$t('englishTitle')}}
- +
@@ -77,7 +79,32 @@ visible: false, confirmLoading: false, formInline: {}, - rules: {}, + rules: { + titleCn: [ + { + required: true, + message: this.$t('chineseTitle') + this.$t('cannotEmpty'), + trigger: 'blur' + }, + { + max: 100, + message: this.$t('chineseTitle') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + trigger: 'blur' + } + ], + titleEn: [ + { + required: true, + message: this.$t('englishTitle') + this.$t('cannotEmpty'), + trigger: 'blur' + }, + { + max: 100, + message: this.$t('englishTitle') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + trigger: 'blur' + } + ] + }, ParentList: [], title: '', url: { @@ -240,4 +267,9 @@ .formAdd { margin-bottom: 40px; } + + .Required { + color: red; + margin-right: 4px; + } \ No newline at end of file From e4ef81b0411881b150e1c14bfc1e3363538ef25c Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 2 Aug 2022 15:51:24 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86=E6=8F=90=E7=A4=BA=E8=AF=AD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../managementdetails/commponts/conventionalmodle.vue | 2 +- .../managementdetails/commponts/customexportmodle.vue | 2 +- .../parameter/parameterexport/components/addModel.vue | 4 ++-- .../components/ParameterCollectionEchart.vue | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue index 8875d7e86..ed60ad494 100644 --- a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue +++ b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue @@ -282,7 +282,7 @@ export default { query.exportName = 'normal' } this.confirmLoading = true - downloadFile('report/detail/exportNormal', this.$t('GeneralExportInformation')+'.zip', query) + downloadFile('report/detail/exportNormal', query.exportName+'.zip', query) this.confirmLoading = false } }) diff --git a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue index a102af0ec..466d06588 100644 --- a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue +++ b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue @@ -250,7 +250,7 @@ export default { query.exportName = 'custom' } this.confirmLoading = true - downloadFile('report/detail/exportCustom', this.$t('CustomizeExportInformation')+'.zip', query) + downloadFile('report/detail/exportCustom', query.exportName+'.zip', query) this.confirmLoading = false } }) diff --git a/jero-web/src/views/parameter/parameterexport/components/addModel.vue b/jero-web/src/views/parameter/parameterexport/components/addModel.vue index 4565b1a46..61e274d12 100644 --- a/jero-web/src/views/parameter/parameterexport/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterexport/components/addModel.vue @@ -211,11 +211,11 @@ export default { Action(url, query).then((res) => { if (res.success) { this.confirmLoading = false - this.$message.success(this.$t('OperationSuccessful')) + this.$message.success(res.message) this.visible = false this.$emit('addModelList') } else { - this.$message.warning(this.$t('operationFailed')) + this.$message.warning(res.message) this.confirmLoading = false } }) diff --git a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue index c2396d44b..57d5c035c 100644 --- a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue +++ b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue @@ -210,9 +210,9 @@ }, tooltip: { trigger:'axis', - axisPointer: { // 坐标轴指示器，坐标轴触发有效 - type: 'line'// 默认为直线，可选为：'line' | 'shadow' - }, + // axisPointer: { // 坐标轴指示器，坐标轴触发有效 + // type: 'line'// 默认为直线，可选为：'line' | 'shadow' + // }, formatter: function (params) { var html = params[0].name + "
"; for (var i = 0; i < params.length; i++) { @@ -254,7 +254,7 @@ itemStyle: { color: "#707486", }, - data: this.collectingdata + data: this.notStartdata }, { name: this.$t('Inthecollection'), @@ -265,7 +265,7 @@ itemStyle: { color: "#00B3BE", }, - data: this.notStartdata + data: this.collectingdata }, { name: this.$t('Submitted'),