diff --git a/src/assets/image/daiban.png b/src/assets/image/daiban.png new file mode 100644 index 00000000..19002c17 Binary files /dev/null and b/src/assets/image/daiban.png differ diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js index 82624cbf..0998cd2f 100644 --- a/src/common/lang/en-us.js +++ b/src/common/lang/en-us.js @@ -1,4 +1,3 @@ - const system = require('./system/en.js') module.exports = { @@ -91,6 +90,28 @@ module.exports = { operationFailed: 'Operation Failed', nodeQuickLookup: 'Node Quick Find', pleaseEnterOrSelect: 'Please Enter Or Select', + view: 'View', + selectOne: 'Please select a data', + essentialInformation: 'General Information', + download: 'Download', + fileName: 'File Name', + newNode: 'New node', + modifyNode: 'Modify Node', + deleteNode: 'Delete Node', + moveUp: 'Move Up', + moveDown: 'Move Down', + copy: 'Copy', + confirmReplication: 'Confirm to copy?', + confirmDeleteNodes: 'If there are child nodes under this node, they will be deleted synchronously. Are you sure to delete this data?', + pleaseSelectData: 'Please Select Data', + leastTwo: 'Please Select at Least two pieces of data', + number: 'No.', + title: 'Title', + release: 'Release', + withdraw: 'Withdraw', + confirmRelease: 'Confirm Release?', + confirmWithdraw: 'Confirm to Withdraw?', + doNotHavePermissionDeleteData: 'Do not have permission to delete this data', // 页面头部 header: { userMenuSearchMenu: 'Search menu', @@ -314,7 +335,81 @@ module.exports = { detailsPhasedImplementation: 'Phased Implementation', statuteNumberClause: 'Statute number/clause', implementationDateTwo: 'Implementation Date', - typeofImplementation: 'Type of implementation' + typeofImplementation: 'Type of implementation', + updateLog: 'Change Log', + problemKnowledgeBase: 'Knowledge Sharing', + collection: 'Invoice Collection', + textInformation: 'Document Files', + standardBreakdown: 'Standard Breakdown', + standardOne: 'Standard', + viewFileOne: 'View File', + dataLoading: 'Data loading...', + standardName: 'Standard Name', + modificationContent: 'Modification Content', + modificationTime: 'Modification Time', + personnel: 'Personnel', + documentLibraryDetails: 'Document Library Details', + confirmCollection: 'Confirm Collection?', + cancelConfirmCollection: 'Are you sure you want to cancel the collection?' + }, + // 文档工具 + docTool: { + // 文档拆分 + split: { + splitText: 'Split Library File', + importResults: 'Import Split Results', + backDocument: 'Back To Document Library', + selectFileType: 'Please select a file type', + onlyWord: 'Only word files can be imported', + fileType: 'File Type', + kmvssTable: 'KMVSS Table', + kmvssArticle: 'KMVSS Article', + cfr: 'CFR', + unece: 'UNECE', + jpnAttachment: 'JPN Attachment', + jpnArticle: 'JPN Article', + gb: 'GB', + gbt: 'GB/T', + gso: 'GSO', + mergerClause: 'Merge Item', + batchSetting: 'Batch Set', + clauseContent: 'Item Content', + clauseNo: 'Item No.', + clauseName: 'Item Name', + selectDirectoryTerms: 'Please Select the directory location to add terms', + documentSplitTemplate: 'Document Split Template', + mergeTerms: 'Determine Merger Terms', + pleaseUploadSplitFile: 'Please Upload Split File' + }, + comparison: { + releaseSituation: 'Release situation', + comparisonResults: 'Comparison results', + initiateComparison: 'Initiate Comparison', + textStatus: 'Text Status', + selectedStandard: 'Selected Standard', + noComparisonDocumentSelected: 'No comparison document selected', + remarkInfo: 'Remarks Info', + initiateDocumentComparison: 'Initiate Document Comparison', + documentComparison: 'Doc Comparison', + viewTheComparisonResults: 'View Results', + addFullTextComment: 'Full Text Comment', + turnOffAutomaticMatching: 'Turn Off Auto Match', + turnOnAutoMatch: 'Turn On Auto Match', + comparisonOfArticles: 'Comparison Of Articles', + consistentAssessment: 'Consistent', + fullTextComments: 'Full Text Comment', + pleaseSelectTheDataCompared: 'Please select the data to be compared', + viewVarianceAssessment: 'View Variance', + viewConsistentAssessment: 'View Consistent', + viewAll: 'View All', + exportComparisonReport: 'Export Comparison Report', + comment: 'Comments', + comparisonDifferenceComment: 'Comparison Difference Comment', + comparativeComments: 'Comparative Comments', + publishComment: 'Comment', + noComment: 'No Comments', + replyToComments: 'Reply To Comments' + } }, // 标准选择器 standardSelect: { diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index 640a1242..32c0c741 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -92,6 +92,26 @@ module.exports = { pleaseEnterOrSelect: '请输入或选择', view: '查看', selectOne: '请选择一条数据', + essentialInformation: '基本信息', + download: '下载', + fileName: '文件名称', + newNode: '新增节点', + modifyNode: '修改节点', + deleteNode: '删除节点', + moveUp: '上移', + moveDown: '下移', + copy: '复制', + confirmReplication: '确认复制?', + confirmDeleteNodes: '该节点下若有子节点将同步删除,确认删除该条数据?', + pleaseSelectData: '请选择数据', + leastTwo: '请选择至少两条数据', + number: '编号', + title: '标题', + release: '发布', + withdraw: '撤回', + confirmRelease: '确认发布?', + confirmWithdraw: '确认撤回?', + doNotHavePermissionDeleteData: '没有权限删除此数据', // 页面头部 header: { userMenuSearchMenu: '搜索菜单', @@ -315,7 +335,22 @@ module.exports = { detailsPhasedImplementation: '分阶段实施详情', statuteNumberClause: '法规编号/条款', implementationDateTwo: '实施日期', - typeofImplementation: '实施类型' + typeofImplementation: '实施类型', + updateLog: '更新log', + problemKnowledgeBase: '知识分享', + collection: '收藏', + textInformation: '文本信息', + standardBreakdown: '标准分解单', + standardOne: '标准', + viewFileOne: '查看文件', + dataLoading: '数据加载中...', + standardName: '标准名称', + modificationContent: '修改内容', + modificationTime: '修改时间', + personnel: '人员', + documentLibraryDetails: '文档库详情', + confirmCollection: '确定收藏?', + cancelConfirmCollection: '确定取消收藏?' }, // 文档工具 docTool: { @@ -335,7 +370,45 @@ module.exports = { jpnArticle: 'JPN Article', gb: 'GB', gbt: 'GB/T', - gso: 'GSO' + gso: 'GSO', + mergerClause: '合并条款', + batchSetting: '批量设置', + clauseContent: '条款内容', + clauseNo: '条款号', + clauseName: '条款名称', + selectDirectoryTerms: '请选择添加条款的目录位置', + documentSplitTemplate: '文档拆分模板', + mergeTerms: '确定合并条款', + pleaseUploadSplitFile: '请上传拆分文件' + }, + comparison: { + releaseSituation: '发布情况', + comparisonResults: '对比结果', + initiateComparison: '发起对比', + textStatus: '文本状态', + selectedStandard: '所选标准', + noComparisonDocumentSelected: '未选择对比文档', + remarkInfo: '备注信息', + initiateDocumentComparison: '发起文档对比', + documentComparison: '文档对比', + viewTheComparisonResults: '查看对比结果', + addFullTextComment: '添加全文评论', + turnOffAutomaticMatching: '关闭自动匹配', + turnOnAutoMatch: '打开自动匹配', + comparisonOfArticles: '条款对比评论', + consistentAssessment: '一致', + fullTextComments: '全文评论', + pleaseSelectTheDataCompared: '请选择需要对比的数据', + viewVarianceAssessment: '查看差异项', + viewConsistentAssessment: '查看一致项', + viewAll: '查看全部', + exportComparisonReport: '导出对比报告', + comment: '评论', + comparisonDifferenceComment: '对比差异评论', + comparativeComments: '对比评论', + publishComment: '发表评论', + noComment: '暂无评论', + replyToComments: '回复评论' } }, // 标准选择器 diff --git a/src/components/customField/Search.vue b/src/components/customField/Search.vue index 22f2a96e..e8a3601b 100644 --- a/src/components/customField/Search.vue +++ b/src/components/customField/Search.vue @@ -4,165 +4,146 @@ -
-
- {{item.db_field_txt}} -
- -
+ -
-
- {{item.db_field_txt}} -
- -
+ -
-
- {{item.db_field_txt}} -
- -
+ + + + + -
-
- {{item.db_field_txt}} -
- -
+ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
@@ -170,8 +151,8 @@ {{ !toggleSearchStatus ? $t('open') : $t('putAway') }} - {{$t('reset')}} - {{$t('query')}} + {{$t('reset')}} + {{$t('query')}} @@ -215,7 +196,13 @@ export default { FieldType, queryParam: {}, toggleSearchStatus: false, - searchList: [] + searchList: [], + labelCol: { + span: 6 + }, + wrapperCol: { + span: 14 + } } }, mounted () { @@ -331,70 +318,4 @@ export default { diff --git a/src/views/documentManage/DocumentLibrary.vue b/src/views/documentManage/DocumentLibrary.vue index b8adee02..3b82c317 100644 --- a/src/views/documentManage/DocumentLibrary.vue +++ b/src/views/documentManage/DocumentLibrary.vue @@ -117,8 +117,8 @@ export default { tokenHeader: { 'X-Access-Token': Vue.ls.get(ACCESS_TOKEN) }, // url传参严格按照当前命名 url: { - tableHeader: 'document/bussDocumentLibraryEO/getHeader', // 表格头部字段 - getSearchList: 'document/bussDocumentLibraryEO/queryCondition', // 搜索字段 + tableHeader: '/document/bussDocumentLibraryEO/getHeader', // 表格头部字段 + getSearchList: '/document/bussDocumentLibraryEO/queryCondition', // 搜索字段 tableList: 'document/bussDocumentLibraryEO/queryPageInfo', // 表格数据 getAddForm: 'document/bussDocumentLibraryEO/getAddForm', // 表单的字段 addInfo: 'document/bussDocumentLibraryEO/addInfo', // 新增 diff --git a/src/views/documentManage/modules/LibraryDetail.vue b/src/views/documentManage/modules/LibraryDetail.vue index 9f2d2065..098337d7 100644 --- a/src/views/documentManage/modules/LibraryDetail.vue +++ b/src/views/documentManage/modules/LibraryDetail.vue @@ -12,21 +12,21 @@
-
+
- {{$t('updateLog')}} + {{$t('docLibrary.updateLog')}}
+ :title="$t('docLibrary.problemKnowledgeBase')"> - {{ $t('problemKnowledgeBase') }} + {{ $t('docLibrary.problemKnowledgeBase') }}
+ :title="$t('docLibrary.collection')"> - {{ collectFlag == '1' ? $t('cancelCollection') : $t('collection') }} + {{ collectFlag == '1' ? $t('docLibrary.cancelCollection') : $t('docLibrary.collection') }}
- {{$t('viewUploadedFiles')}} + {{$t('uploadFile.viewUploadedFiles')}} -- @@ -71,14 +71,14 @@ v-if="ol.list && ol.list.length > 0"> {{valItem.title}} - -- + -- {{ol.value ? ol.value : '--'}}
-
+
{{ol.db_field_txt}} @@ -96,7 +96,7 @@
@@ -115,7 +115,7 @@ - {{$t('viewUploadedFiles')}} + {{$t('uploadFile.viewUploadedFiles')}} -- @@ -140,7 +140,7 @@
- {{$t('DetailsPhasedImplementation')}} + {{$t('docLibrary.detailsPhasedImplementation')}}
- {{$t('See')}} + {{$t('view')}} {{$t('download')}} - {{$t('StandardBreakdown')}} + {{$t('docLibrary.standardBreakdown')}} - {{$t('dataLoading')}} { this.getInfoById() @@ -396,7 +397,7 @@ export default { }, collectionClick (val) { this.$confirm({ - content: val.collectFlag === 0 || !val.collectFlag ? this.$t('ConfirmCollection') : this.$t('cancelConfirmCollection'), + content: val.collectFlag === 0 || !val.collectFlag ? this.$t('docLibrary.confirmCollection') : this.$t('docLibrary.cancelConfirmCollection'), onOk: () => { let url = '' if (val.collectFlag === 0 || !val.collectFlag) { @@ -406,7 +407,7 @@ export default { } getAction(url, { id: val.id }).then((res) => { if (res.success) { - this.$message.success(this.$t('OperationSuccessful')) + this.$message.success(this.$t('operationSuccessful')) this.getWdkCollectAndSubscribeInfoByUser() } else { this.$message.warning(this.$t('operationFailed')) diff --git a/src/views/documentTool/DocumentComparison.vue b/src/views/documentTool/DocumentComparison.vue new file mode 100644 index 00000000..d51fb154 --- /dev/null +++ b/src/views/documentTool/DocumentComparison.vue @@ -0,0 +1,398 @@ + + + + + diff --git a/src/views/documentTool/modules/CommentList.vue b/src/views/documentTool/modules/CommentList.vue new file mode 100644 index 00000000..44e159d7 --- /dev/null +++ b/src/views/documentTool/modules/CommentList.vue @@ -0,0 +1,405 @@ + + + + + diff --git a/src/views/documentTool/modules/ComparisonResults.vue b/src/views/documentTool/modules/ComparisonResults.vue new file mode 100644 index 00000000..fb7fdd02 --- /dev/null +++ b/src/views/documentTool/modules/ComparisonResults.vue @@ -0,0 +1,832 @@ + + + + + diff --git a/src/views/documentTool/modules/DocumentDataComparison.vue b/src/views/documentTool/modules/DocumentDataComparison.vue new file mode 100644 index 00000000..e67be099 --- /dev/null +++ b/src/views/documentTool/modules/DocumentDataComparison.vue @@ -0,0 +1,612 @@ + + + + + diff --git a/src/views/documentTool/modules/ImportResult.vue b/src/views/documentTool/modules/ImportResult.vue index 043b2067..7dfa1529 100644 --- a/src/views/documentTool/modules/ImportResult.vue +++ b/src/views/documentTool/modules/ImportResult.vue @@ -1,6 +1,6 @@