From 646af778e9333ee93dbdb9b11be61d206bbe608a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=B2=E4=B9=88=E4=BA=86?= Date: Mon, 15 Jan 2024 10:36:24 +0800 Subject: [PATCH] =?UTF-8?q?dvr=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/table/defaultAttribute.ts | 14 ++- src/components/table/fieldRender/index.vue | 1 + src/components/table/index.vue | 3 + src/layouts/admin/index.vue | 4 +- src/views/govern/analyze/DVR/index.vue | 42 ++++++- .../govern/setting/statisticalType/index.vue | 94 ++++++++++++++++ .../setting/statisticalType/popupForm.vue | 103 ++++++++++++++++++ 7 files changed, 249 insertions(+), 12 deletions(-) create mode 100644 src/views/govern/setting/statisticalType/index.vue create mode 100644 src/views/govern/setting/statisticalType/popupForm.vue diff --git a/src/components/table/defaultAttribute.ts b/src/components/table/defaultAttribute.ts index 7a7490f..39589fd 100644 --- a/src/components/table/defaultAttribute.ts +++ b/src/components/table/defaultAttribute.ts @@ -1,14 +1,16 @@ -import { VxeTableProps } from "vxe-table"; +import { VxeTableProps } from 'vxe-table' -export const defaultAttribute:VxeTableProps = { +export const defaultAttribute: VxeTableProps = { align: 'center', headerCellClassName: 'table-header-cell', border: true, stripe: true, size: 'small', columnConfig: { resizable: true }, - rowConfig: { isCurrent: true, isHover: true }, + rowConfig: { isCurrent: true, isHover: true,keyField: 'id' }, scrollX: { scrollToLeftOnChange: true }, - scrollY: { scrollToTopOnChange: true,enabled:true }, - treeConfig: {} -} \ No newline at end of file + scrollY: { scrollToTopOnChange: true, enabled: true }, + treeConfig: { + reserve: true + } +} diff --git a/src/components/table/fieldRender/index.vue b/src/components/table/fieldRender/index.vue index 3998737..773f7ae 100644 --- a/src/components/table/fieldRender/index.vue +++ b/src/components/table/fieldRender/index.vue @@ -204,6 +204,7 @@ const getTagType = (value: string, custom: any): TagProps['type'] => { } .table-operate-text { padding-left: 5px; + font-size: 12px; } .table-operate { padding: 4px 5px; diff --git a/src/components/table/index.vue b/src/components/table/index.vue index 3e46c37..6578b71 100644 --- a/src/components/table/index.vue +++ b/src/components/table/index.vue @@ -161,5 +161,8 @@ defineExpose({ max-width: 100%; background-color: var(--ba-bg-color-overlay); padding: 13px 15px; + border-left: 1px solid #e4e7e9; + border-right: 1px solid #e4e7e9; + border-bottom: 1px solid #e4e7e9; } diff --git a/src/layouts/admin/index.vue b/src/layouts/admin/index.vue index da3dd0a..8d01192 100644 --- a/src/layouts/admin/index.vue +++ b/src/layouts/admin/index.vue @@ -84,7 +84,7 @@ const init = async () => { icon: 'el-icon-List', menu_type: 'tab', url: '', - component: '/src/views/govern/device/manage.vue', + component: '/src/views/govern/setting/statisticalType/index.vue', keepalive: 'test', extend: 'none', children: [ @@ -98,7 +98,7 @@ const init = async () => { icon: 'el-icon-List', menu_type: 'tab', url: '', - component: '/src/views/govern/analyze/DVR/index.vue', + component: '/src/views/govern/setting/statisticalType/index.vue', keepalive: 'auth/role', extend: 'none', children: [] diff --git a/src/views/govern/analyze/DVR/index.vue b/src/views/govern/analyze/DVR/index.vue index 73fbc18..67013e6 100644 --- a/src/views/govern/analyze/DVR/index.vue +++ b/src/views/govern/analyze/DVR/index.vue @@ -1,24 +1,58 @@ diff --git a/src/views/govern/setting/statisticalType/index.vue b/src/views/govern/setting/statisticalType/index.vue new file mode 100644 index 0000000..963fbbf --- /dev/null +++ b/src/views/govern/setting/statisticalType/index.vue @@ -0,0 +1,94 @@ + + diff --git a/src/views/govern/setting/statisticalType/popupForm.vue b/src/views/govern/setting/statisticalType/popupForm.vue new file mode 100644 index 0000000..4a5a4aa --- /dev/null +++ b/src/views/govern/setting/statisticalType/popupForm.vue @@ -0,0 +1,103 @@ + +