Skip to content

T
TOSTUMI
Commit d62b9539 authored by maple's avatar maple
Browse files
Options

[new]暂停，express未上接口2

parent 68a0828d
Hide whitespace changes
Inline Side-by-side
Showing with 434 additions and 243 deletions
config/config.ts
View file @ d62b9539
...@@ -79,7 +79,10 @@ export default defineConfig({ ...@@ -79,7 +79,10 @@ export default defineConfig({
{ {
path: './LIFEUserManagement', path: './LIFEUserManagement',
name: 'lifeusers', name: 'lifeusers',
component:'./UserManagement/LIFEUserManagement/LIFEUserManagement' routes: [
{ path: './', component: './UserManagement/LIFEUserManagement/Users' },
{ path: './Add', component: './UserManagement/LIFEUserManagement/UsersAdd' },
]
}, },
{ {
path: './ServiceProviderManagement', path: './ServiceProviderManagement',
......
src/pages/UserManagement/LIFEUserManagement/LIFEUserManagement.tsx deleted 100644 → 0
View file @ 68a0828d
import React, { useState, useEffect } from 'react';
import styles from './index.less';
import { Input ,Menu,Table,Space,Pagination,Tooltip, Radio } from 'antd';
import { Link, useIntl, connect, Dispatch ,getLocale, setLocale} from 'umi';
const locales = ['zh-CN','en-US'];
const LIFEUserManagement = () => {
const languageSelect = (e) => {
setLocale(locales[e.target.value])
};
const [curLang, setCurLang] = useState(0);
useEffect(() => {
if (getLocale() == "en-US") {
setCurLang(1)
} else {
setCurLang(0)
}
}, [curLang]);
return (
<div className={styles.base}>
<div className={styles.box}>Language Selection</div>
<Radio.Group onChange={languageSelect} value={curLang} >
<div className={styles.box}><Radio value={0}>Chinese</Radio></div>
<div className={styles.box}><Radio value={1}>English</Radio></div>
</Radio.Group>
</div>
);
};
export default LIFEUserManagement;
src/pages/UserManagement/LIFEUserManagement/Users.tsx 0 → 100644
View file @ d62b9539
import React, { useState, useEffect } from 'react';
import styles from './index.less';
import { Input ,Menu,Table,Space} from 'antd';
import { Link, useIntl, connect, Dispatch, history } from 'umi';
import SelectOptions from '../../../components/SelectOptions/index';
const dataSource = [
{
key: '1',
name: '胡彦斌',
age: 32,
address: '西湖区湖底公园1号',
},
];
const Users = (props: { location: any; }) => {
const { formatMessage } = useIntl();
const { location } = props;
const nameofowner = formatMessage({ id: 'R.charge.input.nameofowner' })
const inputProject = formatMessage({ id: 'R.charge.input.project' })
const username = formatMessage({ id: 'R.charge.username' })
const project = formatMessage({ id: 'R.charge.project' })
const unit = formatMessage({ id: 'R.charge.unit' })
const status = formatMessage({ id: 'R.charge.status' })
const submissionTime = formatMessage({ id: 'R.charge.submissionTime' })
const actions = formatMessage({ id: 'R.charge.actions' })
const search = formatMessage({ id: 'R.charge.search' })
const addaccount = formatMessage({ id: 'R.charge.addaccount' })
const paymentsetting = formatMessage({ id: 'R.charge.paymentsetting' })
const menuListNormal = ["A",'Accounting company']
const [display, setDisplay] = useState("A");//小组件：线框
const pagination={defaultCurrent:1,total: 16}
const goToDetail = () => {
history.push(location.pathname+'/Detail?id=123')
}
const goToEdit = () => {
history.push(location.pathname+'/Edit')
}
const goToAdd = () => {
history.push(location.pathname+'/Add')
}
const columns = [
{
title: username,
dataIndex: 'name',
key: 'name',
},
{
title: project,
dataIndex: 'age',
key: 'age',
},
{
title: unit,
dataIndex: 'address',
key: 'address',
},
{
title: status,
dataIndex: 'address',
key: 'address',
},
{
title: submissionTime,
dataIndex: 'address',
key: 'address',
},
{
title: actions,
key: 'action',
render: (text: any, record: any) => (
<Space size="middle">
<a onClick={goToDetail}>Detail</a>
</Space>
),
},
];
const printContent = (comment: any)=>{
console.log(comment)
}
return (
<div className={styles.base}>
{/* 头部组件 */}
<div className={styles.box}>
<input className={styles.item1} placeholder={nameofowner} />
</div>
<SelectOptions list={["美国", "美丽的", "美好", "加拿大", "加油", "XO"].sort()} onSubmit={printContent} />
<button className={styles.item3}>{search}</button>
{/* 内容组件 */}
<div className={styles.box2}>
<button className={styles.buttonAdd2} onClick={goToAdd}>Create New Owner</button>
<button className={styles.buttonAdd} >Batch Upload</button>
</div>
{/* 列表组件 */}
<Table style={{ marginTop: 16 }} dataSource={dataSource} columns={columns} pagination={pagination} />
</div>
);
};
export default Users;
src/pages/UserManagement/LIFEUserManagement/UsersAdd.less 0 → 100644
View file @ d62b9539
@import '~antd/lib/style/themes/default.less';
//基石
.base {
width: 100%;
background-color: #ffffff;
padding: 34px;
min-width: 1020px;
}
//头部组件
.box{
width: 100%;
height: 64px;
position: relative;
}
.item1{
position: absolute;
width: 400px;
text-indent: 15px;
border-left: 5px solid rgba(24,144,255,1);
font-family:'Source Han Sans CN';
font-size: 18px;
font-weight: 600;
color: #000000;
}
.item3{
width:80px;
height: 32px;
position: absolute;
right: 0;
outline: none;
background:none;
cursor: pointer;
border:1px solid rgba(217,217,217,1);
border-radius:2px;
}
.box1{
width: 100%;
height: 34px;
line-height: 34px;
position: relative;
margin-bottom: 28px;
}
.box1item1{
position: absolute;
}
.box1item2{
position: absolute;
left: 146px;
}
.box2{
width: 100%;
height: 34px;
line-height: 34px;
position: relative;
margin-bottom: 28px;
}
.box2item1{
position: absolute;
}
.box2item2{
position: absolute;
left: 146px;
}
.box2item3{
position: absolute;
left: 362px;
}
.box2item4{
position: absolute;
left: 461px;
}
.box2item5{
position: absolute;
left: 475px;
}
.box2item6{
position: absolute;
left: 561px;
}
.box2item7{
position: absolute;
left: 583px;
}
.box3{
width: 100%;
height: 34px;
position: relative;
}
.box3item1{
padding-left: 146px;
}
\ No newline at end of file
src/pages/UserManagement/LIFEUserManagement/UsersAdd.tsx 0 → 100644
View file @ d62b9539
import React, { useState, useEffect } from 'react';
import styles from './UsersAdd.less';
import { Input ,Menu,Table,Space,Pagination,Tooltip, Button } from 'antd';
import { Link, useIntl, connect, Dispatch } from 'umi';
import Line from '../../../components/Line/Line';
const UsersAdd = () => {
const gotoReturn=() => {
history.back()
}
return (
<div className={styles.base}>
{/* 头部组件 */}
<div className={styles.box}>
<div className={styles.item1}>Create New Owner</div>
<button className={styles.item3} onClick={gotoReturn}>返回</button>
</div>
<div className={styles.box1}>
<div className={styles.box1item1}>Owner's Name</div>
<div className={styles.box1item2}><Input style={{width:200}} placeholder="Single Line Input" /></div>
</div>
<div className={styles.box2}>
<div className={styles.box2item1}>Contact Details</div>
<div className={styles.box2item2}><Input.Search style={{width:200}} placeholder="Project Name"/></div>
<div className={styles.box2item3}><Input style={{width:94}}/></div>
<div className={styles.box2item4}>#</div>
<div className={styles.box2item5}><Input style={{width:80}} /></div>
<div className={styles.box2item6}>——</div>
<div className={styles.box2item7}><Input style={{width:112}}/></div>
</div>
<div className={styles.box3}>
<div className={styles.box3item1}>
<Input style={{width:680}} placeholder="Display the address and postcode automatically according to the"/>
</div>
</div>
<Line />
<Button type="primary" size="large">Submit</Button>
</div>
);
};
export default UsersAdd;
src/pages/UserManagement/LIFEUserManagement/index.less
View file @ d62b9539
...@@ -5,8 +5,117 @@ ...@@ -5,8 +5,117 @@
width: 100%; width: 100%;
background-color: #ffffff; background-color: #ffffff;
padding: 34px; padding: 34px;
min-width: 1020px;
} }
//边栏1
//头部组件
.box{ .box{
margin-bottom: 28px; width: 100%;
} height: 34px;
\ No newline at end of file position: relative;
margin-bottom: 16px;
}
.input{
width:200px;
height:32px;
background:none;
outline: none;
border:1px solid rgba(217,217,217,1);
border-radius:2px;
font-size:14px;
font-weight:400;
line-height:30px;
text-indent: 19px;
}
.item1{
.input();
}
.item2{
.input();
margin-left: 20px;
}
.item3{
width:80px;
height:32px;
border:1px solid rgba(24,144,255,1);
border-radius:2px;
background-color:#e7f4ff;
outline: none;
font-size:14px;
font-weight:400;
color:rgba(24,144,255,1);
line-height:30px;
cursor: pointer;
margin-top: 16px;
}
.item3:active{
background-color:#ffffff;
}
//边栏2
.box2{
width: 100%;
height: 40px;
margin-top: 0px;
position: relative;
}
//小组件1
.buttonLine{
width:240px;
height:32px;
border:none;
background:none;
outline: none;
font-size:14px;
font-weight:400;
line-height:30px;
cursor: pointer;
}
.fontgz(){
font-size:16px;
font-family:'Source Han Sans CN;';
font-weight:800;
}
.buttonWait{
.buttonLine();
border-bottom:2px solid#dedede;
color:#454545;
.fontgz();
}
.buttonWait:hover{
border-bottom:3px solid rgba(24,144,255,1);
color:rgba(24,144,255,1);
.fontgz();
}
.buttonChoose{
.buttonLine();
border-bottom:3px solid rgba(24,144,255,1);
color:rgba(24,144,255,1);
.fontgz();
}
.buttonAdd{
background:none;
outline: none;
cursor: pointer;
width:170px;
height:32px;
border:1px solid rgba(24,144,255,1);
color:rgba(24,144,255,1);
border-radius:2px;
position: absolute;
right: 0;
}
.buttonAdd2{
.buttonAdd();
right: 180px;
}
src/pages/runTest/Template.tsx
View file @ d62b9539
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import styles from './index.less'; import styles from './index.less';
import { Input ,Menu,Table,Space,Pagination,Tooltip } from 'antd'; import { Input ,Menu,Table,Space,Pagination,Tooltip, Button } from 'antd';
import { Link, useIntl, connect, Dispatch } from 'umi'; import { Link, useIntl, connect, Dispatch } from 'umi';
import { DatePicker } from 'antd';
import { Upload, Button } from 'antd'; import Line from '../../components/Line/Line';
import { UploadOutlined } from '@ant-design/icons';
import LINE from '../../components/Line/Line'; const UsersDetail = () => {
import TextArea from 'antd/lib/input/TextArea';
const uploadProps = { const gotoReturn=() => {
// action: 'https://www.mocky.io/v2/5cc8019d300000980a055e76', history.back()
onChange({ file, fileList }) {
if (file.status !== 'uploading') {
console.log(file, fileList);
}
},
};
const ContractContent = (props: { location: any; }) => {
const { location } = props;
const [ editFlag, setEditFlag ] = useState(false);
useEffect(() => {
if ((location.pathname).indexOf("/ContractDetail")>-1) {
setEditFlag(true)
} else {
setEditFlag(false)
}
}, [location.pathname]);
const goToReturn = () => {
history.back()
} }
return ( return (
<div className={styles.base}> <div className={styles.base}>
{/* 头部组件 */} {/* 头部组件 */}
<div className={styles.box}> <div className={styles.box}>
<div className={styles.item1}>Edit Service Provider</div> <div className={styles.item1}>Owner Details</div>
<button className={styles.item3} onClick={goToReturn}>返回</button> <button className={styles.item3} onClick={gotoReturn}>返回</button>
</div> </div>
<div className={styles.box1}> <div className={styles.box1}>
<div className={styles.box1item1}>Contract Code</div> <div className={styles.box1item1}>Owner's Name</div>
<div className = { styles.box1item2 } > {editFlag?(<Input style={{width:200}} placeholder="ABC123456777" />):("ABC123456777")}</div> <div className={styles.box1item2}><Input style={{width:200}} placeholder="Single Line Input" /></div>
<div className={styles.box1item3}>Contract Party A</div> </div>
<div className={styles.box1item4}>{editFlag?(<Input style={{width:200}} placeholder="Corporate Name" />):("Pearl Co., Ltd")}</div>
<div className={styles.box1item5}>Contract Party B</div> <div className={styles.box2}>
<div className={styles.box1item6}>{editFlag?(<Input style={{width:200}} placeholder="Corporate Name" />):("Pearl Co., Ltd")}</div> <div className={styles.box2item1}>Contact Details</div>
<div className={styles.box2item2}><Input.Search style={{width:200}} placeholder="Project Name"/></div>
<div className={styles.box2item3}><Input style={{width:94}}/></div>
<div className={styles.box2item4}>#</div>
<div className={styles.box2item5}><Input style={{width:80}} /></div>
<div className={styles.box2item6}>——</div>
<div className={styles.box2item7}><Input style={{width:112}}/></div>
</div> </div>
<div className={styles.box5}> <div className={styles.box3}>
<div className={styles.box5item1}>Project</div> <div className={styles.box3item1}>
<div className={styles.box5item2}>{editFlag?(<Input style={{width:200}} placeholder="Project Name" />):("Zhongda community")}</div> <Input style={{width:680}} placeholder="Display the address and postcode automatically according to the"/>
</div>
<div className={styles.box4}>
<div className={styles.box4item1}>Contract Title</div>
<div className={styles.box4item2}>{editFlag?(<Input style={{width:200}} placeholder="XXXX Labor Contract" />):("Zhongda community")}</div>
</div>
<div className={styles.box6}>
<div className={styles.box6item1}>Effective Date</div>
<div className={styles.box6item2}>{editFlag ? (<DatePicker style={{width:140}}/>) : (<div className={styles.box6item2x1}>25-03-2020</div>)}</div>
<div className={styles.box6item3}>{editFlag ? (<DatePicker style={{width:140}}/>) : (<div className={styles.box6item2x1}>25-03-2021</div>)}</div>
</div>
{
editFlag ? (
<div className={styles.box7p}>
<div className={styles.box7item1}>Contract</div>
<div className={styles.box7item0}>
<Upload {...uploadProps}>
<Button>
<UploadOutlined /> Upload
</Button>
</Upload>
</div>
</div>
) : (
<div className={styles.box7}>
<div className={styles.box7item1}>Contract</div>
<div className={styles.box7item2}>2020 Contract.PDF</div>
<div className={styles.box7item3}><a>Preview</a></div>
</div>
)
}
<div className={styles.box8}>
<div className={styles.box8item1}>Reminder Content</div>
<div className={styles.box8item2}>
<div className={styles.box8item2x1}>
{
editFlag ? (<TextArea autoSize={false} style={{ padding: 8, width: 600, height: 194 }}></TextArea>) : (
<TextArea autoSize={false} style={{padding:8,width:600,height:194}} disabled value={"The contract will expire soon. Please prepare the contract plan"}></TextArea>
)
}
</div>
<div className={styles.box8item2x2}>The system will send out reminders of contract expiration on 25</div>
</div> </div>
</div> </div>
{
editFlag ? (<div> <Line />
<LINE/> <Button type="primary" size="large">Submit</Button>
<Button type="primary" size="large">Submit</Button>
</div>):(<div />)
}
</div> </div>
); );
}; };
export default ContractContent;
export default UsersDetail;
src/pages/runTest/index.less
View file @ d62b9539
...@@ -42,142 +42,58 @@ ...@@ -42,142 +42,58 @@
.box1{ .box1{
width: 100%; width: 100%;
height: 34px; height: 34px;
line-height: 34px;
position: relative; position: relative;
margin-bottom: 28px; margin-bottom: 28px;
line-height: 34px;
} }
.box1item1{ .box1item1{
position: absolute;
}
.box1item2{
position: absolute;
left: 164px;
}
.box1item3{
position: absolute;
left: 373px;
}
.box1item4{
position: absolute;
left: 530px;
}
.box1item5{
position: absolute; position: absolute;
left: 740px;
} }
.box1item6{ .box1item2{
position: absolute; position: absolute;
left: 890px; left: 146px;
} }
.box2{
.box4{
width: 100%; width: 100%;
height: 34px; height: 34px;
line-height: 34px;
position: relative; position: relative;
margin-bottom: 28px; margin-bottom: 28px;
} }
.box4item1{ .box2item1{
position: absolute; position: absolute;
} }
.box4item2{ .box2item2{
position: absolute; position: absolute;
left: 164px; left: 146px;
}
.box5{
width: 100%;
height: 34px;
position: relative;
margin-bottom: 28px;
} }
.box5item1{ .box2item3{
position: absolute; position: absolute;
left: 362px;
} }
.box5item2{ .box2item4{
position: absolute; position: absolute;
left: 164px; left: 461px;
}
.box6{
width: 100%;
height: 34px;
position: relative;
margin-bottom: 28px;
} }
.box6item1{ .box2item5{
position: absolute; position: absolute;
left: 475px;
} }
.box6item2{ .box2item6{
position: absolute; position: absolute;
left: 164px; left: 561px;
} }
.box2item7{
.box6item3{
position: absolute; position: absolute;
left: 330px; left: 583px;
}
.box6item2x1{
width:120px;
height:34px;
background:rgba(255,255,255,1);
border:1px solid rgba(217,217,217,1);
border-radius:2px;
text-align: center;
font-family:'Source Han Sans CN';
font-weight:400;
color:rgba(191,191,191,1);
line-height:34px;
} }
.box7{ .box3{
width: 100%;
height: 34px;
position: relative;
margin-bottom: 28px;
}
.box7p{
width: 100%;
position: relative;
margin-bottom: 28px;
}
.box7item0{
padding-left: 164px;
width: 400px;
}
.box7item1{
position: absolute;
width: 100%; width: 100%;
height: 34px; height: 34px;
}
.box7item2{
position: absolute;
left: 164px;
}
.box7item3{
position: absolute;
margin-left: 330px;
}
.box8{
width: 100%;
height:194px;
position: relative; position: relative;
margin-bottom: 56px;
} }
.box8item1{ .box3item1{
position: absolute; padding-left: 146px;
}
.box8item2{
position: absolute;
left: 164px;
}
.box8item2x2{
font-size:12px;
font-family:'Source Han Sans CN';
font-weight:400;
color:rgba(153,153,153,1);
line-height:30px;
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment