From b8c6f2f28f097d8dfa6a25ab68199ea1e7a67cd3 Mon Sep 17 00:00:00 2001 From: zcxlsm Date: Tue, 9 Sep 2025 19:37:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8C=85?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/views/screen/property/analytics-trends.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/web-antd/src/views/screen/property/analytics-trends.vue b/apps/web-antd/src/views/screen/property/analytics-trends.vue index c12e3044..0967ade0 100644 --- a/apps/web-antd/src/views/screen/property/analytics-trends.vue +++ b/apps/web-antd/src/views/screen/property/analytics-trends.vue @@ -53,7 +53,6 @@ const getMeterRecordTrend = async (selectedDate: any) => { }, series: [ { - areaStyle: {}, data: seriesData, itemStyle: { color: '#3ec6ff', From f3117de0d66672216a94fa0383a54ff91bb732ec Mon Sep 17 00:00:00 2001 From: dev_ljl <2590379346@qq.com> Date: Wed, 10 Sep 2025 09:58:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=E4=BF=9D=E6=B4=81=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=9D=E6=B4=81=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../property/businessManagement/workOrdersType/index.vue | 3 +-- .../src/views/property/clean/cleanSettings/data.ts | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/apps/web-antd/src/views/property/businessManagement/workOrdersType/index.vue b/apps/web-antd/src/views/property/businessManagement/workOrdersType/index.vue index f390f174..91d01768 100644 --- a/apps/web-antd/src/views/property/businessManagement/workOrdersType/index.vue +++ b/apps/web-antd/src/views/property/businessManagement/workOrdersType/index.vue @@ -94,7 +94,6 @@ async function handleEdit(row: Required) { } async function handleDelete(row: Required) { - console.log(row,'======row') await workOrdersTypeRemove(row.id); await tableApi.query(); } @@ -160,7 +159,7 @@ function handleMultiDelete() { danger v-access:code="['property:workOrdersType:remove']" @click.stop="" - :disabled="row.children?.length>0" + :disabled="row.children?.length>0||row.id=='1943128289816682498'||row.id=='1952989217332658178'" > {{ $t('pages.common.delete') }} diff --git a/apps/web-antd/src/views/property/clean/cleanSettings/data.ts b/apps/web-antd/src/views/property/clean/cleanSettings/data.ts index d4ddf3f2..abd0f7e1 100644 --- a/apps/web-antd/src/views/property/clean/cleanSettings/data.ts +++ b/apps/web-antd/src/views/property/clean/cleanSettings/data.ts @@ -174,6 +174,13 @@ export const modalSchema: FormSchemaGetter = () => [ // }, // rules: 'required', // }, + { + label: '保洁内容', + fieldName: 'cleanContent', + component: 'Textarea', + rules: 'required', + formItemClass: 'col-span-2', + }, { label: '状态', fieldName: 'stater',