diff --git a/admin/public/edusoa.png b/admin/public/edusoa.png new file mode 100644 index 0000000..eac0d3a Binary files /dev/null and b/admin/public/edusoa.png differ diff --git a/admin/public/login_bg.png b/admin/public/login_bg.png new file mode 100644 index 0000000..d7d459f Binary files /dev/null and b/admin/public/login_bg.png differ diff --git a/admin/src/pages/examinationrules/normal/index.tsx b/admin/src/pages/examinationrules/normal/index.tsx index e582299..6978eeb 100644 --- a/admin/src/pages/examinationrules/normal/index.tsx +++ b/admin/src/pages/examinationrules/normal/index.tsx @@ -11,7 +11,7 @@ import type { ProDescriptionsItemProps } from '@ant-design/pro-descriptions'; import ProDescriptions from '@ant-design/pro-descriptions'; import type { FormValueType } from './components/UpdateForm'; import UpdateForm from './components/UpdateForm'; -import { queryTagList, saveExamination, removeExamination, queryExaminationList } from '../service'; +import { queryTagList, saveExamination, removeExamination, queryRulesList } from '../service'; import type { TableListItem, TableListPagination } from './data'; import type { DataItem } from '@antv/data-set/lib/transform/tag-cloud'; @@ -211,7 +211,7 @@ const ExaminationRules: React.FC = () => { headerTitle={false} actionRef={actionRef} - rowKey="examination_id" + rowKey="id" options={false} search={{ labelWidth: 120, @@ -228,7 +228,7 @@ const ExaminationRules: React.FC = () => { , ]} request={async (value) => { - const _data = await queryExaminationList( + const _data = await queryRulesList( { ...value, rules_type: 0, diff --git a/admin/src/pages/examinationrules/normal/step/index.tsx b/admin/src/pages/examinationrules/normal/step/index.tsx index 95b4396..518df60 100644 --- a/admin/src/pages/examinationrules/normal/step/index.tsx +++ b/admin/src/pages/examinationrules/normal/step/index.tsx @@ -35,12 +35,11 @@ export default () => { const params = useParams(); console.log(params, 'params'); if (params) { - const data = useRequest(async () => { - return await queryRulesView(params); + const {data} = useRequest(async () => { + const { bean } = await queryRulesView(params); + return {data:bean} }); - - console.log(data, 'data1`11'); - + console.log('data1`11', data); } return ( diff --git a/admin/src/pages/user/Login/index.less b/admin/src/pages/user/Login/index.less index 84c5fdd..af22052 100644 --- a/admin/src/pages/user/Login/index.less +++ b/admin/src/pages/user/Login/index.less @@ -5,7 +5,19 @@ flex-direction: column; height: 100vh; overflow: auto; - background: @layout-body-background; + background: url('../../../../public/login_bg.png'); + background-position: top left; + padding-left: 40%; + :global { + .ant-pro-form-login-header{ + height: 124px; + } + .ant-pro-form-login-logo{ + margin: 0; + width: 328px; + height: auto; + } + } } .lang { @@ -25,9 +37,9 @@ @media (min-width: @screen-md-min) { .container { - background-image: url('https://gw.alipayobjects.com/zos/rmsportal/TVYTbAXWheQpRcWDaDMu.svg'); + //background-image: url('https://gw.alipayobjects.com/zos/rmsportal/TVYTbAXWheQpRcWDaDMu.svg'); background-repeat: no-repeat; - background-position: center 110px; + background-position: left top; background-size: 100%; } diff --git a/admin/src/pages/user/Login/index.tsx b/admin/src/pages/user/Login/index.tsx index 5424b10..89b6f84 100644 --- a/admin/src/pages/user/Login/index.tsx +++ b/admin/src/pages/user/Login/index.tsx @@ -71,9 +71,9 @@ const Login: React.FC = () => {
} - title="生涯在线学习-资质考试" - subTitle="管理端 V1.0.0" + logo={logo} + //title={false} + subTitle={false} initialValues={{ autoLogin: true, }}