diff --git a/frontend/src/api/chart/chart.js b/frontend/src/api/chart/chart.js index c58409d9cc..be854d84bd 100644 --- a/frontend/src/api/chart/chart.js +++ b/frontend/src/api/chart/chart.js @@ -152,3 +152,30 @@ export const viewOptions = panelId => { method: 'post' }) } + + +export function getDatasourceRelationship(id) { + return request({ + url: `/api/relation/datasource/${id}`, + method: 'get', + loading: true + }) +} + + +export function getDatasetRelationship(id) { + return request({ + url: `/api/relation/dataset/${id}`, + method: 'get', + loading: true + }) +} + + +export function getPanelRelationship(id) { + return request({ + url: `/api/relation/panel/${id}`, + method: 'get', + loading: true + }) +} diff --git a/frontend/src/api/dataset/dataset.js b/frontend/src/api/dataset/dataset.js index a7ec14dc6a..a194700c45 100644 --- a/frontend/src/api/dataset/dataset.js +++ b/frontend/src/api/dataset/dataset.js @@ -86,6 +86,23 @@ export function listDatasource() { }) } +export function getDatasetList() { + return request({ + url: 'dataset/table/list', + loading: false, + method: 'post', + data: {} + }) +} + +export function getPanelGroupList() { + return request({ + url: '/panel/group/list', + loading: false, + method: 'get' + }) +} + export function listApiDatasource() { return request({ url: '/datasource/list/api', diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 601aabdfed..da3607f130 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -135,6 +135,7 @@ export default { default_login: 'Normal' }, commons: { + consanguinity: 'Consanguinity', collapse_navigation: 'Collapse navigation', operate_cancelled: 'Operation cancelled', bind: 'Bind', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 86904cd527..bdfe346dce 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -135,6 +135,7 @@ export default { default_login: '普通登錄' }, commons: { + consanguinity: '血緣關係', collapse_navigation: '收起導航', operate_cancelled: '已取消操作', bind: '綁定', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 9255752a76..66dd17496d 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -135,6 +135,7 @@ export default { default_login: '普通登录' }, commons: { + consanguinity: '血缘关系', collapse_navigation: '收起导航', operate_cancelled: '已取消操作', bind: '绑定', diff --git a/frontend/src/views/dataset/add/AddDB.vue b/frontend/src/views/dataset/add/AddDB.vue index f852311969..071fb3774d 100644 --- a/frontend/src/views/dataset/add/AddDB.vue +++ b/frontend/src/views/dataset/add/AddDB.vue @@ -554,7 +554,7 @@ export default { } &.active { - background-color: var(--deWhiteHover, #3370ff); + background-color: var(--deWhiteHover, #e0eaff); color: var(--primary, #3370ff); } diff --git a/frontend/src/views/system/relationship/consanguinity.vue b/frontend/src/views/system/relationship/consanguinity.vue new file mode 100644 index 0000000000..17a03e77ef --- /dev/null +++ b/frontend/src/views/system/relationship/consanguinity.vue @@ -0,0 +1,478 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/views/system/relationship/index.vue b/frontend/src/views/system/relationship/index.vue index 1cb6132949..e35ae371eb 100644 --- a/frontend/src/views/system/relationship/index.vue +++ b/frontend/src/views/system/relationship/index.vue @@ -1,24 +1,507 @@ - - this is blood relationship page for shutong - {{ text }} + + {{ $t('commons.consanguinity') }} + + + + + + + + + + + + + + + + {{ + $t('commons.adv_search.search') + }} + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file