From 866a11277ef8be27d58a15f4b188ff1668c52f2c Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Mon, 29 Jun 2026 11:01:03 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BA=BA=E5=91=98=E6=89=93=E5=8D=A1?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/api/sys/sysPersonClockConfig.ts | 9 + src/components/DraggableDeptTree/index.vue | 2 +- src/components/DraggableDeviceGroup/index.vue | 2 +- .../DraggableDeviceGroupDraggable/index.vue | 2 +- src/components/DraggableOrgTree/index.vue | 2 +- src/components/Select/SelectTreeChannel.vue | 35 +- src/hooks/table.ts | 434 +++++++-------- src/views/admin/system/user/index.vue | 2 +- .../campIntro/components/EditableArea.vue | 35 ++ .../campIntro/components/ListEditorDialog.vue | 109 ++++ .../components/RichTextEditorDialog.vue | 48 ++ src/views/alarm/setting/campIntro/index.vue | 509 ++++++++++++++++++ src/views/alarm/setting/index.vue | 13 + src/views/device/deviceCamera/index.vue | 2 +- src/views/device/deviceManage/index.vue | 2 +- src/views/door/components/doorTableDialog.vue | 1 + src/views/door/doorReign/index.vue | 8 +- src/views/door/personClockConfig/index.vue | 327 +++++++++++ src/views/login/index.vue | 2 +- src/views/sys/sysPerson/index.vue | 80 +-- 21 files changed, 1357 insertions(+), 269 deletions(-) create mode 100755 src/api/sys/sysPersonClockConfig.ts create mode 100644 src/views/alarm/setting/campIntro/components/EditableArea.vue create mode 100644 src/views/alarm/setting/campIntro/components/ListEditorDialog.vue create mode 100644 src/views/alarm/setting/campIntro/components/RichTextEditorDialog.vue create mode 100644 src/views/alarm/setting/campIntro/index.vue create mode 100644 src/views/door/personClockConfig/index.vue diff --git a/package.json b/package.json index dc6cfb3..26e9aa5 100644 --- a/package.json +++ b/package.json @@ -120,4 +120,4 @@ "type": "git", "url": "https://gitee.com/log4j/pig" } -} +} \ No newline at end of file diff --git a/src/api/sys/sysPersonClockConfig.ts b/src/api/sys/sysPersonClockConfig.ts new file mode 100755 index 0000000..92edaf9 --- /dev/null +++ b/src/api/sys/sysPersonClockConfig.ts @@ -0,0 +1,9 @@ +import request from "/@/utils/request"; + +export function change(data?: { userCodeList: string[]; enable: "1" | "0" }) { + return request({ + url: "/admin/sysPersonClockConfig/change", + method: "post", + data, + }); +} diff --git a/src/components/DraggableDeptTree/index.vue b/src/components/DraggableDeptTree/index.vue index 67ae3c8..8157f45 100644 --- a/src/components/DraggableDeptTree/index.vue +++ b/src/components/DraggableDeptTree/index.vue @@ -109,7 +109,7 @@ const props = withDefaults( nodeClickable: true, switchInactiveText: "当前级", switchActiveText: "当前级及子级", - defaultTreeWidth: 20, + defaultTreeWidth: 15, }, ) const emit = defineEmits(["getSelectNode"]) diff --git a/src/components/DraggableDeviceGroup/index.vue b/src/components/DraggableDeviceGroup/index.vue index 2e3cf65..4ff2a47 100644 --- a/src/components/DraggableDeviceGroup/index.vue +++ b/src/components/DraggableDeviceGroup/index.vue @@ -112,7 +112,7 @@ const props = withDefaults( nodeClickable: true, switchInactiveText: "当前级", switchActiveText: "当前级及子级", - defaultTreeWidth: 20, + defaultTreeWidth: 15, }, ) diff --git a/src/components/DraggableDeviceGroupDraggable/index.vue b/src/components/DraggableDeviceGroupDraggable/index.vue index 1e0e059..a376182 100644 --- a/src/components/DraggableDeviceGroupDraggable/index.vue +++ b/src/components/DraggableDeviceGroupDraggable/index.vue @@ -121,7 +121,7 @@ const props = withDefaults( nodeClickable: true, switchInactiveText: "当前级", switchActiveText: "当前级及子级", - defaultTreeWidth: 20, + defaultTreeWidth: 15, windowNum: null }, ) diff --git a/src/components/DraggableOrgTree/index.vue b/src/components/DraggableOrgTree/index.vue index cb4f4f6..e850970 100644 --- a/src/components/DraggableOrgTree/index.vue +++ b/src/components/DraggableOrgTree/index.vue @@ -109,7 +109,7 @@ const props = withDefaults( nodeClickable: true, switchInactiveText: "当前级", switchActiveText: "当前级及子级", - defaultTreeWidth: 20, + defaultTreeWidth: 15, }, ) const emit = defineEmits(["getSelectNode"]) diff --git a/src/components/Select/SelectTreeChannel.vue b/src/components/Select/SelectTreeChannel.vue index d61b83d..1669179 100644 --- a/src/components/Select/SelectTreeChannel.vue +++ b/src/components/Select/SelectTreeChannel.vue @@ -3,9 +3,9 @@ label: 'treeLabel', children: 'deviceChannelList', }" node-key="treeValue" v-model="state.selectId" :placeholder="props.placeholder" :clearable="props.clearable" - :loading="state.loading" :data="state.options" :render-after-expand="false" show-checkbox multiple - style="width: 100%" filterable :filter-node-method="filterNode" default-expand-all - @visible-change="(e: boolean) => e && getOptions()"> + :loading="state.loading" :data="state.options" :render-after-expand="true" show-checkbox multiple + style="width: 100%" filterable :filter-node-method="filterNode" + @visible-change="(e: boolean) => e && getOptions(true)"> \ No newline at end of file diff --git a/src/views/device/deviceCamera/index.vue b/src/views/device/deviceCamera/index.vue index 72b361d..ca178f5 100644 --- a/src/views/device/deviceCamera/index.vue +++ b/src/views/device/deviceCamera/index.vue @@ -3,7 +3,7 @@
+ :defaultTreeWidth="15" :nodeClickable="false">