diff --git a/apps/web-antd/src/api/property/resident/person/model.d.ts b/apps/web-antd/src/api/property/resident/person/model.d.ts index d748edb1..83b2c7a5 100644 --- a/apps/web-antd/src/api/property/resident/person/model.d.ts +++ b/apps/web-antd/src/api/property/resident/person/model.d.ts @@ -71,6 +71,10 @@ export interface PersonVO { */ authGroupId?: string | number + authBegDate?: string + + authEndDate?: string + } export interface PersonForm extends BaseEntity { 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/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/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/resident/person/data.ts b/apps/web-antd/src/views/property/resident/person/data.ts index 4508aa87..9110859c 100644 --- a/apps/web-antd/src/views/property/resident/person/data.ts +++ b/apps/web-antd/src/views/property/resident/person/data.ts @@ -1,11 +1,10 @@ -import type { FormSchemaGetter } from '#/adapter/form'; -import type { VxeGridProps } from '#/adapter/vxe-table'; -import { getDictOptions } from '#/utils/dict'; -import { renderDict } from '#/utils/render'; -import { resident_unitList } from '#/api/property/resident/unit'; -import { authGroupList } from '#/api/sis/authGroup'; -import type { AuthGroupVO, AuthGroupQuery } from '#/api/sis/authGroup/model'; -import { toRaw } from 'vue'; +import type { FormSchemaGetter } from '#/adapter/form' +import type { VxeGridProps } from '#/adapter/vxe-table' +import { getDictOptions } from '#/utils/dict' +import { renderDict } from '#/utils/render' +import { resident_unitList } from '#/api/property/resident/unit' +import { authGroupList } from '#/api/sis/authGroup' +import type { AuthGroupVO, AuthGroupQuery } from '#/api/sis/authGroup/model' export const querySchema: FormSchemaGetter = () => [ { @@ -37,7 +36,7 @@ export const querySchema: FormSchemaGetter = () => [ fieldName: 'state', label: '状态', }, -]; +] export const columns: VxeGridProps['columns'] = [ { type: 'checkbox', width: 60 }, @@ -52,7 +51,7 @@ export const columns: VxeGridProps['columns'] = [ // }, { title: '员工编号', - field: 'userId', + field: 'id', width: 100, }, { @@ -70,7 +69,7 @@ export const columns: VxeGridProps['columns'] = [ field: 'gender', slots: { default: ({ row }) => { - return renderDict(row.gender, 'sys_user_sex'); + return renderDict(row.gender, 'sys_user_sex') }, }, width: 100, @@ -105,7 +104,7 @@ export const columns: VxeGridProps['columns'] = [ field: 'state', slots: { default: ({ row }) => { - return renderDict(row.state, 'wy_rzryzt'); + return renderDict(row.state, 'wy_rzryzt') }, }, width: 100, @@ -122,9 +121,9 @@ export const columns: VxeGridProps['columns'] = [ title: '操作', minWidth: 180, }, -]; +] -let authGroupArr: AuthGroupVO[] = []; +let authGroupArr: AuthGroupVO[] = [] export const modalSchema: FormSchemaGetter = () => [ { label: '主键id', @@ -140,17 +139,20 @@ export const modalSchema: FormSchemaGetter = () => [ fieldName: 'userName', component: 'Input', rules: 'required', + formItemClass: 'col-span-1', }, { label: '联系电话', fieldName: 'phone', component: 'Input', rules: 'required', + formItemClass: 'col-span-1', }, { label: '性别', fieldName: 'gender', component: 'Select', + formItemClass: 'col-span-2', componentProps: { options: getDictOptions('sys_user_sex'), }, @@ -161,18 +163,30 @@ export const modalSchema: FormSchemaGetter = () => [ fieldName: 'idCard', component: 'Input', rules: 'required', + formItemClass: 'col-span-1', }, { label: '邮箱', fieldName: 'email', component: 'Input', + formItemClass: 'col-span-1', }, { label: '人员状态', fieldName: 'state', component: 'Select', componentProps: { - options: getDictOptions('wy_rzryzt'), + options: getDictOptions('wy_rzryzt') + }, + rules: 'selectRequired', + formItemClass: 'col-span-2', + }, + { + label: '人员类型', + fieldName: 'type', + component: 'Select', + componentProps: { + options: getDictOptions('wy_rzrylx'), }, rules: 'selectRequired', }, @@ -187,7 +201,7 @@ export const modalSchema: FormSchemaGetter = () => [ label: '所属单位', fieldName: 'unitId', component: 'Select', - formItemClass: 'col-span-2', + formItemClass: 'col-span-4', rules: 'selectRequired', }, // { @@ -207,37 +221,66 @@ export const modalSchema: FormSchemaGetter = () => [ valueFormat: 'YYYY-MM-DD HH:mm:ss', }, rules: 'required', + formItemClass: 'col-span-1', }, { label: '车牌号码', fieldName: 'carNumber', component: 'Input', + formItemClass: 'col-span-3', + }, + { + label: '修改权限', + fieldName: 'authSwitch', + component: 'Switch', + formItemClass: 'col-span-1', + componentProps: { + class: 'w-auto', + + }, + defaultValue: false, + dependencies: { + show: (values) => { + return typeof values.id !== 'undefined' + }, + triggerFields: ['id'], + }, + }, { label: '授权期限', fieldName: 'authTime', component: 'RangePicker', + formItemClass: 'col-span-1', componentProps: { + class: 'w-auto', showTime: true, format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', }, dependencies: { show: (values) => { - return typeof values.id !== 'undefined'; + return typeof values.id !== 'undefined' }, - triggerFields: ['id'], + disabled:(values) => { + return !values.authSwitch + }, + triggerFields: ['id', 'authSwitch'], }, }, { label: '通行权限组', fieldName: 'authGroupId', component: 'ApiSelect', + formItemClass: 'col-span-2', dependencies: { show: (values) => { - return typeof values.id !== 'undefined'; + return typeof values.id !== 'undefined' }, - triggerFields: ['id'], + disabled:(values) => { + return !values.authSwitch + }, + triggerFields: ['id', 'authSwitch'], }, componentProps: { allowClear: true, @@ -248,14 +291,13 @@ export const modalSchema: FormSchemaGetter = () => [ api: async () => { if (!authGroupArr || authGroupArr.length == 0) { const params: AuthGroupQuery = { - groupType: 2, pageNum: 1, pageSize: 500, - }; - const res = await authGroupList(params); - authGroupArr = res.rows; + } + const res = await authGroupList(params) + authGroupArr = res.rows } - return authGroupArr; + return authGroupArr }, }, }, @@ -267,15 +309,15 @@ export const modalSchema: FormSchemaGetter = () => [ // accept: 'image/*', // 可选拓展名或者mime类型 ,拼接 maxCount: 1, // 最大上传文件数 默认为1 为1会绑定为string而非string[]类型 }, - formItemClass: 'col-span-2', + formItemClass: 'col-span-3', }, { label: '备注', fieldName: 'remark', component: 'Textarea', - formItemClass: 'col-span-2', + formItemClass: 'col-span-3', }, -]; +] //门禁记录 export const accessControlColumns: VxeGridProps['columns'] = [ @@ -311,7 +353,7 @@ export const accessControlColumns: VxeGridProps['columns'] = [ title: '状态', field: 'locathon', }, -]; +] //车辆记录 export const carColumns: VxeGridProps['columns'] = [ @@ -355,22 +397,22 @@ export const carColumns: VxeGridProps['columns'] = [ title: '备注', field: 'remark', }, -]; +] export async function getUnitList(): Promise< { value: number; label: string }[] > { const queryParam = { pageNum: 1000, pageSize: 1, - }; - const res = await resident_unitList(queryParam); - const data: { value: number; label: string }[] = []; + } + const res = await resident_unitList(queryParam) + const data: { value: number; label: string }[] = [] res.rows.forEach((r: any) => { data.push({ value: r.id, label: r.name, - }); - }); - return data; + }) + }) + return data } diff --git a/apps/web-antd/src/views/property/resident/person/person-modal.vue b/apps/web-antd/src/views/property/resident/person/person-modal.vue index 06d9678a..1a67c0a9 100644 --- a/apps/web-antd/src/views/property/resident/person/person-modal.vue +++ b/apps/web-antd/src/views/property/resident/person/person-modal.vue @@ -1,38 +1,38 @@ @@ -132,16 +133,10 @@ function getUnitInfo(unit: { name: string }) { diff --git a/apps/web-antd/src/views/property/resident/unit/data.ts b/apps/web-antd/src/views/property/resident/unit/data.ts index 07242e71..f78ea30f 100644 --- a/apps/web-antd/src/views/property/resident/unit/data.ts +++ b/apps/web-antd/src/views/property/resident/unit/data.ts @@ -176,7 +176,7 @@ export const modalSchema: FormSchemaGetter = () => [ }, { label: '', - fieldName: 'time', + fieldName: 'Placeholder', component: '' }, { diff --git a/apps/web-antd/src/views/property/resident/unit/unit-modal.vue b/apps/web-antd/src/views/property/resident/unit/unit-modal.vue index c4310ad3..d2eb4c91 100644 --- a/apps/web-antd/src/views/property/resident/unit/unit-modal.vue +++ b/apps/web-antd/src/views/property/resident/unit/unit-modal.vue @@ -1,23 +1,23 @@ 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; }