From af2ec9c3b38a3217177a7cfbcd82210e7c359175 Mon Sep 17 00:00:00 2001 From: liuyiliang <yiliang.liu@51dayu.com.cn> Date: Mon, 24 Mar 2025 14:13:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/examination/public/faviconCopy.ico | Bin 4286 -> 0 bytes packages/examination/src/api/axios.js | 19 ++++-- packages/examination/src/api/login/index.tsx | 2 +- packages/examination/src/style/common.css | 54 ++++++++++++++++-- .../examination/src/views/header/index.tsx | 8 +-- .../examination/src/views/login/index.tsx | 41 ++++++------- .../examination/src/views/login/style.css | 2 +- .../examination/src/views/slider/index.js | 10 ++-- .../src/views/statistical/enterpriseFile.tsx | 4 +- .../src/views/statistical/list.tsx | 2 +- .../views/statistical/serviceStatistics.tsx | 2 +- 11 files changed, 93 insertions(+), 51 deletions(-) delete mode 100644 packages/examination/public/faviconCopy.ico diff --git a/packages/examination/public/faviconCopy.ico b/packages/examination/public/faviconCopy.ico deleted file mode 100644 index 5d2b5ec03fb659a9c7e5b911a5f06a5fd22bced4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4286 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 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<Props, States> { const menu = ( <Menu onClick={handleMenuClick}> - <Menu.Item key="modify"><NavLink to="/modify">修改密码</NavLink></Menu.Item> + {/*<Menu.Item key="modify"><NavLink to="/modify">修改密码</NavLink></Menu.Item>*/} <Menu.Item key="layout"><NavLink to="/login">退出登录</NavLink></Menu.Item> </Menu> ) @@ -50,11 +50,11 @@ class Header extends React.Component<Props, States> { <div className="collapse"></div> <div style={{ width: 150}}> - {/*<Dropdown overlay={menu}>*/} + <Dropdown overlay={menu}> <a className="user-name"> - <img src={require('../../assets/profilePicture.svg')} alt="" /><span style={{ marginLeft: 10, color: '#48609f' }}>{getLoginName()}</span> + <img src={require('../../assets/profilePicture.svg')} width={40} alt="" /><span style={{ marginLeft: 10, color: '#48609f' }}>{getLoginName()}</span> </a> - {/*</Dropdown>*/} + </Dropdown> </div> </div> ) 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<any, any> { return ( <div className="wrap"> - <div className="header"> - <span>某某某</span> - <span className="companyName">商户平台</span> - </div> <div className="login-box"> <div className="login-main"> <div className="login-tab"> - <h2 className="login-h">测试登录</h2> + <h2 className="login-h">临时登录</h2> <Form {...layout} name="basic" initialValues={{ remember: true }} onFinish={onFinish} > - <Form.Item - label="" - name="username" - rules={[{ required: true, message: 'userName不能为空' }]}> - <Input placeholder="请输入userName" prefix={<UserOutlined />} /> - </Form.Item> + {/*<Form.Item*/} + {/* label=""*/} + {/* name="userName"*/} + {/* rules={[{ required: true, message: 'userName不能为空' }]}>*/} + {/* <Input placeholder="请输入userName" prefix={<UserOutlined />} />*/} + {/*</Form.Item>*/} - <Form.Item - label="" - name="password" - rules={[{ required: true, message: '8000626885不能为空' }]}> - <Input.Password placeholder="请输入8000626885" autoComplete="new-password" prefix={<LockFilled />} /> - </Form.Item> + {/*<Form.Item*/} + {/* label=""*/} + {/* name="account"*/} + {/* rules={[{ required: true, message: 'account不能为空' }]}>*/} + {/* <Input.Password placeholder="请输入account" autoComplete="new-password" prefix={<LockFilled />} />*/} + {/*</Form.Item>*/} - { <Form.Item {...tailLayout} name="remember" valuePropName="checked"> - <Checkbox>记住</Checkbox> - </Form.Item> } + {/*{ <Form.Item {...tailLayout} name="remember" valuePropName="checked">*/} + {/*<Checkbox>记住</Checkbox>*/} + {/*</Form.Item> }*/} <Form.Item {...tailLayout}> <Button style={{ width: '100%' }} type="primary" htmlType="submit">登录</Button> </Form.Item> @@ -89,11 +85,6 @@ class Login extends React.Component<any, any> { </div> </div> </div> - - <div className="footer"> - Copyright © 1994-2022 xxxx有限公司 All Rights Reserved.<br /> - 备案号:*ICP备199xxxx号 联系方式:025-xxxxxx - </div> </div> ) } 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 ( <Menu.Item key={key}> <Link to={key}> - <FileTextOutlined /> + <span style={{margin: 10}}><FileOutlined /></span> <span>{title}</span> </Link> </Menu.Item> @@ -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 ( <SubMenu key={key} title={ <span> - {icon && <FolderOutlined />} + {isSubMenuOpen ? <span style={{margin: 10}}><FolderOpenOutlined /></span> : <span style={{margin: 10}}><FolderOutlined /></span>} <span>{title}</span> </span> } 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<CustomerRetentionProps> = ({ 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<Props, State>{ </Button> </Form.Item> <Form.Item> - <Button type="primary" htmlType="submit">搜索</Button> + <Button type="primary" htmlType="submit">查询</Button> </Form.Item> </Form> </div> 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 = () => { </Button> </Form.Item> <Form.Item> - <Button type="primary" htmlType="submit">搜索</Button> + <Button type="primary" htmlType="submit">查询</Button> </Form.Item> </Form> </div>