diff --git a/src/api/standardRegulationLibraryApi.js b/src/api/standardRegulationLibraryApi.js index 195d6c9d..813e0714 100644 --- a/src/api/standardRegulationLibraryApi.js +++ b/src/api/standardRegulationLibraryApi.js @@ -1,4 +1,4 @@ -import { getAction } from './manage' +import { getAction, postAction } from './manage' // 国内法规标准-获取查询条件 const getDomesticStandardSearchForm = (params) => getAction('/laws/standard/domestic/getQueryCondition', params) @@ -8,6 +8,14 @@ const getDomesticStandardFormModal = (params) => getAction('/laws/standard/domes const getDomesticStandardDocumentInfo = (params) => getAction('/laws/standard/domestic/getByIdAndModule', params) // 国内法规标准-获取表头信息 const getDomesticStandardTableHeader = (params) => getAction('/laws/standard/domestic/getCommonHeader', params) +// 国内标准法规-收藏 +const collectionDomesticStandard = (params) => postAction('', params) +// 国内标准法规-分享 +const shareDomesticStandard = (params) => postAction('', params) +// 国内标准-体系新增 +const addDomesticSystemTree = (params) => postAction('', params) +// 国内标准-体系编辑 +const editDomesticSystemTree = (params) => postAction('', params) // 海外标准-获取查询条件 const getOverseasStandardSearchForm = (params) => getAction('/laws/standard/overseas/getQueryCondition', params) @@ -26,5 +34,9 @@ export { getOverseasStandardSearchForm, getOverseasStandardForm, getOverseasStandardDocumentInfo, - getOverseasStandardTableHeader + getOverseasStandardTableHeader, + collectionDomesticStandard, + shareDomesticStandard, + addDomesticSystemTree, + editDomesticSystemTree } diff --git a/src/assets/image/common/iconTreeDelete.png b/src/assets/image/common/iconTreeDelete.png deleted file mode 100644 index b8cab2b8..00000000 Binary files a/src/assets/image/common/iconTreeDelete.png and /dev/null differ diff --git a/src/assets/image/common/iconTreeEdit.png b/src/assets/image/common/iconTreeEdit.png deleted file mode 100644 index 828f7cd5..00000000 Binary files a/src/assets/image/common/iconTreeEdit.png and /dev/null differ diff --git a/src/assets/image/common/iconTreeFolder.png b/src/assets/image/common/iconTreeFolder.png deleted file mode 100644 index 877fb645..00000000 Binary files a/src/assets/image/common/iconTreeFolder.png and /dev/null differ diff --git a/src/assets/less/common.less b/src/assets/less/common.less index b76aa1a8..58c7d88d 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -86,6 +86,23 @@ color: @primary-color; } +.operate-icon-more { + cursor: pointer; +} + +.operate-btn { + display: flex; + align-items: center; + font-size: 16px; + font-family: PingFang SC-Regular, PingFang SC, sans-serif; + color: #1D2129; + + &-icon { + margin-right: 8px; + color: @primary-color; + } +} + /*列表页面弹出modal*/ .ant-modal-cust-warp { height: 100% diff --git a/src/common/lang/standardRegulationLibrary/en-us.js b/src/common/lang/standardRegulationLibrary/en-us.js index f19f2340..4f46e87c 100644 --- a/src/common/lang/standardRegulationLibrary/en-us.js +++ b/src/common/lang/standardRegulationLibrary/en-us.js @@ -7,6 +7,7 @@ module.exports = { collection: 'Invoice Collection', // 收藏 cancelCollection: 'Delete Collection', // 取消收藏 exportFileName: 'Domestic standard regulations', // 国内标准法规 + exportZipName: 'Domestic standards and regulations (with documents)', // 国内标准法规(带文件) templateName: 'Import templates for domestic standards and regulations' // 国内标准法规导入模板 } } diff --git a/src/common/lang/standardRegulationLibrary/zh-cn.js b/src/common/lang/standardRegulationLibrary/zh-cn.js index 32f3710f..a9a88a4e 100644 --- a/src/common/lang/standardRegulationLibrary/zh-cn.js +++ b/src/common/lang/standardRegulationLibrary/zh-cn.js @@ -1,12 +1,14 @@ module.exports = { configStandard: '配置标准', removeStandard: '移出标准', + nodeName: '节点名称', // 国内标准 domesticStandard: { treeSearchPlaceholder: '请输入树状图体系', collection: '收藏', cancelCollection: '取消收藏', exportFileName: '国内标准法规', + exportZipName: '国内标准法规(带文件)', templateName: '国内标准法规导入模板' } } diff --git a/src/enums/EsEnum.js b/src/enums/EsEnum.js index 7699133c..bc4775ed 100644 --- a/src/enums/EsEnum.js +++ b/src/enums/EsEnum.js @@ -1,5 +1,5 @@ export default class EsEnum { - constructor(val) { + constructor (val) { if (!val) { return } @@ -15,7 +15,7 @@ export default class EsEnum { * @param key * @param item */ - addAll(key, item) { + addAll (key, item) { this[key] = item } @@ -24,7 +24,7 @@ export default class EsEnum { * @params decend --是否是降序输出 * @returns {Array} */ - getItemList(decend) { + getItemList (decend) { const optionList = [] for (const i in this) { const item = this[i] @@ -45,7 +45,7 @@ export default class EsEnum { * 获取需要排除的枚举值后的所有枚举值列表 * @param val 需要排除的枚举值或枚举值数组 */ - getItemListExcept(val) { + getItemListExcept (val) { let valueArr = [] if (val) { if (Array.isArray(val)) { @@ -71,7 +71,7 @@ export default class EsEnum { * 根据name获取index * @param name */ - indexOfName(name) { + indexOfName (name) { if (name) { for (const i in this) { const e = this[i] @@ -88,7 +88,7 @@ export default class EsEnum { * @param index * @returns {*} */ - nameOfIndex(index) { + nameOfIndex (index) { if (index === null) { return '--' } diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index 22e0e245..8203fbc9 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -1,8 +1,8 @@ import EsEnums from './EsEnum' export const YesOrNoEnum = new EsEnums({ - NO: { name: '否', index: 0 }, - YES: { name: '是', index: 1 } + NO: { name: '否', value: '0' }, + YES: { name: '是', value: '1' } }) // 既可以使用EsEnums 也可以单独写明 @@ -35,3 +35,9 @@ export const TagsAttributeTypeEnums = { SELECT: { text: '下拉选择', langKey: 'system.tag.select', value: 1 }, TREE: { text: '树形结构', langKey: 'system.tag.tree', value: 2 } } + +// 标准体系树节点类型 +export const StandardSystemTreeNodeType = { + ROOT_NODE: { text: '根节点', value: '1' }, + CHILD_NODE: { text: '子节点', value: '2' } +} diff --git a/src/views/enterpriseStandardLibrary/EnterpriseStandardList.vue b/src/views/enterpriseStandardLibrary/EnterpriseStandardList.vue index 16046b32..2eebfef6 100644 --- a/src/views/enterpriseStandardLibrary/EnterpriseStandardList.vue +++ b/src/views/enterpriseStandardLibrary/EnterpriseStandardList.vue @@ -4,19 +4,8 @@ - - + diff --git a/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue b/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue index c4b57a33..ea4faa36 100644 --- a/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue +++ b/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue @@ -1,46 +1,38 @@