diff --git a/src/pages/asset/asset_list/index.tsx b/src/pages/asset/asset_list/index.tsx index 9dc6c3a..9a23bae 100644 --- a/src/pages/asset/asset_list/index.tsx +++ b/src/pages/asset/asset_list/index.tsx @@ -91,7 +91,7 @@ export default function Index({ title = '项目信息' }) { // tooltip="【项目列表】的【配置】功能,受角色权限控制" toolBarRender={(action) => [toolBarRender(action)]} columns={[ - // MyColumns.ID(), + MyColumns.ID(), // 组织树选择器 Selects?.OrganizationSearch({ title: '所属组织', diff --git a/src/pages/bills/summary/index.tsx b/src/pages/bills/summary/index.tsx index 9622160..705a9ec 100644 --- a/src/pages/bills/summary/index.tsx +++ b/src/pages/bills/summary/index.tsx @@ -29,7 +29,7 @@ export default function Index({ title = '房屋账单' }) { }, { key: '2', - label: `清欠房屋数(${res?.['清欠房屋数']})`, + label: `结清房屋数(${res?.['清欠房屋数']})`, }, { key: '3', diff --git a/src/pages/index/components/style_left.scss b/src/pages/index/components/style_left.scss index 795e21d..18dae96 100644 --- a/src/pages/index/components/style_left.scss +++ b/src/pages/index/components/style_left.scss @@ -8,12 +8,12 @@ background: linear-gradient(135deg, #6499ff 0%, #95b8ff 100%); padding: 25px 0; border-radius: 12px; - box-shadow: 0 10px 25px -5px rgba(42, 126, 251, 0.3); + // box-shadow: 0 10px 25px -5px rgba(42, 126, 251, 0.3); transition: all 0.3s ease; &:hover { transform: translateY(-2px); - box-shadow: 0 15px 30px -5px rgba(42, 126, 251, 0.4); + // box-shadow: 0 15px 30px -5px rgba(42, 126, 251, 0.4); } // animation: fadeInUp 0.6s ease-out forwards; @@ -149,13 +149,13 @@ text-align: center; color: #3d3d3d; font-size: 16px; - box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08); + // box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08); transition: all 0.3s ease; border: 1px solid #f0f0f0; &:hover { transform: translateY(-3px); - box-shadow: 0 8px 20px rgba(0, 0, 0, 0.12); + // box-shadow: 0 8px 20px rgba(0, 0, 0, 0.12); border-color: #e0e7ff; } @@ -191,7 +191,7 @@ } .real_time_dynamics { - color: #333; + color: #666; width: 100%; font-size: 16px; padding: 0 0 15px 0; diff --git a/src/pages/meter/common_meter/index.tsx b/src/pages/meter/common_meter/index.tsx index a06b02f..b73ccc5 100644 --- a/src/pages/meter/common_meter/index.tsx +++ b/src/pages/meter/common_meter/index.tsx @@ -30,7 +30,14 @@ export default function CommonMeter({ title = '公摊表' }) { const getCurrentPermissions = useCurrentPermissions(); let toolBarRender = (action: any) => { return getCurrentPermissions({ - create: , + create: ( + + ), exportmeter: ( { props.reload?.(); @@ -60,13 +58,13 @@ export default function Create(props: MyBetaModalFormProps) { }), ]), - MyFormItems.EnumRadio({ - key: 'meter_type', - title: '仪表类型', - colProps: { span: 24 }, - valueEnum: HouseMetersMeterTypeEnum, - required: true, - }), + // MyFormItems.EnumRadio({ + // key: 'meter_type', + // title: '仪表类型', + // colProps: { span: 24 }, + // valueEnum: HouseMetersMeterTypeEnum, + // required: true, + // }), MyFormItems.EnumRadio({ key: 'usage_type', title: '使用类型', diff --git a/src/pages/meter/house_meter/index.tsx b/src/pages/meter/house_meter/index.tsx index c49c30b..242ee41 100644 --- a/src/pages/meter/house_meter/index.tsx +++ b/src/pages/meter/house_meter/index.tsx @@ -30,7 +30,14 @@ export default function HouseMeter({ title = '房屋表' }) { const getCurrentPermissions = useCurrentPermissions(); let toolBarRender = (action: any) => { return getCurrentPermissions({ - create: , + create: ( + + ), exportmeter: ( { if (open) { form.resetFields(); // 清空表单数据 + // form.setFieldsValue(props?.item); } }} onFinish={async (values) => @@ -40,6 +38,7 @@ export default function Create(props: MyBetaModalFormProps) { ...values, latest_value: values.initial_value, latest_time: values.initial_time, + meter_type: props?.item?.meter_type, }) .then(() => { props.reload?.(); @@ -60,13 +59,13 @@ export default function Create(props: MyBetaModalFormProps) { }), ]), - MyFormItems.EnumRadio({ - key: 'meter_type', - title: '仪表类型', - colProps: { span: 24 }, - valueEnum: HouseMetersMeterTypeEnum, - required: true, - }), + // MyFormItems.EnumRadio({ + // key: 'meter_type', + // title: '仪表类型', + // colProps: { span: 24 }, + // valueEnum: HouseMetersMeterTypeEnum, + // required: true, + // }), MyFormItems.EnumRadio({ key: 'usage_type', title: '使用类型',