diff --git a/packages/examination/public/faviconCopy.ico b/packages/examination/public/faviconCopy.ico deleted file mode 100644 index 5d2b5ec..0000000 Binary files a/packages/examination/public/faviconCopy.ico and /dev/null differ diff --git a/packages/examination/src/api/axios.js b/packages/examination/src/api/axios.js index eab0b30..5723905 100644 --- a/packages/examination/src/api/axios.js +++ b/packages/examination/src/api/axios.js @@ -14,16 +14,23 @@ import { const router = new HashRouter() const instance = axios.create({ baseURL: process.env.NODE_ENV === 'development' ? 'http://localhost:3000' : '/api', - timeout: 3000 + headers: { + 'Content-Type': 'application/json', + withCredentials: true, + 'token': localStorage.getItem('token') + }, + withCredentials: true, + timeout: 100000 }) export const serverUrl = 'http://localhost:8187/'; +localStorage.setItem('si', JSON.stringify({ eName: 'admin' })); -const token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJjY2ljLXVzZXIiLCJpYXQiOjE3NDI1NDI4MTIsImV4cCI6MTc0MjYyOTIxMiwiaWQiOiI0MjY1NjA4NTc2MDI4MjYyNCIsInVzZXJOYW1lIjoi5rWL6K-VNjI2ODg1Iiwib3JnYW5JZCI6MzEwMTAwMDAsIm9yZ2FuTmFtZSI6IuS4iua1t-WIhuWFrOWPuCIsIm9yZ2FuQ29kZSI6IjMxMDEwMDAwIiwidXNlck5vIjoiODAwMDYyNjg4NSIsIm9yZ2FuVHlwZSI6IjMiLCJncmlkQ29kZSI6IjMxMDAwMCJ9.C8a04P9zSCaN388EMmCqlhcTen2H6GV4TmNQaA1qDac' -if (token) { - setToken(token); - localStorage.setItem('si', JSON.stringify({ eName: 'admin' })); -} +// const token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJjY2ljLXVzZXIiLCJpYXQiOjE3NDI1NDI4MTIsImV4cCI6MTc0MjYyOTIxMiwiaWQiOiI0MjY1NjA4NTc2MDI4MjYyNCIsInVzZXJOYW1lIjoi5rWL6K-VNjI2ODg1Iiwib3JnYW5JZCI6MzEwMTAwMDAsIm9yZ2FuTmFtZSI6IuS4iua1t-WIhuWFrOWPuCIsIm9yZ2FuQ29kZSI6IjMxMDEwMDAwIiwidXNlck5vIjoiODAwMDYyNjg4NSIsIm9yZ2FuVHlwZSI6IjMiLCJncmlkQ29kZSI6IjMxMDAwMCJ9.C8a04P9zSCaN388EMmCqlhcTen2H6GV4TmNQaA1qDac' +// if (token) { +// setToken(token); +// localStorage.setItem('si', JSON.stringify({ eName: 'admin' })); +// } instance.interceptors.request.use( config => { diff --git a/packages/examination/src/api/login/index.tsx b/packages/examination/src/api/login/index.tsx index b2f62bb..63ff4c0 100644 --- a/packages/examination/src/api/login/index.tsx +++ b/packages/examination/src/api/login/index.tsx @@ -2,7 +2,7 @@ import axios from '../axios' export function loginName(obj: any) { return axios({ - url: "/testLogin", + url: "/ex/demo/testLogin", method: "post", data: obj }) diff --git a/packages/examination/src/style/common.css b/packages/examination/src/style/common.css index 6273901..6cfc692 100644 --- a/packages/examination/src/style/common.css +++ b/packages/examination/src/style/common.css @@ -93,7 +93,7 @@ body { } .left{ - left: 200px; + left: 250px; -webkit-transition: left .1s ease-in-out; transition: left .1s ease-in-out; } @@ -157,9 +157,9 @@ body { } .logo { float: left; - width: 180px; + width: 100%; line-height: 70px; - height: 70px; + height: 77px; position: relative; text-align: center; font-weight: 600; @@ -167,7 +167,7 @@ body { .logo p{ color: rgba(16, 16, 16, 1); - font-size: 20px; + font-size: 24px; text-align: center; font-family: PingFangSC-regular; font-weight: 400; @@ -252,9 +252,51 @@ table.ikd-input-table { .ant-table-thead .ant-table-cell-scrollbar { border-left: 1px solid #000000 !important; } - .container .ant-table-body { + .ant-table-body { border-bottom: 1px solid #000000; + border-right: 1px solid #000000; } .ant-table-content { border-bottom: 1px solid #000000; - } \ No newline at end of file + } + .ant-table-thead > tr:last-child > th:last-child { + border-right: 1px solid #000000 !important; + } + .ant-table-tbody > tr > td:last-child { + border-right: 1px solid #000000 !important; + } + .ant-btn-default { + border: 1px solid #7f9ab3; + color: #7f9ab3; + } + .ant-layout-sider-children { + box-shadow: 1px -9px 10px rgb(0 0 0 / 26%); + z-index: 999; + /*position: relative;*/ + position: fixed; + width: 250px; + } + .header { + box-shadow: 0px 1px 10px 0px rgb(0 0 0 / 26%); + z-index: 998; + } + .ant-menu:not(.ant-menu-horizontal) .ant-menu-item-selected { + background-color: #ddf4ff; + } + .ant-layout-sider-light { + min-width: 249px !important; + } + .ant-menu-submenu-expand-icon, .ant-menu-submenu-arrow { + right: auto; + margin-left: 7px; + } + .ant-menu-inline.ant-menu-root .ant-menu-item > .ant-menu-title-content, .ant-menu-inline.ant-menu-root .ant-menu-submenu-title > .ant-menu-title-content { + margin-left: 20px; + } + main { + background-color: white; + } + /*.header {*/ + /* position: fixed !important;*/ + /* width: 100% !important;*/ + /*}*/ \ No newline at end of file diff --git a/packages/examination/src/views/header/index.tsx b/packages/examination/src/views/header/index.tsx index 4f3d0e0..2a98131 100644 --- a/packages/examination/src/views/header/index.tsx +++ b/packages/examination/src/views/header/index.tsx @@ -40,7 +40,7 @@ class Header extends React.Component { const menu = ( - 修改密码 + {/*修改密码*/} 退出登录 ) @@ -50,11 +50,11 @@ class Header extends React.Component {
- {/**/} + - {getLoginName()} + {getLoginName()} - {/**/} +
) diff --git a/packages/examination/src/views/login/index.tsx b/packages/examination/src/views/login/index.tsx index 7b8d388..db182ac 100644 --- a/packages/examination/src/views/login/index.tsx +++ b/packages/examination/src/views/login/index.tsx @@ -49,39 +49,35 @@ class Login extends React.Component { return (
-
- 某某某 - 商户平台 -
-

测试登录

+

临时登录

- - } /> - + {/**/} + {/* } />*/} + {/**/} - - } /> - + {/**/} + {/* } />*/} + {/**/} - { - 记住 - } + {/*{ */} + {/*记住*/} + {/* }*/} @@ -89,11 +85,6 @@ class Login extends React.Component {
- -
- Copyright © 1994-2022 xxxx有限公司 All Rights Reserved.
- 备案号：*ICP备199xxxx号 联系方式：025-xxxxxx -
) } diff --git a/packages/examination/src/views/login/style.css b/packages/examination/src/views/login/style.css index dfef9f0..bcec95d 100644 --- a/packages/examination/src/views/login/style.css +++ b/packages/examination/src/views/login/style.css @@ -38,7 +38,7 @@ .wrap .login-box { height: 610px; font-size: 12px; - background: #e4e4e4 url("../../assets/login_bg.png") center top no-repeat; + /*background: #e4e4e4 url("../../assets/login_bg.png") center top no-repeat;*/ width: 100%; position: relative; clear: both; diff --git a/packages/examination/src/views/slider/index.js b/packages/examination/src/views/slider/index.js index 19445bd..f4ab3f8 100644 --- a/packages/examination/src/views/slider/index.js +++ b/packages/examination/src/views/slider/index.js @@ -2,7 +2,7 @@ import React from 'react' import { Menu } from 'antd'; import { Link, withRouter } from 'react-router-dom' import menuList from './menu' -import { FolderOutlined, FileTextOutlined } from '@ant-design/icons'; +import { FolderOutlined, FileOutlined, FolderOpenOutlined, DownOutlined, UpOutlined } from '@ant-design/icons'; const { SubMenu } = Menu; @@ -48,7 +48,7 @@ class Slider extends React.Component { return ( - + {title} @@ -56,13 +56,15 @@ class Slider extends React.Component { } // 二级菜单 - renderSubMenu = ({ key, icon, title, subs }) => { + renderSubMenu = ({ key, title, subs }) => { + const { openKeys } = this.state; + const isSubMenuOpen = openKeys.includes(key); return ( - {icon && } + {isSubMenuOpen ? : } {title} } diff --git a/packages/examination/src/views/statistical/enterpriseFile.tsx b/packages/examination/src/views/statistical/enterpriseFile.tsx index 78c52a5..a559b2a 100644 --- a/packages/examination/src/views/statistical/enterpriseFile.tsx +++ b/packages/examination/src/views/statistical/enterpriseFile.tsx @@ -66,8 +66,8 @@ const EnterpriseFile: React.FC = ({ customer }) => { content: '数据加载中..', duration: 0, }); - getEnterpriseArchives({ customerId: '90020242601'}).then(res => { - // getEnterpriseArchives({ customerId: customer.customerId}).then(res => { + // getEnterpriseArchives({ customerId: '90020242601'}).then(res => { + getEnterpriseArchives({ customerId: customer.customerId}).then(res => { var baseData = [ { key: 'customerNo', diff --git a/packages/examination/src/views/statistical/list.tsx b/packages/examination/src/views/statistical/list.tsx index c85940d..76f7363 100644 --- a/packages/examination/src/views/statistical/list.tsx +++ b/packages/examination/src/views/statistical/list.tsx @@ -210,7 +210,7 @@ class Customer extends React.Component{ - + diff --git a/packages/examination/src/views/statistical/serviceStatistics.tsx b/packages/examination/src/views/statistical/serviceStatistics.tsx index c34013d..b30d394 100644 --- a/packages/examination/src/views/statistical/serviceStatistics.tsx +++ b/packages/examination/src/views/statistical/serviceStatistics.tsx @@ -212,7 +212,7 @@ const App: React.FC = () => { - +