diff --git a/src/components/Nav/index.tsx b/src/components/Nav/index.tsx index f7330b9..d9a3a67 100644 --- a/src/components/Nav/index.tsx +++ b/src/components/Nav/index.tsx @@ -1,21 +1,30 @@ import styles from './index.less'; import { Fragment, useEffect, FC } from 'react'; import Fetch from '@/utils/fetch'; -import { connect, ConnectProps, Dispatch, history, useLocation } from 'umi'; +import { + connect, + ConnectProps, + Dispatch, + history, + useLocation, + BasicInfoModelState, +} from 'umi'; import ReactEcharts from 'echarts-for-react'; interface PageProps { dispatch: Dispatch; + basic: BasicInfoModelState; } -const Nav: FC = ({ dispatch }) => { - useEffect(() => { - getData(); - }, []); +const Nav: FC = ({ dispatch, basic }) => { + const { + echartsData: { resourceData }, + } = basic; const location: any = useLocation(); const getData = async () => {}; + console.log(resourceData, 'resourceData'); const option1 = { grid: { left: '3%', @@ -26,7 +35,15 @@ const Nav: FC = ({ dispatch }) => { }, xAxis: { type: 'category', - data: ['15', '20', '64', '91', '128', 'ECC2', 'ECC3'], + data: resourceData?.xData || [ + '15', + '20', + '64', + '91', + '128', + 'ECC2', + 'ECC3', + ], axisLabel: { rotate: 45, }, @@ -39,7 +56,7 @@ const Nav: FC = ({ dispatch }) => { }, series: [ { - data: [15, 8, 20, 91, 20, 15, 128], + data: resourceData?.yData || [15, 8, 20, 91, 20, 15, 128], type: 'bar', }, ], @@ -186,4 +203,6 @@ const Nav: FC = ({ dispatch }) => { ); }; -export default connect(({}: {}) => ({}))(Nav); +export default connect(({ basic }: { basic: BasicInfoModelState }) => ({ + basic, +}))(Nav); diff --git a/src/models/basic/index.ts b/src/models/basic/index.ts index 584ccca..89bbc6f 100644 --- a/src/models/basic/index.ts +++ b/src/models/basic/index.ts @@ -46,6 +46,7 @@ export interface BasicInfoModelState { basicInfo: BasicInfo; certificateInfo: CertificateInfo; initData: any; + echartsData: any; } export interface BasicModelType { @@ -55,6 +56,7 @@ export interface BasicModelType { setActionData: Effect; setCertificateInfo: Effect; getSelectData: Effect; + setEchartsData: Effect; }; reducers: { save: Reducer; @@ -104,8 +106,18 @@ const BasicModel: BasicModelType = { result: [], }, initData: [], + echartsData: { + resourceData: {}, + }, }, effects: { + *setEchartsData({ payload }, { call, put, select }): any { + const echartsData = yield select((state: any) => state.basic.echartsData); + yield put({ + type: 'save', + payload: { echartsData: { ...echartsData, resourceData: payload } }, + }); + }, *getSelectData({ payload }, { call, put }): any { const response = yield call(getSelectData, payload); if (response?.result === 'success') { diff --git a/src/pages/Manager/BasicManager/List/Model/index.tsx b/src/pages/Manager/BasicManager/List/Model/index.tsx index f8f305b..aae0048 100644 --- a/src/pages/Manager/BasicManager/List/Model/index.tsx +++ b/src/pages/Manager/BasicManager/List/Model/index.tsx @@ -651,7 +651,7 @@ const Page: FC = () => { }, ]} > - + diff --git a/src/pages/Manager/PasswordManager/index.tsx b/src/pages/Manager/PasswordManager/index.tsx index 53607c9..4619fdb 100644 --- a/src/pages/Manager/PasswordManager/index.tsx +++ b/src/pages/Manager/PasswordManager/index.tsx @@ -13,15 +13,17 @@ import { } from 'antd'; import Fetch from '@/utils/fetch'; import { useEffect, useState, FC, useRef } from 'react'; -import { Link, BasicInfoModelState, connect } from 'umi'; +import { Link, BasicInfoModelState, connect, Dispatch } from 'umi'; import { downLoadLink } from '@/utils/download'; import url from '@/utils/url'; import ReactEcharts from 'echarts-for-react'; import { getInitData } from '@/utils/util'; -interface PageProps {} +interface PageProps { + dispatch: Dispatch; +} -const Page: FC = () => { +const Page: FC = ({ dispatch }) => { const algorithmList = getInitData('algorithmList'); const keyLengthList = getInitData('keyLengthList'); const keyNodeList = getInitData('keyNodeList'); @@ -44,6 +46,20 @@ const Page: FC = () => { }); if (res.result === 'success') { setData(res?.data?.[0]); + // const xData = res?.data?.[0]?.map((e: any) => { + // if (type !== '2') { + // return e.length; + // } + // return e.algorithm; + // }) + // const yData = res?.data?.[0]?.map((e: any) => e.count) + // dispatch({ + // type: 'basic/setEchartsData', + // payload: { + // xData, + // yData + // }, + // }); } };