Skip to content

Developer v2 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
coder-sett merged 2 commits into from
Apr 22, 2025
Merged

Developer v2 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6aa876
feat:update antd version
coder-sett Apr 22, 2025
661253b
Resolved merge conflicts
coder-sett Apr 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions apps/web/src/modules/oh/DataView/Community/CommunityOverview/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const ContributeOverview = () => {
fontSize: '30px',
}}
// prefix={}
// suffix={<ArrowUpOutlined rev={undefined} />}
// suffix={<ArrowUpOutlined />}
/>
</Card>
</Col>
Expand All @@ -82,7 +82,7 @@ const ContributeOverview = () => {
fontSize: '30px',
}}
// prefix={}
// suffix={<ArrowUpOutlined rev={undefined} />}
// suffix={<ArrowUpOutlined />}
/>
</Card>
</Col>
Expand All @@ -100,7 +100,7 @@ const ContributeOverview = () => {
fontSize: '30px',
}}
// prefix={}
// suffix={<ArrowUpOutlined rev={undefined} />}
// suffix={<ArrowUpOutlined />}
/>
</Card>
</Col>
Expand All @@ -118,7 +118,7 @@ const ContributeOverview = () => {
fontSize: '30px',
}}
// prefix={}
// suffix={<ArrowUpOutlined rev={undefined} />}
// suffix={<ArrowUpOutlined />}
/>
</Card>
</Col>
Expand All @@ -136,7 +136,7 @@ const ContributeOverview = () => {
fontSize: '30px',
}}
// prefix={}
// suffix={<ArrowUpOutlined rev={undefined} />}
// suffix={<ArrowUpOutlined />}
/>
</Card>
</Col>
Expand All @@ -153,7 +153,7 @@ const ContributeOverview = () => {
fontSize: '30px',
}}
// prefix={}
// suffix={<ArrowUpOutlined rev={undefined} />}
// suffix={<ArrowUpOutlined />}
/>
</Card>
</Col>
Expand All @@ -175,7 +175,7 @@ const ContributeOverview = () => {
fontSize: '30px',
}}
// prefix={}
// suffix={<ArrowUpOutlined rev={undefined} />}
// suffix={<ArrowUpOutlined />}
/>
</Card>
</Col>
Expand All @@ -192,7 +192,7 @@ const ContributeOverview = () => {
fontSize: '30px',
}}
// prefix={}
// suffix={<ArrowUpOutlined rev={undefined} />}
// suffix={<ArrowUpOutlined />}
/>
</Card>
</Col>
Expand All @@ -212,7 +212,7 @@ const ContributeOverview = () => {
fontSize: '30px',
}}
// prefix={}
// suffix={<ArrowUpOutlined rev={undefined} />}
// suffix={<ArrowUpOutlined />}
/>
</Card>
</Col>
Expand All @@ -232,7 +232,7 @@ const ContributeOverview = () => {
fontSize: '30px',
}}
// prefix={}
// suffix={<ArrowUpOutlined rev={undefined} />}
// suffix={<ArrowUpOutlined />}
/>
</Card>
</Col>
Expand Down
178 changes: 0 additions & 178 deletions apps/web/src/modules/oh/DataView/Contribute/ContributeOverview/index copy.tsx
View file
Open in desktop

This file was deleted.

16 changes: 8 additions & 8 deletions apps/web/src/modules/oh/DataView/Contribute/ContributeOverview/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const ContributeOverview = () => {
value={40.69}
precision={2}
valueStyle={{ color: '#cf1322' }}
prefix={<ArrowUpOutlined rev={undefined} />}
prefix={<ArrowUpOutlined />}
suffix="%"
/>
</Card>
Expand All @@ -36,7 +36,7 @@ const ContributeOverview = () => {
value={46.39}
precision={2}
valueStyle={{ color: '#cf1322' }}
prefix={<ArrowUpOutlined rev={undefined} />}
prefix={<ArrowUpOutlined />}
suffix="%"
/>
</Card>
Expand All @@ -52,7 +52,7 @@ const ContributeOverview = () => {
value={18.23}
precision={2}
valueStyle={{ color: '#cf1322' }}
prefix={<ArrowUpOutlined rev={undefined} />}
prefix={<ArrowUpOutlined />}
suffix="%"
/>
</Card>
Expand All @@ -66,7 +66,7 @@ const ContributeOverview = () => {
value={63.28}
precision={2}
valueStyle={{ color: '#cf1322' }}
prefix={<ArrowUpOutlined rev={undefined} />}
prefix={<ArrowUpOutlined />}
suffix="%"
/>
</Card>
Expand All @@ -84,7 +84,7 @@ const ContributeOverview = () => {
value={90.69}
precision={2}
valueStyle={{ color: '#cf1322' }}
prefix={<ArrowUpOutlined rev={undefined} />}
prefix={<ArrowUpOutlined />}
suffix="%"
/>
</Card>
Expand All @@ -100,7 +100,7 @@ const ContributeOverview = () => {
value={10.51}
precision={2}
valueStyle={{ color: '#cf1322' }}
prefix={<ArrowUpOutlined rev={undefined} />}
prefix={<ArrowUpOutlined />}
suffix="%"
/>
</Card>
Expand All @@ -114,7 +114,7 @@ const ContributeOverview = () => {
value={18.23}
precision={2}
valueStyle={{ color: '#cf1322' }}
prefix={<ArrowUpOutlined rev={undefined} />}
prefix={<ArrowUpOutlined />}
suffix="%"
/>
</Card>
Expand All @@ -128,7 +128,7 @@ const ContributeOverview = () => {
value={53.28}
precision={2}
valueStyle={{ color: '#cf1322' }}
prefix={<ArrowUpOutlined rev={undefined} />}
prefix={<ArrowUpOutlined />}
suffix="%"
/>
</Card>
Expand Down
20 changes: 4 additions & 16 deletions ...web/src/modules/oh/DataView/HatchingTreatment/Graduate/EvaluationInfo/Badge/RiskBadge.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,7 @@ const RiskBadge = ({ shortCode, mertic }) => {
BadgeContent = createBadge(
'该项指标需要进行风险澄清！',
'red',
<ExclamationOutlined
rev={undefined}
className="rounded-full text-xs text-white"
/>
<ExclamationOutlined className="rounded-full text-xs text-white" />
);
} else {
BadgeContent = <TbMessage2 className="text-xl" />;
Expand All @@ -118,10 +115,7 @@ const RiskBadge = ({ shortCode, mertic }) => {
BadgeContent = createBadge(
content,
'#ff0000',
<CloseOutlined
rev={undefined}
className="rounded-full text-xs text-white"
/>
<CloseOutlined className="rounded-full text-xs text-white" />
);
} else {
if (dimension === '合法合规') {
Expand All @@ -132,10 +126,7 @@ const RiskBadge = ({ shortCode, mertic }) => {
BadgeContent = createBadge(
content,
'#52c41a',
<CheckOutlined
rev={undefined}
className="rounded-full text-xs text-white"
/>
<CheckOutlined className="rounded-full text-xs text-white" />
);
} else {
content +=
Expand All @@ -161,10 +152,7 @@ const RiskBadge = ({ shortCode, mertic }) => {
BadgeContent = createBadge(
content,
'#52c41a',
<CheckOutlined
rev={undefined}
className="rounded-full text-xs text-white"
/>
<CheckOutlined className="rounded-full text-xs text-white" />
);
} else {
content += getBadgeContent(
Expand Down
1 change: 0 additions & 1 deletion ...s/oh/DataView/HatchingTreatment/Graduate/EvaluationInfo/EvaluationBaseInfo/EditReport.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,6 @@ const EditReport = ({ report, editSuccess }) => {
{currentUser?.id === report.userId && (
<Popover content={'编辑基础信息'}>
<EditOutlined
rev={undefined}
onClick={() => {
// anction(record);
setOpenConfirm(true);
Expand Down
Loading