ylj/newCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ylj20011123 2025-12-19 15:28:16 +08:00
parent f2fa634ea4
commit 19e42b8ff5
4 changed files with 375 additions and 269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "ant-design-pro", "name": "ant-design-pro",
"version": "4.5.75", "version": "4.5.77",
"private": true, "private": true,
"description": "An out-of-box UI solution for enterprise applications", "description": "An out-of-box UI solution for enterprise applications",
"scripts": { "scripts": {

549
src/pages/reports/Finance/businessAnalysis/components/projectsScore.less
View File

@ -1,285 +1,318 @@
.projectsScoreContent{ .projectsScoreContent {
width: 100%;
height: 700px;
box-sizing: border-box;
padding: 24px;
border-radius: 6px;
border: 1px solid #E3E5EC;
background: linear-gradient(180deg, #EAF3FF 0%, #fff 10%);
overflow-y: scroll;
.serverPart {
display: flex;
//align-items: center;
justify-content: space-between;
width: 100%; width: 100%;
height: 700px; height: 115px;
box-sizing: border-box; border-bottom: 2px solid #EBEDF5;
padding: 24px; margin-bottom: 16px;
border-radius: 6px;
border: 1px solid #E3E5EC;
background: linear-gradient(180deg, #EAF3FF 0%, #fff 10%);
overflow-y: scroll;
.serverPartBox {
width: 80px;
height: 80px;
border-radius: 8px;
overflow: hidden;
position: relative;
margin-right: 12px;
.serverPart{ .serverPartBoxBg {
display: flex; width: 80px;
//align-items: center; height: 80px;
justify-content: space-between; position: absolute;
width: 100%; top: 0;
height: 115px; left: 0;
border-bottom: 2px solid #EBEDF5; z-index: 1;
margin-bottom: 16px;
.serverPartBox{
width: 80px;
height: 80px;
border-radius: 8px;
overflow: hidden;
position: relative;
margin-right: 12px;
.serverPartBoxBg{
width: 80px;
height: 80px;
position: absolute;
top: 0;left: 0;
z-index: 1;
}
.nameBox{
position: absolute;
z-index: 2;
top: 14px;left: 10px;
display: flex;
flex-direction: column;
.titleName{
font-family: PingFangSC, PingFang SC;
font-weight: 600;
font-size: 14px;
color: #2858CC;
line-height: 20px;
text-align: left;
font-style: normal;
}
.labelName{
font-family: PingFangSC, PingFang SC;
font-weight: 500;
font-size: 12px;
color: #2858CC;
line-height: 12px;
text-align: left;
font-style: normal;
}
}
.statusBox{
padding: 1px 4px;
box-sizing: border-box;
color: #fff;
font-size: 10px;
background: #2ABAC6;
border-radius: 0px 8px 0px 8px;
z-index: 2;
display: inline-block;
position: absolute;
top: 0;right: 0;
}
}
.serverPartDetail{
height: 80px;
display: flex;
flex-direction: column;
justify-content: space-between;
.serverPartDetailTop{
display: flex;
align-items: center;
flex-wrap: wrap;
.serverPartName{
font-family: PingFangSC, PingFang SC;
font-weight: 600;
font-size: 20px;
color: #333333;
line-height: 28px;
text-align: left;
font-style: normal;
}
.serverPartType{
margin-left: 8px;
background: linear-gradient( 134deg, #FFEED1 0%, #FFE1CD 100%);
border-radius: 2px;
box-sizing: border-box;
color: #FFA509;
padding: 0 10px;
}
}
.serverPartDetailBottom{
display: flex;
margin-top: 12px;
.businessBox{
margin-right: 8px;
background: #E7F0FF;
box-sizing: border-box;
padding: 2px 8px;
border-radius: 2px;
display: flex;
align-items: center;
.businessIcon{
width: 16px;
height: 16px;
margin-right: 4px;
}
.businessText{
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 14px;
color: #1E58BE;
line-height: 22px;
text-align: left;
font-style: normal;
margin-right: 4px;
white-space: nowrap;
}
.businessValue{
font-family: DINAlternate, DINAlternate;
font-weight: bold;
font-size: 18px;
color: #1E58BE;
line-height: 22px;
text-align: left;
font-style: normal;
}
}
}
.bigTitlte{
font-family: PingFangSC, PingFang SC;
font-weight: 600;
font-size: 20px;
color: #333333;
line-height: 28px;
text-align: left;
margin-bottom: 0!important;
}
}
.brandBox{
display: flex;
width: 250px;
flex-direction: column;
.brandIcon{
width: 80px;
height: 80px;
}
.brandName{
font-family: PingFangSC, PingFang SC;
font-weight: 600;
font-size: 14px;
color: #2858CC;
line-height: 20px;
text-align: left;
font-style: normal;
width: 170px;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
}
} }
.operateLeft{
.nameBox {
position: absolute;
z-index: 2;
top: 14px;
left: 10px;
display: flex; display: flex;
align-items: center; flex-direction: column;
margin-bottom: 6px;
.operateIcon{ .titleName {
width: 24px;
height: 24px;
margin-right: 6px;
}
.titleName{
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 600; font-weight: 600;
font-size: 14px; font-size: 14px;
color: #183362; color: #2858CC;
line-height: 24px; line-height: 20px;
text-align: left; text-align: left;
font-style: normal; font-style: normal;
}
.labelName {
font-family: PingFangSC, PingFang SC;
font-weight: 500;
font-size: 12px;
color: #2858CC;
line-height: 12px;
text-align: left;
font-style: normal;
} }
} }
.bigTitlte{
.statusBox {
padding: 1px 4px;
box-sizing: border-box;
color: #fff;
font-size: 10px;
background: #2ABAC6;
border-radius: 0px 8px 0px 8px;
z-index: 2;
display: inline-block;
position: absolute;
top: 0;
right: 0;
}
}
.serverPartDetail {
height: 80px;
display: flex;
flex-direction: column;
justify-content: space-between;
.serverPartDetailTop {
display: flex;
align-items: center;
flex-wrap: wrap;
.serverPartName {
font-family: PingFangSC, PingFang SC;
font-weight: 600;
font-size: 20px;
color: #333333;
line-height: 28px;
text-align: left;
font-style: normal;
}
.serverPartType {
margin-left: 8px;
background: linear-gradient(134deg, #FFEED1 0%, #FFE1CD 100%);
border-radius: 2px;
box-sizing: border-box;
color: #FFA509;
padding: 0 10px;
}
}
.serverPartDetailBottom {
display: flex;
margin-top: 12px;
.businessBox {
margin-right: 8px;
background: #E7F0FF;
box-sizing: border-box;
padding: 2px 8px;
border-radius: 2px;
display: flex;
align-items: center;
.businessIcon {
width: 16px;
height: 16px;
margin-right: 4px;
}
.businessText {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 14px;
color: #1E58BE;
line-height: 22px;
text-align: left;
font-style: normal;
margin-right: 4px;
white-space: nowrap;
}
.businessValue {
font-family: DINAlternate, DINAlternate;
font-weight: bold;
font-size: 18px;
color: #1E58BE;
line-height: 22px;
text-align: left;
font-style: normal;
}
}
}
.bigTitlte {
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
font-weight: 600; font-weight: 600;
font-size: 20px; font-size: 20px;
color: #333333; color: #333333;
line-height: 28px; line-height: 28px;
text-align: left; text-align: left;
margin-bottom: 8px; margin-bottom: 0 !important;
}
} }
.proposal{
text-indent: 2rem; .brandBox {
font-size: 14px!important; display: flex;
line-height: 28px!important; width: 250px;
flex-direction: column;
.brandIcon {
width: 80px;
height: 80px;
}
.brandName {
font-family: PingFangSC, PingFang SC; font-family: PingFangSC, PingFang SC;
.keynote{ font-weight: 600;
font-weight: 600; font-size: 14px;
color: #1890ff; color: #2858CC;
} line-height: 20px;
.proposalTitle{ text-align: left;
font-weight: 600; font-style: normal;
color: #FE7628; width: 170px;
} white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
}
}
.operateLeft {
display: flex;
align-items: center;
margin-bottom: 6px;
.operateIcon {
width: 24px;
height: 24px;
margin-right: 6px;
} }
.lineBox{ .titleName {
width: 100%; font-family: PingFangSC, PingFang SC;
height: 2px; font-weight: 600;
background: #EBEDF5; font-size: 14px;
margin: 8px 0; color: #183362;
line-height: 24px;
text-align: left;
font-style: normal;
}
}
.bigTitlte {
font-family: PingFangSC, PingFang SC;
font-weight: 600;
font-size: 20px;
color: #333333;
line-height: 28px;
text-align: left;
margin-bottom: 8px;
}
.proposal {
text-indent: 2rem;
font-size: 14px !important;
line-height: 28px !important;
font-family: PingFangSC, PingFang SC;
.keynote {
font-weight: 600;
color: #1890ff;
} }
.proposalTitle {
.paragraph{ font-weight: 600;
font-family: PingFangSC, PingFang SC; color: #FE7628;
font-size: 14px!important;
line-height: 28px!important;
.keynote{
font-weight: 600;
color: #1890ff;
font-family: PingFangSC, PingFang SC;
}
.beforeBluePoint{
position: relative;
}
.beforeBluePoint::before{
content:'';
width:8px;
height:8px;
border-radius: 50%;
background-color: #1890ff;
position: absolute;
top: 50%;
transform: translateY(-50%);
left: 1rem;
}
.titleName{
font-family: PingFangSC, PingFang SC;
font-weight: 600;
font-size: 14px;
color: #333333;
line-height: 20px;
text-align: left;
font-style: normal;
}
.numberValue{
font-family: PingFangSC, PingFang SC;
font-weight: bold;
font-size: 14px;
color: #243F6E;
line-height: 28px;
text-align: left;
font-style: normal;
}
.compare{
font-family: PingFangSC, PingFang SC;
font-weight: bold;
font-size: 14px;
color: #FE7628;
line-height: 28px;
text-align: left;
font-style: normal;
}
.unit{
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 14px;
color: #788395;
line-height: 22px;
text-align: left;
font-style: normal;
}
} }
}
.lineBox {
width: 100%;
height: 2px;
background: #EBEDF5;
margin: 8px 0;
}
.paragraph {
font-family: PingFangSC, PingFang SC;
font-size: 14px !important;
line-height: 28px !important;
.keynote {
font-weight: 600;
color: #1890ff;
font-family: PingFangSC, PingFang SC;
}
.beforeBluePoint {
position: relative;
}
.beforeBluePoint::before {
content: '';
width: 8px;
height: 8px;
border-radius: 50%;
background-color: #1890ff;
position: absolute;
top: 50%;
transform: translateY(-50%);
left: 1rem;
}
.titleName {
font-family: PingFangSC, PingFang SC;
font-weight: 600;
font-size: 14px;
color: #333333;
line-height: 20px;
text-align: left;
font-style: normal;
}
.numberValue {
font-family: PingFangSC, PingFang SC;
font-weight: bold;
font-size: 14px;
color: #243F6E;
line-height: 28px;
text-align: left;
font-style: normal;
}
.compare {
font-family: PingFangSC, PingFang SC;
font-weight: bold;
font-size: 14px;
color: #FE7628;
line-height: 28px;
text-align: left;
font-style: normal;
}
.unit {
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 14px;
color: #788395;
line-height: 22px;
text-align: left;
font-style: normal;
}
}
} }

81
src/pages/reports/contractWarningQuery/index.tsx
View File

@ -24,7 +24,7 @@ import session from "@/utils/session";
import PageTitleBox from "@/components/PageTitleBox"; import PageTitleBox from "@/components/PageTitleBox";
import { delCompact, getList, handleContractSupple } from "@/pages/contract/service"; import { delCompact, getList, handleContractSupple } from "@/pages/contract/service";
import { ContractListModel } from "@/pages/contract/data"; import { ContractListModel } from "@/pages/contract/data";
import { contractType } from "@/pages/contract/emun"; import { businessType, contractType } from "@/pages/contract/emun";
import ContractDetail from "@/pages/contract/components/detail"; import ContractDetail from "@/pages/contract/components/detail";
import ContractEdit from "@/pages/contract/components/editor"; import ContractEdit from "@/pages/contract/components/editor";
import ReactHTMLTableToExcel from "react-html-table-to-excel"; import ReactHTMLTableToExcel from "react-html-table-to-excel";
@ -156,6 +156,7 @@ const contractWarningQuery: React.FC<{ currentUser: CurrentUser }> = (props) =>
show: false, show: false,
} }
}); });
const SERVERPARTTYPEOBJ = session.get('ServerpartTypeObj')
const columns: ProColumns<ContractListModel>[] = [ const columns: ProColumns<ContractListModel>[] = [
@ -225,6 +226,42 @@ const contractWarningQuery: React.FC<{ currentUser: CurrentUser }> = (props) =>
align: 'right', align: 'right',
width: 130, width: 130,
}, },
{
title: '面积',
dataIndex: 'OPERATING_AREA',
hideInSearch: true,
align: 'right',
width: 130,
},
{
title: '服务区类型',
dataIndex: 'SERVERPART_TYPE',
hideInSearch: true,
valueType: 'select',
valueEnum: SERVERPARTTYPEOBJ,
align: 'center',
width: 130,
},
{
title: '经营业态',
dataIndex: 'BUSINESS_TRADE',
hideInSearch: true,
valueType: 'select',
valueEnum: businessType,
ellipsis: true,
align: 'center',
width: 130,
},
{
title: '保证金(万元)',
dataIndex: 'SECURITYDEPOSIT',
hideInSearch: true,
align: 'right',
valueType: "digit",
width: 130,
},
{ {
title: '物业费(年)', title: '物业费(年)',
dataIndex: '', dataIndex: '',
@ -391,7 +428,7 @@ const contractWarningQuery: React.FC<{ currentUser: CurrentUser }> = (props) =>
dataIndex: 'COMPACT_STARTDATE', dataIndex: 'COMPACT_STARTDATE',
valueType: 'date', valueType: 'date',
sorter: true, sorter: true,
width: 110 width: 130
}, },
{ {
title: '结束日期', title: '结束日期',
@ -399,7 +436,7 @@ const contractWarningQuery: React.FC<{ currentUser: CurrentUser }> = (props) =>
dataIndex: 'COMPACT_ENDDATE', dataIndex: 'COMPACT_ENDDATE',
valueType: 'date', valueType: 'date',
sorter: true, sorter: true,
width: 110 width: 130
}, },
{ {
title: '撤场时间', title: '撤场时间',
@ -407,7 +444,7 @@ const contractWarningQuery: React.FC<{ currentUser: CurrentUser }> = (props) =>
dataIndex: 'CLOSED_DATE', dataIndex: 'CLOSED_DATE',
valueType: 'date', valueType: 'date',
sorter: true, sorter: true,
width: 110 width: 130
}, },
{ {
title: '操作人', title: '操作人',
@ -643,6 +680,42 @@ const contractWarningQuery: React.FC<{ currentUser: CurrentUser }> = (props) =>
align: 'right', align: 'right',
width: 130, width: 130,
}, },
{
title: '面积',
dataIndex: 'OPERATING_AREA',
hideInSearch: true,
align: 'right',
width: 130,
},
{
title: '服务区类型',
dataIndex: 'SERVERPART_TYPE',
hideInSearch: true,
valueType: 'select',
valueEnum: SERVERPARTTYPEOBJ,
align: 'center',
width: 130,
},
{
title: '经营业态',
dataIndex: 'BUSINESS_TRADE',
hideInSearch: true,
valueType: 'select',
valueEnum: businessType,
align: 'center',
width: 180,
},
{
title: '保证金',
dataIndex: 'SECURITYDEPOSIT',
hideInSearch: true,
align: 'right',
valueType: "digit",
width: 130,
},
{ {
title: '物业费(年)', title: '物业费(年)',
dataIndex: 'PROPERTY_FEE', dataIndex: 'PROPERTY_FEE',

6
src/versionEnv.ts
View File

@ -1,4 +1,4 @@
// 由 scripts/writeVersion.js 自动生成 // 由 scripts/writeVersion.js 自动生成
export const VERSION = "4.5.75"; export const VERSION = "4.5.77";
export const GIT_HASH = "4b17ea4"; export const GIT_HASH = "f2fa634";
export const BUILD_TIME = "2025-12-05T03:57:31.975Z"; export const BUILD_TIME = "2025-12-11T08:48:46.590Z";