From 1d76ed1466deceacfe5fba09b10bb0104d13b2e5 Mon Sep 17 00:00:00 2001 From: lxj <15683799673@163.com> Date: Tue, 9 Sep 2025 06:26:17 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/views/videoSystem/common.ts | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 apps/web-antd/src/views/videoSystem/common.ts diff --git a/apps/web-antd/src/views/videoSystem/common.ts b/apps/web-antd/src/views/videoSystem/common.ts new file mode 100644 index 00000000..bc8ca771 --- /dev/null +++ b/apps/web-antd/src/views/videoSystem/common.ts @@ -0,0 +1,2 @@ +export const fallImg = + 'data:image/png;base64,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'; From 5c86b29c14be718141b6e1d0563562d4ed03b8bd Mon Sep 17 00:00:00 2001 From: zcxlsm Date: Tue, 9 Sep 2025 19:04:07 +0800 Subject: [PATCH 2/5] refactor(property): 1 --- .../src/api/property/resident/passRecordManagement/index.ts | 6 +++--- apps/web-antd/vite.config.mts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/web-antd/src/api/property/resident/passRecordManagement/index.ts b/apps/web-antd/src/api/property/resident/passRecordManagement/index.ts index 92b2c5fd..eb9b6143 100644 --- a/apps/web-antd/src/api/property/resident/passRecordManagement/index.ts +++ b/apps/web-antd/src/api/property/resident/passRecordManagement/index.ts @@ -1,5 +1,5 @@ -import { requestClient } from '#/api/request'; -import type { PageResult } from '#/api/common'; +import { requestClient } from '#/api/request' +import type { PageResult } from '#/api/common' /** * 通行记录列表 @@ -7,5 +7,5 @@ import type { PageResult } from '#/api/common'; * @returns void */ export function getVisitorList(params?: any) { - return requestClient.get>('/sis/visitor/list', { params }); + return requestClient.get>('/sis/e8/visitor/list', { params }) } diff --git a/apps/web-antd/vite.config.mts b/apps/web-antd/vite.config.mts index 1d6a92d6..7e884500 100644 --- a/apps/web-antd/vite.config.mts +++ b/apps/web-antd/vite.config.mts @@ -27,7 +27,7 @@ export default defineConfig(async () => { changeOrigin: true, rewrite: (path) => path.replace(/^\/api/, ''), // mock代理目标地址 - target: 'http://183.230.235.66:11010/api', + target: 'http://localhost:8080', ws: true, }, }, From b8c6f2f28f097d8dfa6a25ab68199ea1e7a67cd3 Mon Sep 17 00:00:00 2001 From: zcxlsm Date: Tue, 9 Sep 2025 19:37:24 +0800 Subject: [PATCH 3/5] =?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 4/5] =?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', From f3c727d0a6ce5fe7dd7bf09d3698ce37213f7bb1 Mon Sep 17 00:00:00 2001 From: lxj <15683799673@163.com> Date: Wed, 10 Sep 2025 13:02:17 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=92=AD=E6=94=BE?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=97=B6=E6=9B=B4=E6=96=B0=E6=A0=91=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/views/sis/video/realtime/index.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/web-antd/src/views/sis/video/realtime/index.vue b/apps/web-antd/src/views/sis/video/realtime/index.vue index 82f64f8b..dbcbe03d 100644 --- a/apps/web-antd/src/views/sis/video/realtime/index.vue +++ b/apps/web-antd/src/views/sis/video/realtime/index.vue @@ -291,6 +291,8 @@ function onNodeChecked( } } }); + // 处理树节点状态 + treeSelectHandle(); } }