From 877e54c34828f9817f904946f4be03571c84d5b0 Mon Sep 17 00:00:00 2001 From: zhangminghua Date: Wed, 8 Mar 2023 15:11:15 +0800 Subject: [PATCH] =?UTF-8?q?(*)=E5=A2=9E=E5=8A=A0=E5=85=83=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=87=87=E9=9B=86=E3=80=81=E8=B5=84=E6=BA=90=E6=B6=88?= =?UTF-8?q?=E8=B4=B9=E3=80=81=E8=B5=84=E6=BA=90=E6=A3=80=E7=B4=A2=E6=A1=86?= =?UTF-8?q?=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/client/src/app.js | 11 ++++++- web/client/src/sections/homePage/nav-item.js | 6 ++-- .../metadataAcquisition/actions/example.js | 15 +++++++++ .../metadataAcquisition/actions/index.js | 7 ++++ .../containers/acquisitionLog.js | 7 ++++ .../containers/acquisitionTask.js | 7 ++++ .../metadataAcquisition/containers/adapter.js | 7 ++++ .../containers/dataSourceManagement.js | 7 ++++ .../metadataAcquisition/containers/index.js | 8 +++++ .../src/sections/metadataAcquisition/index.js | 15 +++++++++ .../sections/metadataAcquisition/nav-item.js | 24 ++++++++++++++ .../metadataAcquisition/reducers/index.js | 5 +++ .../sections/metadataAcquisition/routes.js | 32 +++++++++++++++++++ .../resourceConsumption/actions/example.js | 15 +++++++++ .../resourceConsumption/actions/index.js | 7 ++++ .../resourceConsumption/containers/approve.js | 7 ++++ .../resourceConsumption/containers/index.js | 6 ++++ .../containers/myApplication.js | 7 ++++ .../src/sections/resourceConsumption/index.js | 15 +++++++++ .../sections/resourceConsumption/nav-item.js | 18 +++++++++++ .../resourceConsumption/reducers/index.js | 5 +++ .../sections/resourceConsumption/routes.js | 22 +++++++++++++ .../resourceRetrieval/actions/example.js | 15 +++++++++ .../resourceRetrieval/actions/index.js | 7 ++++ .../resourceRetrieval/containers/index.js | 6 ++++ .../resourceRetrieval/containers/results.js | 7 ++++ .../resourceRetrieval/containers/retrieval.js | 7 ++++ .../src/sections/resourceRetrieval/index.js | 15 +++++++++ .../sections/resourceRetrieval/nav-item.js | 18 +++++++++++ .../resourceRetrieval/reducers/index.js | 5 +++ .../src/sections/resourceRetrieval/routes.js | 22 +++++++++++++ 31 files changed, 351 insertions(+), 4 deletions(-) create mode 100644 web/client/src/sections/metadataAcquisition/actions/example.js create mode 100644 web/client/src/sections/metadataAcquisition/actions/index.js create mode 100644 web/client/src/sections/metadataAcquisition/containers/acquisitionLog.js create mode 100644 web/client/src/sections/metadataAcquisition/containers/acquisitionTask.js create mode 100644 web/client/src/sections/metadataAcquisition/containers/adapter.js create mode 100644 web/client/src/sections/metadataAcquisition/containers/dataSourceManagement.js create mode 100644 web/client/src/sections/metadataAcquisition/containers/index.js create mode 100644 web/client/src/sections/metadataAcquisition/index.js create mode 100644 web/client/src/sections/metadataAcquisition/nav-item.js create mode 100644 web/client/src/sections/metadataAcquisition/reducers/index.js create mode 100644 web/client/src/sections/metadataAcquisition/routes.js create mode 100644 web/client/src/sections/resourceConsumption/actions/example.js create mode 100644 web/client/src/sections/resourceConsumption/actions/index.js create mode 100644 web/client/src/sections/resourceConsumption/containers/approve.js create mode 100644 web/client/src/sections/resourceConsumption/containers/index.js create mode 100644 web/client/src/sections/resourceConsumption/containers/myApplication.js create mode 100644 web/client/src/sections/resourceConsumption/index.js create mode 100644 web/client/src/sections/resourceConsumption/nav-item.js create mode 100644 web/client/src/sections/resourceConsumption/reducers/index.js create mode 100644 web/client/src/sections/resourceConsumption/routes.js create mode 100644 web/client/src/sections/resourceRetrieval/actions/example.js create mode 100644 web/client/src/sections/resourceRetrieval/actions/index.js create mode 100644 web/client/src/sections/resourceRetrieval/containers/index.js create mode 100644 web/client/src/sections/resourceRetrieval/containers/results.js create mode 100644 web/client/src/sections/resourceRetrieval/containers/retrieval.js create mode 100644 web/client/src/sections/resourceRetrieval/index.js create mode 100644 web/client/src/sections/resourceRetrieval/nav-item.js create mode 100644 web/client/src/sections/resourceRetrieval/reducers/index.js create mode 100644 web/client/src/sections/resourceRetrieval/routes.js diff --git a/web/client/src/app.js b/web/client/src/app.js index fd452f7..e615824 100644 --- a/web/client/src/app.js +++ b/web/client/src/app.js @@ -5,6 +5,9 @@ import Layout from './layout'; import Auth from './sections/auth'; import homePage from './sections/homePage'; import MetadataManagement from './sections/metadataManagement'; +import MetadataAcquisition from './sections/metadataAcquisition'; +import resourceConsumption from './sections/resourceConsumption'; +import resourceRetrieval from './sections/resourceRetrieval'; const App = props => { const { projectName } = props @@ -15,7 +18,13 @@ const App = props => { return ( ) diff --git a/web/client/src/sections/homePage/nav-item.js b/web/client/src/sections/homePage/nav-item.js index 5c9e502..e541a1e 100644 --- a/web/client/src/sections/homePage/nav-item.js +++ b/web/client/src/sections/homePage/nav-item.js @@ -1,10 +1,10 @@ import React from 'react'; import { Link } from 'react-router-dom'; import { Menu } from 'antd'; -import { BarChartOutlined } from '@ant-design/icons'; -export function getNavItem () { +import { HomeOutlined } from '@ant-design/icons'; +export function getNavItem() { return ( - }> + }> 首页 ); diff --git a/web/client/src/sections/metadataAcquisition/actions/example.js b/web/client/src/sections/metadataAcquisition/actions/example.js new file mode 100644 index 0000000..6b3c25d --- /dev/null +++ b/web/client/src/sections/metadataAcquisition/actions/example.js @@ -0,0 +1,15 @@ +'use strict'; + +import { basicAction } from '@peace/utils' +import { ApiTable } from '$utils' + +// export function getMembers(orgId) { +// return dispatch => basicAction({ +// type: 'get', +// dispatch: dispatch, +// actionType: 'GET_MEMBERS', +// url: `${ApiTable.getEnterprisesMembers.replace('{enterpriseId}', orgId)}`, +// msg: { error: '获取用户列表失败' }, +// reducer: { name: 'members' } +// }); +// } diff --git a/web/client/src/sections/metadataAcquisition/actions/index.js b/web/client/src/sections/metadataAcquisition/actions/index.js new file mode 100644 index 0000000..444af37 --- /dev/null +++ b/web/client/src/sections/metadataAcquisition/actions/index.js @@ -0,0 +1,7 @@ +'use strict'; + +import * as example from './example' + +export default { + ...example, +} \ No newline at end of file diff --git a/web/client/src/sections/metadataAcquisition/containers/acquisitionLog.js b/web/client/src/sections/metadataAcquisition/containers/acquisitionLog.js new file mode 100644 index 0000000..f792f7e --- /dev/null +++ b/web/client/src/sections/metadataAcquisition/containers/acquisitionLog.js @@ -0,0 +1,7 @@ +import React, { useEffect, useState } from 'react' + +function AcquisitionLog (props) { + return <>采集日志 +} + +export default AcquisitionLog \ No newline at end of file diff --git a/web/client/src/sections/metadataAcquisition/containers/acquisitionTask.js b/web/client/src/sections/metadataAcquisition/containers/acquisitionTask.js new file mode 100644 index 0000000..8fa053f --- /dev/null +++ b/web/client/src/sections/metadataAcquisition/containers/acquisitionTask.js @@ -0,0 +1,7 @@ +import React, { useEffect, useState } from 'react' + +function AcquisitionTask (props) { + return <>采集任务配置 +} + +export default AcquisitionTask \ No newline at end of file diff --git a/web/client/src/sections/metadataAcquisition/containers/adapter.js b/web/client/src/sections/metadataAcquisition/containers/adapter.js new file mode 100644 index 0000000..c6045bf --- /dev/null +++ b/web/client/src/sections/metadataAcquisition/containers/adapter.js @@ -0,0 +1,7 @@ +import React, { useEffect, useState } from 'react' + +function Adapter (props) { + return <>适配器管理 +} + +export default Adapter \ No newline at end of file diff --git a/web/client/src/sections/metadataAcquisition/containers/dataSourceManagement.js b/web/client/src/sections/metadataAcquisition/containers/dataSourceManagement.js new file mode 100644 index 0000000..e15bc52 --- /dev/null +++ b/web/client/src/sections/metadataAcquisition/containers/dataSourceManagement.js @@ -0,0 +1,7 @@ +import React, { useEffect, useState } from 'react' + +function MetadataDetails (props) { + return <>数据源管理 +} + +export default MetadataDetails \ No newline at end of file diff --git a/web/client/src/sections/metadataAcquisition/containers/index.js b/web/client/src/sections/metadataAcquisition/containers/index.js new file mode 100644 index 0000000..64c6eb2 --- /dev/null +++ b/web/client/src/sections/metadataAcquisition/containers/index.js @@ -0,0 +1,8 @@ +'use strict'; + +import Adapter from './adapter'; +import DataSourceManagement from './dataSourceManagement'; +import AcquisitionTask from './acquisitionTask'; +import AcquisitionLog from './acquisitionLog'; + +export { Adapter, DataSourceManagement, AcquisitionTask, AcquisitionLog }; diff --git a/web/client/src/sections/metadataAcquisition/index.js b/web/client/src/sections/metadataAcquisition/index.js new file mode 100644 index 0000000..ca12d50 --- /dev/null +++ b/web/client/src/sections/metadataAcquisition/index.js @@ -0,0 +1,15 @@ +'use strict'; + +import reducers from './reducers'; +import routes from './routes'; +import actions from './actions'; +import { getNavItem } from './nav-item'; + +export default { + key: 'metadataAcquisition', + name: '元数据采集', + reducers: reducers, + routes: routes, + actions: actions, + getNavItem: getNavItem +}; \ No newline at end of file diff --git a/web/client/src/sections/metadataAcquisition/nav-item.js b/web/client/src/sections/metadataAcquisition/nav-item.js new file mode 100644 index 0000000..3b6bb5b --- /dev/null +++ b/web/client/src/sections/metadataAcquisition/nav-item.js @@ -0,0 +1,24 @@ +import React from 'react'; +import { Link } from 'react-router-dom'; +import { Menu } from 'antd'; +import { BarChartOutlined } from '@ant-design/icons'; +const SubMenu = Menu.SubMenu; + +export function getNavItem() { + return ( + } title='元数据采集'> + + 适配器管理 + + + 数据源管理 + + + 采集任务配置 + + + 采集日志 + + + ); +} \ No newline at end of file diff --git a/web/client/src/sections/metadataAcquisition/reducers/index.js b/web/client/src/sections/metadataAcquisition/reducers/index.js new file mode 100644 index 0000000..7ed1088 --- /dev/null +++ b/web/client/src/sections/metadataAcquisition/reducers/index.js @@ -0,0 +1,5 @@ +'use strict'; + +export default { + +} \ No newline at end of file diff --git a/web/client/src/sections/metadataAcquisition/routes.js b/web/client/src/sections/metadataAcquisition/routes.js new file mode 100644 index 0000000..9b36a28 --- /dev/null +++ b/web/client/src/sections/metadataAcquisition/routes.js @@ -0,0 +1,32 @@ +'use strict'; +import { Adapter, DataSourceManagement, AcquisitionTask, AcquisitionLog } from './containers'; +export default [{ + type: 'inner', + route: { + path: '/metadataAcquisition', + key: 'metadataAcquisition', + breadcrumb: '元数据采集', + // 不设置 component 则面包屑禁止跳转 + childRoutes: [{ + path: '/adapter', + key: 'adapter', + component: Adapter, + breadcrumb: '适配器管理' + }, { + path: '/dataSourceManagement', + key: 'dataSourceManagement', + component: DataSourceManagement, + breadcrumb: '数据源管理' + }, { + path: '/acquisitionTask', + key: 'acquisitionTask', + component: AcquisitionTask, + breadcrumb: '采集任务配置' + }, { + path: '/acquisitionLog', + key: 'acquisitionLog', + component: AcquisitionLog, + breadcrumb: '采集日志' + }] + } +}]; \ No newline at end of file diff --git a/web/client/src/sections/resourceConsumption/actions/example.js b/web/client/src/sections/resourceConsumption/actions/example.js new file mode 100644 index 0000000..6b3c25d --- /dev/null +++ b/web/client/src/sections/resourceConsumption/actions/example.js @@ -0,0 +1,15 @@ +'use strict'; + +import { basicAction } from '@peace/utils' +import { ApiTable } from '$utils' + +// export function getMembers(orgId) { +// return dispatch => basicAction({ +// type: 'get', +// dispatch: dispatch, +// actionType: 'GET_MEMBERS', +// url: `${ApiTable.getEnterprisesMembers.replace('{enterpriseId}', orgId)}`, +// msg: { error: '获取用户列表失败' }, +// reducer: { name: 'members' } +// }); +// } diff --git a/web/client/src/sections/resourceConsumption/actions/index.js b/web/client/src/sections/resourceConsumption/actions/index.js new file mode 100644 index 0000000..444af37 --- /dev/null +++ b/web/client/src/sections/resourceConsumption/actions/index.js @@ -0,0 +1,7 @@ +'use strict'; + +import * as example from './example' + +export default { + ...example, +} \ No newline at end of file diff --git a/web/client/src/sections/resourceConsumption/containers/approve.js b/web/client/src/sections/resourceConsumption/containers/approve.js new file mode 100644 index 0000000..d4a16fd --- /dev/null +++ b/web/client/src/sections/resourceConsumption/containers/approve.js @@ -0,0 +1,7 @@ +import React, { useEffect, useState } from 'react' + +function Approve (props) { + return <>数据消费审批 +} + +export default Approve \ No newline at end of file diff --git a/web/client/src/sections/resourceConsumption/containers/index.js b/web/client/src/sections/resourceConsumption/containers/index.js new file mode 100644 index 0000000..aa8404c --- /dev/null +++ b/web/client/src/sections/resourceConsumption/containers/index.js @@ -0,0 +1,6 @@ +'use strict'; + +import Approve from './approve'; +import MyApplication from './myApplication'; + +export { Approve, MyApplication }; diff --git a/web/client/src/sections/resourceConsumption/containers/myApplication.js b/web/client/src/sections/resourceConsumption/containers/myApplication.js new file mode 100644 index 0000000..6e17d56 --- /dev/null +++ b/web/client/src/sections/resourceConsumption/containers/myApplication.js @@ -0,0 +1,7 @@ +import React, { useEffect, useState } from 'react' + +function MyApplication (props) { + return <>我的数据消费申请 +} + +export default MyApplication \ No newline at end of file diff --git a/web/client/src/sections/resourceConsumption/index.js b/web/client/src/sections/resourceConsumption/index.js new file mode 100644 index 0000000..38cf233 --- /dev/null +++ b/web/client/src/sections/resourceConsumption/index.js @@ -0,0 +1,15 @@ +'use strict'; + +import reducers from './reducers'; +import routes from './routes'; +import actions from './actions'; +import { getNavItem } from './nav-item'; + +export default { + key: 'resourceConsumption', + name: '资源消费', + reducers: reducers, + routes: routes, + actions: actions, + getNavItem: getNavItem +}; \ No newline at end of file diff --git a/web/client/src/sections/resourceConsumption/nav-item.js b/web/client/src/sections/resourceConsumption/nav-item.js new file mode 100644 index 0000000..0092f1f --- /dev/null +++ b/web/client/src/sections/resourceConsumption/nav-item.js @@ -0,0 +1,18 @@ +import React from 'react'; +import { Link } from 'react-router-dom'; +import { Menu } from 'antd'; +import { CarryOutOutlined } from '@ant-design/icons'; +const SubMenu = Menu.SubMenu; + +export function getNavItem() { + return ( + } title='资源消费'> + + 数据消费审批 + + + 我的数据消费申请 + + + ); +} \ No newline at end of file diff --git a/web/client/src/sections/resourceConsumption/reducers/index.js b/web/client/src/sections/resourceConsumption/reducers/index.js new file mode 100644 index 0000000..7ed1088 --- /dev/null +++ b/web/client/src/sections/resourceConsumption/reducers/index.js @@ -0,0 +1,5 @@ +'use strict'; + +export default { + +} \ No newline at end of file diff --git a/web/client/src/sections/resourceConsumption/routes.js b/web/client/src/sections/resourceConsumption/routes.js new file mode 100644 index 0000000..3710d2f --- /dev/null +++ b/web/client/src/sections/resourceConsumption/routes.js @@ -0,0 +1,22 @@ +'use strict'; +import { Approve, MyApplication } from './containers'; +export default [{ + type: 'inner', + route: { + path: '/resourceConsumption', + key: 'resourceConsumption', + breadcrumb: '资源消费', + // 不设置 component 则面包屑禁止跳转 + childRoutes: [{ + path: '/approve', + key: 'approve', + component: Approve, + breadcrumb: '数据消费审批' + }, { + path: '/myApplication', + key: 'myApplication', + component: MyApplication, + breadcrumb: '我的数据消费申请' + }] + } +}]; \ No newline at end of file diff --git a/web/client/src/sections/resourceRetrieval/actions/example.js b/web/client/src/sections/resourceRetrieval/actions/example.js new file mode 100644 index 0000000..6b3c25d --- /dev/null +++ b/web/client/src/sections/resourceRetrieval/actions/example.js @@ -0,0 +1,15 @@ +'use strict'; + +import { basicAction } from '@peace/utils' +import { ApiTable } from '$utils' + +// export function getMembers(orgId) { +// return dispatch => basicAction({ +// type: 'get', +// dispatch: dispatch, +// actionType: 'GET_MEMBERS', +// url: `${ApiTable.getEnterprisesMembers.replace('{enterpriseId}', orgId)}`, +// msg: { error: '获取用户列表失败' }, +// reducer: { name: 'members' } +// }); +// } diff --git a/web/client/src/sections/resourceRetrieval/actions/index.js b/web/client/src/sections/resourceRetrieval/actions/index.js new file mode 100644 index 0000000..444af37 --- /dev/null +++ b/web/client/src/sections/resourceRetrieval/actions/index.js @@ -0,0 +1,7 @@ +'use strict'; + +import * as example from './example' + +export default { + ...example, +} \ No newline at end of file diff --git a/web/client/src/sections/resourceRetrieval/containers/index.js b/web/client/src/sections/resourceRetrieval/containers/index.js new file mode 100644 index 0000000..b2344e6 --- /dev/null +++ b/web/client/src/sections/resourceRetrieval/containers/index.js @@ -0,0 +1,6 @@ +'use strict'; + +import Retrieval from './retrieval'; +import Results from './results'; + +export { Retrieval, Results }; diff --git a/web/client/src/sections/resourceRetrieval/containers/results.js b/web/client/src/sections/resourceRetrieval/containers/results.js new file mode 100644 index 0000000..24671af --- /dev/null +++ b/web/client/src/sections/resourceRetrieval/containers/results.js @@ -0,0 +1,7 @@ +import React, { useEffect, useState } from 'react' + +function Results (props) { + return <>检索结果 +} + +export default Results \ No newline at end of file diff --git a/web/client/src/sections/resourceRetrieval/containers/retrieval.js b/web/client/src/sections/resourceRetrieval/containers/retrieval.js new file mode 100644 index 0000000..fc69057 --- /dev/null +++ b/web/client/src/sections/resourceRetrieval/containers/retrieval.js @@ -0,0 +1,7 @@ +import React, { useEffect, useState } from 'react' + +function Retrieval (props) { + return <>数据资源检索 +} + +export default Retrieval \ No newline at end of file diff --git a/web/client/src/sections/resourceRetrieval/index.js b/web/client/src/sections/resourceRetrieval/index.js new file mode 100644 index 0000000..e26dddf --- /dev/null +++ b/web/client/src/sections/resourceRetrieval/index.js @@ -0,0 +1,15 @@ +'use strict'; + +import reducers from './reducers'; +import routes from './routes'; +import actions from './actions'; +import { getNavItem } from './nav-item'; + +export default { + key: 'resourceRetrieval', + name: '资源检索', + reducers: reducers, + routes: routes, + actions: actions, + getNavItem: getNavItem +}; \ No newline at end of file diff --git a/web/client/src/sections/resourceRetrieval/nav-item.js b/web/client/src/sections/resourceRetrieval/nav-item.js new file mode 100644 index 0000000..c761993 --- /dev/null +++ b/web/client/src/sections/resourceRetrieval/nav-item.js @@ -0,0 +1,18 @@ +import React from 'react'; +import { Link } from 'react-router-dom'; +import { Menu } from 'antd'; +import { FileSearchOutlined } from '@ant-design/icons'; +const SubMenu = Menu.SubMenu; + +export function getNavItem() { + return ( + } title='资源检索'> + + 数据资源检索 + + + 检索结果 + + + ); +} \ No newline at end of file diff --git a/web/client/src/sections/resourceRetrieval/reducers/index.js b/web/client/src/sections/resourceRetrieval/reducers/index.js new file mode 100644 index 0000000..7ed1088 --- /dev/null +++ b/web/client/src/sections/resourceRetrieval/reducers/index.js @@ -0,0 +1,5 @@ +'use strict'; + +export default { + +} \ No newline at end of file diff --git a/web/client/src/sections/resourceRetrieval/routes.js b/web/client/src/sections/resourceRetrieval/routes.js new file mode 100644 index 0000000..576baf2 --- /dev/null +++ b/web/client/src/sections/resourceRetrieval/routes.js @@ -0,0 +1,22 @@ +'use strict'; +import { Retrieval, Results } from './containers'; +export default [{ + type: 'inner', + route: { + path: '/resourceRetrieval', + key: 'resourceRetrieval', + breadcrumb: '资源消费', + // 不设置 component 则面包屑禁止跳转 + childRoutes: [{ + path: '/retrieval', + key: 'retrieval', + component: Retrieval, + breadcrumb: '数据资源检索' + }, { + path: '/results', + key: 'results', + component: Results, + breadcrumb: '检索结果' + }] + } +}]; \ No newline at end of file