diff --git a/src/api/documentToolApi.js b/src/api/documentToolApi.js index 569028d9..d042afa8 100644 --- a/src/api/documentToolApi.js +++ b/src/api/documentToolApi.js @@ -1,21 +1,16 @@ // 本地工具-即文档功能对应的接口 -import { getAction } from './manage' +import { getAction, postAction } from './manage' -// 文档拆分-获取查询条件-todo 全部需要修改接口 -const getDocumentSplitSearchForm = (params) => getAction('/split/sarFileSplitInfo/queryCondition', params) -// 文档拆分-获取表单模型 -const getDocumentSplitFormModal = (params) => getAction('/laws/standard/domestic/getFormModel', params) -// 文档拆分-获取信息 -const getDocumentSplitDocumentInfo = (params) => getAction('/laws/standard/domestic/getByIdAndModule', params) -// 文档拆分-获取表头信息 -const getDocumentSplitTableHeader = (params) => getAction('/split/sarFileSplitInfo/getHeader', params) +// 文档拆分-发布 +const releaseSplitStandard = (params) => postAction('', params) +// 文档拆分详情-表头 +const getDocSplitTableHeader = (params) => getAction('', params) export { // 文档拆分 - getDocumentSplitSearchForm, - getDocumentSplitFormModal, - getDocumentSplitDocumentInfo, - getDocumentSplitTableHeader + releaseSplitStandard, + // 文档拆分-详情 + getDocSplitTableHeader } diff --git a/src/assets/less/common.less b/src/assets/less/common.less index 8472b405..53f78554 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -424,10 +424,13 @@ } } -/*树节点样式*/ -.ant-tree li .ant-tree-node-content-wrapper { - width: calc(100% - 24px); - box-sizing: border-box; +.page-tree-box { + height: 100%; + overflow: auto; +} + +.page-tree-box-has-search { + height: calc(100% - 32px); } /*展开收起按钮颜色*/ @@ -482,13 +485,51 @@ opacity: 1; margin-left: -24px; padding-left: 29px; - width: 100%; } .ant-tree li .ant-tree-node-content-wrapper.ant-tree-node-selected { background-color: #ffd9d1 !important; } +.tree-operate-node { + display: flex; + width: 100%; + align-items: center; + + &-btn-box { + display: inline-block; + + .tree-operate-node-btn { + display: inline-block; + } + } + + &-btn-box-hide { + opacity: 0; + pointer-events: none; + } + + &-btn { + width: 24px; + height: 24px; + background: rgba(213, 44, 38, 0.08); + border-radius: 2px 2px 2px 2px; + border: none; + margin-left: 4px; + padding: 0; + + /deep/ .anticon { + margin-top: 2px; + color: #D52C26; + } + + i { + color: @primary-color; + height: 20px; + } + } +} + /*抽屉样式修改*/ .custom-drawer-style { height: 100%; diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js index ed1a28a5..9fb9140d 100644 --- a/src/common/lang/en-us.js +++ b/src/common/lang/en-us.js @@ -117,6 +117,7 @@ module.exports = { release: 'Release', withdraw: 'Withdraw', confirmRelease: 'Confirm Release?', + confirmReleaseContent: 'Confirm to publish the data?', confirmWithdraw: 'Confirm to Withdraw?', doNotHavePermissionDeleteData: 'Do not have permission to delete this data', noData: 'No Data', @@ -364,7 +365,15 @@ module.exports = { split: { splitText: 'Split Library File', importResults: 'Import Split Results', - backDocument: 'Back To Document Library', + splitState: 'Split state', + editor: 'Editor', + fileStatus: 'File status', + splitTime: 'Split time', + splitResult: 'Split result', + batchCopy: 'Batch copy', + batchEdit: 'Batch edit', + mergerClause: 'Merge Item', + selectFileType: 'Please select a file type', onlyWord: 'Only word files can be imported', fileType: 'File Type', @@ -377,7 +386,6 @@ module.exports = { gb: 'GB', gbt: 'GB/T', gso: 'GSO', - mergerClause: 'Merge Item', batchSetting: 'Batch Set', clauseContent: 'Item Content', clauseNo: 'Item No.', diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index c8107ac3..1bd7a993 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -117,6 +117,7 @@ module.exports = { release: '发布', withdraw: '撤回', confirmRelease: '确认发布?', + confirmReleaseContent: '确认发布该条数据?', confirmWithdraw: '确认撤回?', doNotHavePermissionDeleteData: '没有权限删除此数据', noData: '暂无数据', @@ -364,7 +365,15 @@ module.exports = { split: { splitText: '拆分已入库文本', importResults: '导入拆分结果', - backDocument: '回传至文档库', + splitState: '拆分状态', + editor: '编辑人', + fileStatus: '文件状态', + splitTime: '拆分时间', + splitResult: '拆分结果', + batchCopy: '批量复制', + batchEdit: '批量编辑', + mergerClause: '合并条款', + selectFileType: '请选择文件类型', onlyWord: '只能导入word文件', fileType: '文件类型', @@ -377,7 +386,6 @@ module.exports = { gb: 'GB', gbt: 'GB/T', gso: 'GSO', - mergerClause: '合并条款', batchSetting: '批量设置', clauseContent: '条款内容', clauseNo: '条款号', diff --git a/src/views/documentTool/DocumentSplit.vue b/src/views/documentTool/DocumentSplit.vue index 976e7a23..247f63af 100644 --- a/src/views/documentTool/DocumentSplit.vue +++ b/src/views/documentTool/DocumentSplit.vue @@ -1,28 +1,56 @@ diff --git a/src/views/documentTool/modules/SplitDetail.vue b/src/views/documentTool/DocumentSplitDetail.vue similarity index 79% rename from src/views/documentTool/modules/SplitDetail.vue rename to src/views/documentTool/DocumentSplitDetail.vue index 523449e5..b00ed801 100644 --- a/src/views/documentTool/modules/SplitDetail.vue +++ b/src/views/documentTool/DocumentSplitDetail.vue @@ -1,8 +1,9 @@ - + -
-
-
- -
-
-
- - - - {{ $t('copy') }} -
-
- - - - {{ $t('add') }} -
-
- - {{ (uploadMenuId === '' || uploadMenuId === undefined) ? $t('import') : '' }} - -
-
- - {{ $t('export') }} -
-
- - {{ $t('templateDownload') }} -
-
- - {{ $t('docTool.split.mergerClause') }} -
-
- - {{ $t('docTool.split.batchSetting') }} -
-
- - {{ $t('batchDelete') }} -
-
-
- + +
+
+ + + {{ $t('import') }} + + + + {{ $t('export') }} + + + {{ $t('batchDelete') }} + + + {{ $t('templateDownload') }} + + + {{ $t('docTool.split.batchCopy') }} + + {{ $t('docTool.split.batchEdit') }} + + {{ $t('docTool.split.mergerClause') }} +
+
+ - - - + + - + - -
+
- - - - - - - -
- + + + + + + + + + diff --git a/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue b/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue index 7b39fe4e..042460e6 100644 --- a/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue +++ b/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue @@ -2,11 +2,11 @@
- - - + + +
- +
@@ -539,35 +540,6 @@ export default { color: #1D2129; } -.tree-operate-node { - display: flex; - width: 100%; - align-items: center; - - &-btn { - width: 20px; - height: 20px; - background: rgba(213, 44, 38, 0.08); - border-radius: 2px 2px 2px 2px; - border: none; - display: flex; - align-items: center; - justify-content: center; - margin-left: 4px; - padding: 0; - - /deep/ .anticon { - margin-top: 2px; - color: #D52C26; - } - - i { - color: @primary-color; - height: 20px; - } - } -} - /deep/ .ant-tree li span.ant-tree-switcher.ant-tree-switcher-noop { display: none; }