From 289839651df03e20f42cadbeeba6022ad870ac2e Mon Sep 17 00:00:00 2001 From: dev_ljl <2590379346@qq.com> Date: Mon, 28 Jul 2025 10:07:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1=E3=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../electricEnergy/elctricitySituation/index.vue | 11 +++++++++-- .../property/waterPower/waterSituation/index.vue | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/apps/web-antd/src/views/property/electricEnergy/elctricitySituation/index.vue b/apps/web-antd/src/views/property/electricEnergy/elctricitySituation/index.vue index 88b4f4b9..e6093483 100644 --- a/apps/web-antd/src/views/property/electricEnergy/elctricitySituation/index.vue +++ b/apps/web-antd/src/views/property/electricEnergy/elctricitySituation/index.vue @@ -84,7 +84,8 @@
日用电功率曲线
-
+ +
@@ -473,7 +474,13 @@ onBeforeUnmount(() => { justify-content: center; border-radius: 4px; } - +.power-chart{ + height: 47vh; + display: flex; + align-items: center; + justify-content: center; + border-radius: 4px; +} .peak-item { padding: 15px 0 0 0; border: 1px solid #3671e8; diff --git a/apps/web-antd/src/views/property/waterPower/waterSituation/index.vue b/apps/web-antd/src/views/property/waterPower/waterSituation/index.vue index 9bcfcd23..3e769ff6 100644 --- a/apps/web-antd/src/views/property/waterPower/waterSituation/index.vue +++ b/apps/web-antd/src/views/property/waterPower/waterSituation/index.vue @@ -386,7 +386,7 @@ onBeforeUnmount(() => { } .power-chart{ - height: 380px; + height: 55vh; } .energy-chart{ From ca43557416299ab2fe1aaaabea453143bb8fbe77 Mon Sep 17 00:00:00 2001 From: FLL <2162874245@qq.com> Date: Mon, 28 Jul 2025 14:43:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=83=BD=E8=80=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../property/electricEnergy/elctricityCost/index.vue | 1 - .../property/electricEnergy/electricTrend/index.vue | 8 ++++---- .../property/electricEnergy/electricityQOQ/index.vue | 1 - .../property/electricEnergy/electricityYOY/index.vue | 8 ++++---- .../views/property/waterPower/waterCost/index.vue | 1 - .../src/views/property/waterPower/waterQOQ/index.vue | 1 - .../views/property/waterPower/waterTrend/index.vue | 12 ++++++------ .../src/views/property/waterPower/waterYOY/index.vue | 8 ++++---- 8 files changed, 18 insertions(+), 22 deletions(-) diff --git a/apps/web-antd/src/views/property/electricEnergy/elctricityCost/index.vue b/apps/web-antd/src/views/property/electricEnergy/elctricityCost/index.vue index 74a3477d..3bd9ad1d 100644 --- a/apps/web-antd/src/views/property/electricEnergy/elctricityCost/index.vue +++ b/apps/web-antd/src/views/property/electricEnergy/elctricityCost/index.vue @@ -68,7 +68,6 @@ const [BasicTable, tableApi] = useVbenVxeGrid({ .box{ display: grid; grid-template-columns: 1fr 3fr; - gap: 30px; .right { width: 100%; diff --git a/apps/web-antd/src/views/property/electricEnergy/electricTrend/index.vue b/apps/web-antd/src/views/property/electricEnergy/electricTrend/index.vue index e798f2bc..442e679b 100644 --- a/apps/web-antd/src/views/property/electricEnergy/electricTrend/index.vue +++ b/apps/web-antd/src/views/property/electricEnergy/electricTrend/index.vue @@ -300,7 +300,7 @@ onMounted(()=>{
-
+
{
-
+
{ .box{ display: grid; grid-template-columns: 1fr 3fr; - gap: 30px; - padding: 10px; + gap: 16px; + padding: 16px; } diff --git a/apps/web-antd/src/views/property/electricEnergy/electricityQOQ/index.vue b/apps/web-antd/src/views/property/electricEnergy/electricityQOQ/index.vue index 4cdd757b..468b4807 100644 --- a/apps/web-antd/src/views/property/electricEnergy/electricityQOQ/index.vue +++ b/apps/web-antd/src/views/property/electricEnergy/electricityQOQ/index.vue @@ -68,6 +68,5 @@ const [BasicTable, tableApi] = useVbenVxeGrid({ .box{ display: grid; grid-template-columns: 1fr 3fr; - gap: 30px; } diff --git a/apps/web-antd/src/views/property/electricEnergy/electricityYOY/index.vue b/apps/web-antd/src/views/property/electricEnergy/electricityYOY/index.vue index 297b695b..ee721ac5 100644 --- a/apps/web-antd/src/views/property/electricEnergy/electricityYOY/index.vue +++ b/apps/web-antd/src/views/property/electricEnergy/electricityYOY/index.vue @@ -134,7 +134,7 @@ const data = [...Array(32)].map((_, i) => ({
-
+
年份 ({ :columns="columns" :data-source="data" :pagination="false" - :scroll="{ y: 270 }" + :scroll="{ y: '50vh' }" />
@@ -167,7 +167,7 @@ const data = [...Array(32)].map((_, i) => ({ .box{ display: grid; grid-template-columns: 1fr 3fr; - gap: 30px; - padding: 10px; + gap: 16px; + padding: 16px; } diff --git a/apps/web-antd/src/views/property/waterPower/waterCost/index.vue b/apps/web-antd/src/views/property/waterPower/waterCost/index.vue index da0c992c..1b023259 100644 --- a/apps/web-antd/src/views/property/waterPower/waterCost/index.vue +++ b/apps/web-antd/src/views/property/waterPower/waterCost/index.vue @@ -68,7 +68,6 @@ const [BasicTable, tableApi] = useVbenVxeGrid({ .box{ display: grid; grid-template-columns: 1fr 3fr; - gap: 30px; .right { width: 100%; diff --git a/apps/web-antd/src/views/property/waterPower/waterQOQ/index.vue b/apps/web-antd/src/views/property/waterPower/waterQOQ/index.vue index d02c591a..93651c7d 100644 --- a/apps/web-antd/src/views/property/waterPower/waterQOQ/index.vue +++ b/apps/web-antd/src/views/property/waterPower/waterQOQ/index.vue @@ -68,6 +68,5 @@ const [BasicTable, tableApi] = useVbenVxeGrid({ .box{ display: grid; grid-template-columns: 1fr 3fr; - gap: 30px; } diff --git a/apps/web-antd/src/views/property/waterPower/waterTrend/index.vue b/apps/web-antd/src/views/property/waterPower/waterTrend/index.vue index bcd55b4c..fd878c2c 100644 --- a/apps/web-antd/src/views/property/waterPower/waterTrend/index.vue +++ b/apps/web-antd/src/views/property/waterPower/waterTrend/index.vue @@ -198,7 +198,7 @@ onMounted(()=>{
-
+
{ picker="month" />当月能耗总值：30.00t
-
+
-
+
{ picker="year" />当年能耗总值：59.00t
-
+
@@ -228,7 +228,7 @@ onMounted(()=>{ .box{ display: grid; grid-template-columns: 1fr 3fr; - gap: 30px; - padding: 10px; + gap: 16px; + padding: 16px; } diff --git a/apps/web-antd/src/views/property/waterPower/waterYOY/index.vue b/apps/web-antd/src/views/property/waterPower/waterYOY/index.vue index 82bce455..b0ccb084 100644 --- a/apps/web-antd/src/views/property/waterPower/waterYOY/index.vue +++ b/apps/web-antd/src/views/property/waterPower/waterYOY/index.vue @@ -134,7 +134,7 @@ const data = [...Array(32)].map((_, i) => ({
-
+
年份 ({ :columns="columns" :data-source="data" :pagination="false" - :scroll="{ y: 270 }" + :scroll="{ y: '50vh' }" />
@@ -167,7 +167,7 @@ const data = [...Array(32)].map((_, i) => ({ .box{ display: grid; grid-template-columns: 1fr 3fr; - gap: 30px; - padding: 10px; + gap: 16px; + padding: 16px; } From fcbe3b2e781dd18f82be06a0b1e81778ab591d35 Mon Sep 17 00:00:00 2001 From: dev_ljl <2590379346@qq.com> Date: Mon, 28 Jul 2025 14:45:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1=E3=80=81=E5=85=A5=E9=A9=BB=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E6=B7=BB=E5=8A=A0=E4=BA=BA=E5=91=98=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/property/resident/person/data.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/apps/web-antd/src/views/property/resident/person/data.ts b/apps/web-antd/src/views/property/resident/person/data.ts index 4508aa87..c712232c 100644 --- a/apps/web-antd/src/views/property/resident/person/data.ts +++ b/apps/web-antd/src/views/property/resident/person/data.ts @@ -176,6 +176,15 @@ export const modalSchema: FormSchemaGetter = () => [ }, rules: 'selectRequired', }, + { + label: '人员类型', + fieldName: 'type', + component: 'Select', + componentProps: { + options: getDictOptions('wy_rzrylx'), + }, + rules: 'selectRequired', + }, // { // label: '入住员工', // fieldName: 'userId', @@ -187,7 +196,6 @@ export const modalSchema: FormSchemaGetter = () => [ label: '所属单位', fieldName: 'unitId', component: 'Select', - formItemClass: 'col-span-2', rules: 'selectRequired', }, // {