样式修改

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 => {

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
     })

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;
   }
+  .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;*/
+  /*}*/

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>
         )

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>
         )
     }

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;

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>
                 }

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',

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>

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>