样式更改

This commit is contained in:
lyp 2025-03-14 17:01:30 +08:00
parent dfc13a8b88
commit 4339e89f37
7 changed files with 218 additions and 90 deletions

View File

@ -1,12 +1,13 @@
import './menu-with-top-button.css' import './menu-with-top-button.css'
import { IMenuListItem, IMenuWithTopButton } from "../../interfaces/menu/IMenuWithTopButton.ts"; import { IMenuListItem, IMenuWithTopButton } from "../../interfaces/menu/IMenuWithTopButton.ts";
import objImg from '../../static/left/obj.png' import objImg from '../../static/left/obj.png'
import newImg from '../../static/left/new.png' // import newImg from '../../static/create.png'
// import refunimg from '../../static/refun.png' // import refunimg from '../../static/refun.png'
// import correctionImg from '../../static/correction.png' // import correctionImg from '../../static/correction.png'
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
import { import {
RightOutlined RightOutlined,
PlusOutlined
} from '@ant-design/icons'; } from '@ant-design/icons';
import { getMenuActive, setMenuActive } from './../../util/cache' import { getMenuActive, setMenuActive } from './../../util/cache'
import { useEffect, useState } from 'react' import { useEffect, useState } from 'react'
@ -69,7 +70,7 @@ export default function MenuWithTopButton(props: IMenuWithTopButton) {
correctionType: props.correctionType, correctionType: props.correctionType,
applyStatus: props.correctionApplyStatus, applyStatus: props.correctionApplyStatus,
authorId: props.authorId, authorId: props.authorId,
tagCor:props.tagCor, tagCor: props.tagCor,
} }
}) })
} }
@ -137,9 +138,24 @@ export default function MenuWithTopButton(props: IMenuWithTopButton) {
}}> }}>
{/* refunimg */} {/* refunimg */}
{/* <div className='objimg'> */} {/* <div className='objimg'> */}
<img src={newImg} alt="" /> <div style={{
{/* </div> */} backgroundColor: '#FF9F08',
<div style={{ display: props.button.name == '项目' ? 'block' : 'none' }}></div> color: '#fff',
height: '36px',
width: '81px',
textAlign: 'center',
lineHeight: '36px',
borderRadius: '5px',
}}>
{/* <img src={newImg} alt="" /> */}
{/* </div> */}
<div style={{ display: props.button.name == '项目' ? 'block' : 'none', fontSize: 18 }}><PlusOutlined style={{
fontSize: 16,
marginRight: 5,
}}/></div>
</div>
{/* <div style={{ display: props.button.name == '退款' ? 'block' : 'none' }}>申请</div> */} {/* <div style={{ display: props.button.name == '退款' ? 'block' : 'none' }}>申请</div> */}
{/* <div style={{ display: props.button.name == '补正' ? 'block' : 'none' }}>申请</div> */} {/* <div style={{ display: props.button.name == '补正' ? 'block' : 'none' }}>申请</div> */}
</div> </div>

View File

@ -34,19 +34,19 @@
width: 19px; width: 19px;
height: 19px; height: 19px;
margin-left: 14px; margin-left: 14px;
margin-right: 13px; margin-right: 8px;
} }
.menu-with-top-button .top .top-right { .menu-with-top-button .top .top-right {
display: flex; display: flex;
align-items: center; align-items: center;
font-size: 14px; font-size: 18px;
cursor: pointer; cursor: pointer;
width: 53px; /* width: 53px; */
/* background-color: red; */ /* background-color: red; */
margin-left: 82px; /* margin-left: 82px; */
/* 修改 */ /* 修改 */
margin-left: 32px; margin-left: 25px;
} }
@ -56,9 +56,9 @@
} }
.menu-with-top-button .top .top-right img { .menu-with-top-button .top .top-right img {
/* margin-left: 96px; */ /* margin-left: 96px; */
margin-right: 10px; margin-right: 8px;
width: 14px; width: 19px;
height: 13px; height: 19px;
} }
.menu-with-top-button ul { .menu-with-top-button ul {
@ -137,25 +137,25 @@
width: 19px; width: 19px;
height: 19px; height: 19px;
margin-left: 14px; margin-left: 14px;
margin-right: 13px; margin-right: 8px;
} }
.menu-with-top-button .top .top-right { .menu-with-top-button .top .top-right {
display: flex; display: flex;
align-items: center; align-items: center;
font-size: 14px; font-size: 18px;
cursor: pointer; cursor: pointer;
width: 53px; /* width: 53px; */
/* background-color: red; */ /* background-color: red; */
margin-left: 82px; margin-left: 60px;
} }
.menu-with-top-button .top .top-right img { .menu-with-top-button .top .top-right img {
/* margin-left: 96px; */ /* margin-left: 96px; */
margin-right: 10px; margin-right: 8px;
width: 14px; width: 19px;
height: 13px; height: 19px;
} }
.menu-with-top-button ul { .menu-with-top-button ul {

View File

@ -11,6 +11,7 @@ import {
Dropdown, MenuProps, message, Modal, Space, Spin, Input, Table, Dropdown, MenuProps, message, Modal, Space, Spin, Input, Table,
// Form, Button, InputNumber // Form, Button, InputNumber
} from "antd"; } from "antd";
import pack from '../../static/pack.png'
// import type { TableProps, FormProps } from 'antd'; // import type { TableProps, FormProps } from 'antd';
interface DataType { interface DataType {
usericId: string; usericId: string;
@ -988,61 +989,6 @@ export default function Head() {
{/* <div className="right" style={{backgroundImage: `url(${headRightBg})`}}> */} {/* <div className="right" style={{backgroundImage: `url(${headRightBg})`}}> */}
<div className="right"> <div className="right">
<div style={{padding:'10px 20px',background:'rgba(255,228,181,0.2)',marginRight:20,display:'flex'}}>
<div style={{
fontSize: 16,
color: '#FF9F08',
fontWeight: 700,
cursor: 'pointer'
}}
onClick={() => {
setPackageModal(true)
setPackPage(1);
getPickList(1,'')
}}
> </div>
<div className='headLine' style={{background:"#FFEDCA"}}></div>
<div>
<span style={{
fontSize: 12,
color: '#FF9F08',
// fontWeight: 700,
}}></span>
<span style={{
fontSize: 16,
color: '#FF9F08',
fontWeight: 700,
marginLeft: 5,
marginRight: 5,
}}>{packNum.ALL}</span>
<span style={{
fontSize: 12,
color: '#FF9F08',
// fontWeight: 700,
}}></span>
</div>
<div style={{marginLeft:10}}>
<span style={{
fontSize: 12,
color: '#FF9F08',
// fontWeight: 700,
}}></span>
<span style={{
fontSize: 16,
color: '#FF9F08',
fontWeight: 700,
marginLeft: 5,
marginRight: 5,
}}>{packNum.MATERIAL}</span>
<span style={{
fontSize: 12,
color: '#FF9F08',
// fontWeight: 700,
}}></span>
</div>
</div>
<div className='kf' onClick={() => { <div className='kf' onClick={() => {
setkfModal(true) setkfModal(true)
}}> }}>
@ -1054,6 +1000,135 @@ export default function Head() {
</div> </div>
</div> </div>
<div className='headLine'></div>
{/* <div style={{ padding: '10px 20px', background: 'rgba(255,228,181,0.2)', display: 'flex' }}>
<div style={{
fontSize: 16,
color: '#FF9F08',
fontWeight: 700,
cursor: 'pointer'
}}
onClick={() => {
setPackageModal(true)
setPackPage(1);
getPickList(1, '')
}}
> </div>
<div className='headLine' style={{ background: "#FFEDCA" }}></div>
<div>
<span style={{
fontSize: 12,
color: '#FF9F08',
// fontWeight: 700,
}}></span>
<span style={{
fontSize: 16,
color: '#FF9F08',
fontWeight: 700,
marginLeft: 5,
marginRight: 5,
}}>{packNum.ALL}</span>
<span style={{
fontSize: 12,
color: '#FF9F08',
// fontWeight: 700,
}}></span>
</div>
<div style={{ marginLeft: 10 }}>
<span style={{
fontSize: 12,
color: '#FF9F08',
// fontWeight: 700,
}}></span>
<span style={{
fontSize: 16,
color: '#FF9F08',
fontWeight: 700,
marginLeft: 5,
marginRight: 5,
}}>{packNum.MATERIAL}</span>
<span style={{
fontSize: 12,
color: '#FF9F08',
// fontWeight: 700,
}}></span>
</div>
</div> */}
<div style={{
padding: '3px 20px',
// boxSizing: 'border-box',
background: 'rgba(222,222,222,0.3)',
marginTop: -3,
}}>
<div style={{
display: 'flex',
alignItems: 'center',
justifyContent:'center',
cursor: 'pointer',
}}
onClick={() => {
setPackageModal(true)
setPackPage(1);
getPickList(1, '')
}}
>
<img src={pack} width={19} height={19} alt="" />
<div style={{
fontSize:14,
marginLeft:5
}}></div>
</div>
<div style={{
display: 'flex',
alignItems: 'center',
marginTop:5
}}>
<div>
<span style={{
fontSize: 12,
color: '#FF9F08',
}}> </span>
<span
style={{
fontSize: 16,
color: '#FF9F08',
fontWeight: 700,
}}
>{packNum.ALL}</span>
<span style={{
fontSize: 12,
color: '#FF9F08',
}}> </span>
</div>
<div style={{
marginLeft:15
}}>
<span style={{
fontSize: 12,
color: '#FF9F08',
}}> </span>
<span
style={{
fontSize: 16,
color: '#FF9F08',
fontWeight: 700,
}}
>{packNum.MATERIAL}</span>
<span style={{
fontSize: 12,
color: '#FF9F08',
}}> </span>
</div>
</div>
</div>
<div className='headLine'></div> <div className='headLine'></div>
{/* <div className='head-nav' onClick={() => { {/* <div className='head-nav' onClick={() => {
window.open('https://www.aimzhu.com/operator/route/agreementportal/view?agreementId=c0c5683a-bef3-40c3-8395-900a362ea234&title=系统操作流程') window.open('https://www.aimzhu.com/operator/route/agreementportal/view?agreementId=c0c5683a-bef3-40c3-8395-900a362ea234&title=系统操作流程')

View File

@ -360,7 +360,7 @@
.headLine { .headLine {
height: 20px; height: 20px;
width: 1px; width: 1px;
background-color: rgb(218, 218, 218); /* background-color: rgb(218, 218, 218); */
margin-left: 10px; margin-left: 10px;
margin-right: 10px; margin-right: 10px;
} }

View File

@ -130,18 +130,46 @@ export default function ProjEditStep2(props: any) {
onChange: (selectedRowKeys: React.Key[], selectedRows: BelongDataType[]) => { onChange: (selectedRowKeys: React.Key[], selectedRows: BelongDataType[]) => {
// console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows); // console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
setSelectedRowKeys(selectedRowKeys); setSelectedRowKeys(selectedRowKeys);
if (selectedRows.length > 0) { // if (selectedRows.length > 0) {
setauthorName(selectedRows[0].name) // setauthorName(selectedRows[0].name)
setauthorIdCardType(selectedRows[0].idCardType) // setauthorIdCardType(selectedRows[0].idCardType)
setauthorIdCard(selectedRows[0].idCardNo) // setauthorIdCard(selectedRows[0].idCardNo)
setauthorType(selectedRows[0].type) // setauthorType(selectedRows[0].type)
setauthorNameEn(selectedRows[0].nameEn) // setauthorNameEn(selectedRows[0].nameEn)
setauthorProvinceCity(selectedRows[0].provinceCity) // setauthorProvinceCity(selectedRows[0].provinceCity)
setauthorCrcAccount(selectedRows[0].isCrcAccount) // setauthorCrcAccount(selectedRows[0].isCrcAccount)
setauthorCrcAccountPassword(selectedRows[0].crcAccountPassword) // setauthorCrcAccountPassword(selectedRows[0].crcAccountPassword)
setauthorCrcAccountUsername(selectedRows[0].crcAccountUsername) // setauthorCrcAccountUsername(selectedRows[0].crcAccountUsername)
setAuthorId(selectedRows[0].projOwnerId) // setAuthorId(selectedRows[0].projOwnerId)
} // }
// 判断是否是清空选中状态
const isClearingSelection = selectedRowKeys.length === 0;
if (isClearingSelection) {
setauthorName('');
setauthorIdCardType('');
setauthorIdCard('');
setauthorType('');
setauthorNameEn('');
setauthorProvinceCity('');
setauthorCrcAccount(0);
setauthorCrcAccountPassword('');
setauthorCrcAccountUsername('');
setAuthorId('');
} else {
// 正常选中时,更新相关状态
setSelectedRowKeys(selectedRowKeys);
const firstSelectedRow = selectedRows[0];
setauthorName(firstSelectedRow.name);
setauthorIdCardType(firstSelectedRow.idCardType);
setauthorIdCard(firstSelectedRow.idCardNo);
setauthorType(firstSelectedRow.type);
setauthorNameEn(firstSelectedRow.nameEn);
setauthorProvinceCity(firstSelectedRow.provinceCity);
setauthorCrcAccount(firstSelectedRow.isCrcAccount);
setauthorCrcAccountPassword(firstSelectedRow.crcAccountPassword);
setauthorCrcAccountUsername(firstSelectedRow.crcAccountUsername);
setAuthorId(firstSelectedRow.projOwnerId);
}
// setClom(String(selectedRowKeys)) // setClom(String(selectedRowKeys))
// setbelongselectedKeys(selectedRowKeys) // setbelongselectedKeys(selectedRowKeys)
@ -774,7 +802,16 @@ export default function ProjEditStep2(props: any) {
// 阻止默认的行点击事件,以避免选中行时触发其他操作 // 阻止默认的行点击事件,以避免选中行时触发其他操作
event.stopPropagation(); event.stopPropagation();
// 更新选中的行 // 更新选中的行
belongRowSelection.onChange([record.projOwnerId], [record]); // belongRowSelection.onChange([record.projOwnerId], [record]);
// 判断当前行是否已经被选中
const isSelected = belongRowSelection.selectedRowKeys.includes(record.projOwnerId);
if (isSelected) {
// 如果已经选中,则清空选中状态
belongRowSelection.onChange([], []);
} else {
// 如果未选中,则更新选中的行
belongRowSelection.onChange([record.projOwnerId], [record]);
}
} }
}, },
style: { cursor: 'pointer' } style: { cursor: 'pointer' }

BIN
src/static/create.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 404 B

BIN
src/static/pack.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB