diff --git a/jero-web/src/assets/less/common.less b/jero-web/src/assets/less/common.less index b27871b0e..8fe260510 100644 --- a/jero-web/src/assets/less/common.less +++ b/jero-web/src/assets/less/common.less @@ -1,7 +1,18 @@ /*列表上方操作按钮区域*/ .ant-card-body .table-operator { - margin-bottom: 8px; + margin-bottom: 18px; + text-align: right; +} +.operator-text{ + cursor: pointer; + margin-right: 50px; + font-size: 14px; + font-weight: 600; + display: inline-block; +} +.operator-text:last-child{ + margin-right: 16px; } /** Button按钮间距 */ .table-operator .ant-btn { diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index d9fe5f447..45fe25459 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -339,4 +339,7 @@ module.exports = { TextStatus:'TextStatus', PleaseEnter:'Please enter', PleaseSelect:'Please select', + ModificationTime:'Modification time', + ModificationContent:'Modification content', + personnel:'personnel', } \ 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 e67cb45bd..888f00c5f 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -343,4 +343,7 @@ module.exports = { TextStatus:'文本状态', PleaseEnter:'请输入', PleaseSelect:'请选择', + ModificationTime:'修改时间', + ModificationContent:'修改内容', + personnel:'人员', } \ No newline at end of file diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue index a8e9fbc21..c09624dd9 100644 --- a/jero-web/src/components/PersonnelSelection/index.vue +++ b/jero-web/src/components/PersonnelSelection/index.vue @@ -8,7 +8,7 @@ { if (res.success) { var jsonHead = res.result + this.columns = [] jsonHead.forEach((res, index) => { this.columns.push({ title: res.db_field_txt, @@ -134,7 +135,7 @@ let width = 0 if (this.OperationList.length > 0) { this.OperationList.forEach((res) => { - width += res.text.length * 8 + width + width += res.text.length * 9 + width }) } if (this.showAction) { @@ -207,7 +208,7 @@ } .text { - margin-right: 16px; + margin-right: 10px; } .page { diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue index 3f7775e89..5e7203e16 100644 --- a/jero-web/src/views/documentManage/library/docDetail/index.vue +++ b/jero-web/src/views/documentManage/library/docDetail/index.vue @@ -8,7 +8,7 @@ {{this.$route.query.serial_number}} 《{{this.$route.query.title}}》 标准详情
- 更新log + 更新log 文档拆分 文档翻译 文档对比 @@ -29,7 +29,7 @@
- {{ol.db_field_txt}} + {{ol.db_field_txt}} {{ol.value ? ol.value.fileName : '--'}} @@ -53,20 +53,66 @@
+ + + + diff --git a/jero-web/src/views/documentManage/library/index.vue b/jero-web/src/views/documentManage/library/index.vue index d27cb878a..decd28604 100644 --- a/jero-web/src/views/documentManage/library/index.vue +++ b/jero-web/src/views/documentManage/library/index.vue @@ -4,13 +4,34 @@
- 数据导出 - 带文件导出 - {{$t('add')}} - 模板下载 - 导入 - 批量删除 - 推送 +
+ + 批量删除 +
+
+ + 数据导出 +
+
+ + 带文件导出 +
+
+ + 推送 +
+
+ + 模板下载 +
+
+ + 导入 +
+
+ + {{$t('add')}} +