diff --git a/jero-web/package.json b/jero-web/package.json index c6b13b18e..1cd46fe3c 100644 --- a/jero-web/package.json +++ b/jero-web/package.json @@ -27,6 +27,7 @@ "js-base64": "^3.7.2", "js-cookie": "^2.2.0", "jsencrypt": "^3.0.0-rc.1", + "lodash": "^4.17.21", "lodash.get": "^4.4.2", "lodash.pick": "^4.4.0", "mammoth": "^1.4.21", diff --git a/jero-web/src/App.vue b/jero-web/src/App.vue index a5ed87aac..de9e3a1dc 100644 --- a/jero-web/src/App.vue +++ b/jero-web/src/App.vue @@ -178,4 +178,12 @@ line-height: 38px !important; height: 38px !important; } + + .ant-table-column-title{ + font-weight: bold!important; + } + + .ant-table-thead > tr > th { + background: #f3f6f6!important; + } \ No newline at end of file diff --git a/jero-web/src/assets/less/common.less b/jero-web/src/assets/less/common.less index 801cf50a5..8683c2b46 100644 --- a/jero-web/src/assets/less/common.less +++ b/jero-web/src/assets/less/common.less @@ -99,6 +99,41 @@ line-height: 38px; } -.ant-table-fixed-left table, .ant-table-fixed-right table .ant-table-fixed{ +.ant-table-fixed-left table, .ant-table-fixed-right table .ant-table-fixed { width: min-content; +} + +.nio-header-th { + position: relative; + isolation: isolate; +} + +.nio-drag-handler { + position: absolute; + right: 0; + top: 0; + height: 100%; + width: 1px; + z-index: 1; + border-left: 1px #e8e8e8 solid; +} +.nio-drag-handler:hover, +.nio-drag-handler:focus{ + cursor: col-resize!important; + border: 1px solid #0bd9d9!important; +} + +.ant-table-column-title{ + font-weight: bold!important; +} + +.ant-table-thead > tr > th { + background: #f3f6f6!important; +} +.ant-tooltip-inner { + color: #333; + background-color: #fff!important; +} +.ant-tooltip-arrow::before { + background-color: #fff; } \ No newline at end of file diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 834bf8118..b57ccfc50 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -99,6 +99,7 @@ module.exports = { RoleCode: 'Role Code', createTime: 'Creation Time', userName: 'User Name', + userManual:'User Manual', selectOneRule: 'Please select a role!', setAttribute: 'Please set the url.list2 attribute!', setDelAttribute: 'Please set the url.delete2 attribute!', @@ -426,6 +427,7 @@ module.exports = { MessageType: 'Message Type', NotificationTime: 'Notification Time', MessageNotification: 'Message Notification', + MessageCenter:'Message Center', SeeMore: 'See More', OperationSuccessful: 'Operation Successful', Intheexport: 'In The Export...', @@ -607,11 +609,11 @@ module.exports = { certificationType: 'Certification Type', certificationLevel: 'Certification Level', areaOfResponsibility: 'Responsible Field', - confirmationOfDesignConformity: 'Design Compliance Check', + confirmationOfDesignConformity: 'Design Compliance Check ', Deliverables: 'Deliverables', personLiable: 'Assignee', PrehomoConfirmation: 'Pre-Homo Confirmation', - verificationAndConformityconfirmation: 'Validation Compliance Check', + verificationAndConformityconfirmation: 'Validation Compliance Check ', StandardImplementationDate: 'New Type Execution Date', regulatoryEngineer: 'Regulation Engineer', certifiedEngineer: 'Homo Engineer', @@ -722,11 +724,11 @@ module.exports = { time: 'Time', uploadMaximumATime: 'Upload a Maximum of 20 Images at a time', - confirmationOfRegulationsList: 'Regulation List Confirmation', - regulatoryTaskConfirmation: 'Regulation Task Confirmation', - certificationStart: 'Homo Completion', - preHomoCompletion: 'Pre-Homo Confirmation', - certificationEnd: 'Homo KO', + confirmationOfRegulationsList: 'Regulation List Confirmation ', + regulatoryTaskConfirmation: 'Regulation Task Confirmation ', + certificationStart: 'Homo Completion ', + preHomoCompletion: 'Pre-Homo Confirmation ', + certificationEnd: 'Homo KO ', directoryName: 'Catalogue Name', batch: 'Batch', uploadTime: 'Upload Time', @@ -1173,6 +1175,7 @@ module.exports = { RemarkInfo: 'Remarks Info', initiateDocumentComparison: 'Initiate Document Comparison', comparativeComments: 'Comparative Comments', + Comparisonofarticles:'Comparison Of Articles', viewTheComparisonResults: 'View Results', addFullTextComment: 'Full Text Comment', turnOffAutomaticMatching: 'Turn Off Auto Match', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 371c1be91..3f62cbed7 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -101,6 +101,7 @@ module.exports = { RoleCode: '角色编码', createTime: '创建时间', userName: '用户名称', + userManual:'用户手册', selectOneRule: '请选择一个角色!', setAttribute: '请设置url.list2属性!', setDelAttribute: '请设置url.delete2 属性!', @@ -431,6 +432,7 @@ module.exports = { MessageType: '消息类型', NotificationTime: '通知时间', MessageNotification: '消息通知', + MessageCenter:'消息中心', SeeMore: '查看更多', OperationSuccessful: '操作成功', Intheexport: '导出中...', @@ -1004,9 +1006,9 @@ module.exports = { taskConfirmationResponsiblePerson: '责任人任务确认', or: '或', warningTime: '预警时间', - RegulationMonthlyManagement: '法规月报管理', - RegulationMonthlyFill: '法规月报填写', - RegulationMonthlyName: '法规月报名称', + RegulationMonthlyManagement: '月报管理', + RegulationMonthlyFill: '月报填写', + RegulationMonthlyName: '月报名称', monthlyLanguage: '月报语种', releaseStatus: '发布状态', uploadedBy: '上传人', @@ -1178,6 +1180,7 @@ module.exports = { RemarkInfo: '备注信息', initiateDocumentComparison: '发起文档对比', comparativeComments: '对比评论', + Comparisonofarticles:'条款对比评论', viewTheComparisonResults: '查看对比结果', addFullTextComment: '添加全文评论', turnOffAutomaticMatching: '关闭自动匹配', diff --git a/jero-web/src/components/OcrTable/DocTable.vue b/jero-web/src/components/OcrTable/DocTable.vue index 0d0fa270d..7448e00be 100644 --- a/jero-web/src/components/OcrTable/DocTable.vue +++ b/jero-web/src/components/OcrTable/DocTable.vue @@ -162,7 +162,7 @@ this.columns.push({ title: res.db_field_txt, dataIndex: res.db_field_name, - align: 'center', + align: 'left', ellipsis: true, sorter: res.sort }) @@ -190,7 +190,7 @@ if (this.showAction) { this.columns.push({ title: this.$t('operation'), - align: 'center', + align: 'left', fixed: 'right', width: width, scopedSlots: { customRender: 'operation' } diff --git a/jero-web/src/components/OcrTable/index.vue b/jero-web/src/components/OcrTable/index.vue index cbab09ff6..a3570863f 100644 --- a/jero-web/src/components/OcrTable/index.vue +++ b/jero-web/src/components/OcrTable/index.vue @@ -13,7 +13,7 @@ @change="tableOnChange" > - {{record.resultContent=='转换成功'&&record.syncState=='未同步'&&record.fileSource=='1'?ol.text:''}} @@ -22,7 +22,7 @@ + v-has="'ocr:ocrRestful:downFile'" :class="{'text':record.resultContent=='转换成功'}"> {{record.resultContent=='转换成功'?ol.text:''}} @@ -166,7 +166,7 @@ this.columns.push({ title: res.db_field_txt, dataIndex: res.db_field_name, - align: 'center', + align: 'left', ellipsis: true, width: 170, sorter: res.sort @@ -195,7 +195,7 @@ if (this.showAction) { this.columns.push({ title: this.$t('operation'), - align: 'center', + align: 'left', fixed: 'right', width: width, scopedSlots: { customRender: 'operation' } @@ -290,4 +290,8 @@ text-justify: inter-ideograph; word-break: break-all } + + /*/deep/.table .ant-table-tbody > tr > td {*/ + /* color: #040B29 ;*/ + /*}*/ diff --git a/jero-web/src/components/SplitDetailTable/index.vue b/jero-web/src/components/SplitDetailTable/index.vue index ea4f0014d..486c723e4 100644 --- a/jero-web/src/components/SplitDetailTable/index.vue +++ b/jero-web/src/components/SplitDetailTable/index.vue @@ -171,7 +171,7 @@ this.columns.push({ title: res.db_field_txt, dataIndex: res.db_field_name, - align: 'center', + align: 'left', ellipsis: true, sorter: res.sort }) @@ -201,7 +201,7 @@ if (this.showAction) { this.columns.push({ title: this.$t('operation'), - align: 'center', + align: 'left', fixed: 'right', width: width, scopedSlots: { customRender: 'operation' } diff --git a/jero-web/src/components/SplitSearch/index.vue b/jero-web/src/components/SplitSearch/index.vue index c15b6b177..077aa9be9 100644 --- a/jero-web/src/components/SplitSearch/index.vue +++ b/jero-web/src/components/SplitSearch/index.vue @@ -1,8 +1,8 @@