+
年份
({
: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/resident/person/data.ts b/apps/web-antd/src/views/property/resident/person/data.ts
index d868e6c7..9110859c 100644
--- a/apps/web-antd/src/views/property/resident/person/data.ts
+++ b/apps/web-antd/src/views/property/resident/person/data.ts
@@ -181,6 +181,15 @@ export const modalSchema: FormSchemaGetter = () => [
rules: 'selectRequired',
formItemClass: 'col-span-2',
},
+ {
+ label: '人员类型',
+ fieldName: 'type',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions('wy_rzrylx'),
+ },
+ rules: 'selectRequired',
+ },
// {
// label: '入住员工',
// fieldName: 'userId',
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/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{
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;
}