by2025/admin-vben5
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details

Browse Source
This commit is contained in:
zcxlsm 2025-07-28 15:26:38 +08:00
commit 375dcc0114
11 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/web-antd/src/views/property/electricEnergy/elctricityCost/index.vue
View File

@ -68,7 +68,6 @@ const [BasicTable, tableApi] = useVbenVxeGrid({
.box{ .box{
display: grid; display: grid;
grid-template-columns: 1fr 3fr; grid-template-columns: 1fr 3fr;
gap: 30px;
.right { .right {
width: 100%; width: 100%;

11
apps/web-antd/src/views/property/electricEnergy/elctricitySituation/index.vue
View File

@ -84,7 +84,8 @@
<div class="section-header"> <div class="section-header">
<div class="header-title">日用电功率曲线</div> <div class="header-title">日用电功率曲线</div>
</div> </div>
<div class="chart-placeholder" ref="powerCurveChart"> <!-- <div class="chart-placeholder" ref="powerCurveChart">-->
<div class="power-chart" ref="powerCurveChart">
</div> </div>
</div> </div>
<div class="power-peak-container"> <div class="power-peak-container">
@ -473,7 +474,13 @@ onBeforeUnmount(() => {
justify-content: center; justify-content: center;
border-radius: 4px; border-radius: 4px;
} }
.power-chart{
height: 47vh;
display: flex;
align-items: center;
justify-content: center;
border-radius: 4px;
}
.peak-item { .peak-item {
padding: 15px 0 0 0; padding: 15px 0 0 0;
border: 1px solid #3671e8; border: 1px solid #3671e8;

8
apps/web-antd/src/views/property/electricEnergy/electricTrend/index.vue
View File

@ -300,7 +300,7 @@ onMounted(()=>{
</div> </div>
<div id="day" style="height: 250px;width: 100%;"></div> <div id="day" style="height: 250px;width: 100%;"></div>
</div> </div>
<div style="background: #fff;border-radius: 8px;padding: 10px;margin-top: 10px;"> <div style="background: #fff;border-radius: 8px;padding: 10px;margin-top: 16px;">
<div> <div>
<div style="display: flex;justify-content: space-between;"> <div style="display: flex;justify-content: space-between;">
<DatePicker <DatePicker
@ -311,7 +311,7 @@ onMounted(()=>{
</div> </div>
<div id="month" style="height: 250px;width: 100%;"></div> <div id="month" style="height: 250px;width: 100%;"></div>
</div> </div>
<div style="background: #fff;border-radius: 8px;padding: 10px;margin-top: 10px;"> <div style="background: #fff;border-radius: 8px;padding: 10px;margin-top: 16px;">
<div> <div>
<div style="display: flex;justify-content: space-between;"> <div style="display: flex;justify-content: space-between;">
<DatePicker <DatePicker
@ -330,7 +330,7 @@ onMounted(()=>{
.box{ .box{
display: grid; display: grid;
grid-template-columns: 1fr 3fr; grid-template-columns: 1fr 3fr;
gap: 30px; gap: 16px;
padding: 10px; padding: 16px;
} }
</style> </style>

1
apps/web-antd/src/views/property/electricEnergy/electricityQOQ/index.vue
View File

@ -68,6 +68,5 @@ const [BasicTable, tableApi] = useVbenVxeGrid({
.box{ .box{
display: grid; display: grid;
grid-template-columns: 1fr 3fr; grid-template-columns: 1fr 3fr;
gap: 30px;
} }
</style> </style>

8
apps/web-antd/src/views/property/electricEnergy/electricityYOY/index.vue
View File

@ -134,7 +134,7 @@ const data = [...Array(32)].map((_, i) => ({
<div class="box"> <div class="box">
<div class="left"><FloorTree></FloorTree></div> <div class="left"><FloorTree></FloorTree></div>
<div class="right"> <div class="right">
<div style="background: #fff;border-radius: 8px;padding: 10px;margin-bottom: 10px;"> <div style="background: #fff;border-radius: 8px;padding: 10px;margin-bottom: 16px;">
<div> <div>
年份 年份
<DatePicker <DatePicker
@ -156,7 +156,7 @@ const data = [...Array(32)].map((_, i) => ({
:columns="columns" :columns="columns"
:data-source="data" :data-source="data"
:pagination="false" :pagination="false"
:scroll="{ y: 270 }" :scroll="{ y: '50vh' }"
/> />
</div> </div>
</div> </div>
@ -167,7 +167,7 @@ const data = [...Array(32)].map((_, i) => ({
.box{ .box{
display: grid; display: grid;
grid-template-columns: 1fr 3fr; grid-template-columns: 1fr 3fr;
gap: 30px; gap: 16px;
padding: 10px; padding: 16px;
} }
</style> </style>

9
apps/web-antd/src/views/property/resident/person/data.ts
View File

@ -181,6 +181,15 @@ export const modalSchema: FormSchemaGetter = () => [
rules: 'selectRequired', rules: 'selectRequired',
formItemClass: 'col-span-2', formItemClass: 'col-span-2',
}, },
{
label: '人员类型',
fieldName: 'type',
component: 'Select',
componentProps: {
options: getDictOptions('wy_rzrylx'),
},
rules: 'selectRequired',
},
// { // {
// label: '入住员工', // label: '入住员工',
// fieldName: 'userId', // fieldName: 'userId',

1
apps/web-antd/src/views/property/waterPower/waterCost/index.vue
View File

@ -68,7 +68,6 @@ const [BasicTable, tableApi] = useVbenVxeGrid({
.box{ .box{
display: grid; display: grid;
grid-template-columns: 1fr 3fr; grid-template-columns: 1fr 3fr;
gap: 30px;
.right { .right {
width: 100%; width: 100%;

1
apps/web-antd/src/views/property/waterPower/waterQOQ/index.vue
View File

@ -68,6 +68,5 @@ const [BasicTable, tableApi] = useVbenVxeGrid({
.box{ .box{
display: grid; display: grid;
grid-template-columns: 1fr 3fr; grid-template-columns: 1fr 3fr;
gap: 30px;
} }
</style> </style>

2
apps/web-antd/src/views/property/waterPower/waterSituation/index.vue
View File

@ -386,7 +386,7 @@ onBeforeUnmount(() => {
} }
.power-chart{ .power-chart{
height: 380px; height: 55vh;
} }
.energy-chart{ .energy-chart{

12
apps/web-antd/src/views/property/waterPower/waterTrend/index.vue
View File

@ -198,7 +198,7 @@ onMounted(()=>{
<div class="box"> <div class="box">
<div class="left"><FloorTree></FloorTree></div> <div class="left"><FloorTree></FloorTree></div>
<div class="right"> <div class="right">
<div style="background: #fff;border-radius: 8px;padding: 10px;margin-top: 10px;"> <div style="background: #fff;border-radius: 8px;padding: 10px;">
<div> <div>
<div style="display: flex;justify-content: space-between;"> <div style="display: flex;justify-content: space-between;">
<DatePicker <DatePicker
@ -207,9 +207,9 @@ onMounted(()=>{
picker="month" picker="month"
/>当月能耗总值：30.00t</div> />当月能耗总值：30.00t</div>
</div> </div>
<div id="month" style="height: 250px;width: 100%;"></div> <div id="month" style="height: 350px;width: 100%;"></div>
</div> </div>
<div style="background: #fff;border-radius: 8px;padding: 10px;margin-top: 10px;"> <div style="background: #fff;border-radius: 8px;padding: 10px;margin-top: 16px;">
<div> <div>
<div style="display: flex;justify-content: space-between;"> <div style="display: flex;justify-content: space-between;">
<DatePicker <DatePicker
@ -218,7 +218,7 @@ onMounted(()=>{
picker="year" picker="year"
/>当年能耗总值：59.00t</div> />当年能耗总值：59.00t</div>
</div> </div>
<div id="year" style="height: 250px;width: 100%;"></div> <div id="year" style="height: 350px;width: 100%;"></div>
</div> </div>
</div> </div>
</div> </div>
@ -228,7 +228,7 @@ onMounted(()=>{
.box{ .box{
display: grid; display: grid;
grid-template-columns: 1fr 3fr; grid-template-columns: 1fr 3fr;
gap: 30px; gap: 16px;
padding: 10px; padding: 16px;
} }
</style> </style>

8
apps/web-antd/src/views/property/waterPower/waterYOY/index.vue
View File

@ -134,7 +134,7 @@ const data = [...Array(32)].map((_, i) => ({
<div class="box"> <div class="box">
<div class="left"><FloorTree></FloorTree></div> <div class="left"><FloorTree></FloorTree></div>
<div class="right"> <div class="right">
<div style="background: #fff;border-radius: 8px;padding: 10px;margin-bottom: 10px;"> <div style="background: #fff;border-radius: 8px;padding: 10px;margin-bottom: 16px;">
<div> <div>
年份 年份
<DatePicker <DatePicker
@ -156,7 +156,7 @@ const data = [...Array(32)].map((_, i) => ({
:columns="columns" :columns="columns"
:data-source="data" :data-source="data"
:pagination="false" :pagination="false"
:scroll="{ y: 270 }" :scroll="{ y: '50vh' }"
/> />
</div> </div>
</div> </div>
@ -167,7 +167,7 @@ const data = [...Array(32)].map((_, i) => ({
.box{ .box{
display: grid; display: grid;
grid-template-columns: 1fr 3fr; grid-template-columns: 1fr 3fr;
gap: 30px; gap: 16px;
padding: 10px; padding: 16px;
} }
</style> </style>