From 149f44a8dd2beedcf612efa55950fe68396b399c Mon Sep 17 00:00:00 2001 From: xuziqiang <1344691446@qq.com> Date: Wed, 10 Jul 2024 14:51:42 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E6=A0=91=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hx-ai-intelligent/src/api/deviceManage.ts | 4 ++-- hx-ai-intelligent/src/view/equipmentManage/ledger/config.ts | 3 ++- .../src/view/organizationManage/departmentManage/index.vue | 2 ++ lib/component/table/props.ts | 1 + lib/component/tree/props.ts | 1 + 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/hx-ai-intelligent/src/api/deviceManage.ts b/hx-ai-intelligent/src/api/deviceManage.ts index f4b8136..f598951 100644 --- a/hx-ai-intelligent/src/api/deviceManage.ts +++ b/hx-ai-intelligent/src/api/deviceManage.ts @@ -9,6 +9,6 @@ export enum device { export enum group { queryDeviceGroupTree = `${BASE_URL}/deviceGroup/queryDeviceGroupTree`, // 左侧树 creatOrUpdate = `${BASE_URL}/deviceGroup/creatOrUpdate`, // 左侧树节点新增编辑 - del = `${BASE_URL}/deviceGroup/del`, // 左侧树节点新增编辑 - move = `${BASE_URL}/deviceGroup/move`, // 左侧树节点新增编辑 + del = `${BASE_URL}/deviceGroup/del`, + move = `${BASE_URL}/deviceGroup/move`, } diff --git a/hx-ai-intelligent/src/view/equipmentManage/ledger/config.ts b/hx-ai-intelligent/src/view/equipmentManage/ledger/config.ts index 3512061..d7954ff 100644 --- a/hx-ai-intelligent/src/view/equipmentManage/ledger/config.ts +++ b/hx-ai-intelligent/src/view/equipmentManage/ledger/config.ts @@ -33,6 +33,7 @@ export const tableConfig = (orgId) => { }, }, rowSelection: null, + scroll: { x: 2000 }, columns: [ { title: '设备名称', @@ -74,7 +75,7 @@ export const tableConfig = (orgId) => { { title: '设备厂商纳税人识别号', dataIndex: 'deviceRatepay', - textNumber: 8, + textNumber: 9, textEllipsis: true, }, { diff --git a/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue b/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue index e9bbadf..9fe67c1 100644 --- a/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue +++ b/hx-ai-intelligent/src/view/organizationManage/departmentManage/index.vue @@ -8,6 +8,7 @@ tableConfig.scroll), //操作栏 size: PropTypes.string.def('middle'), showBack: PropTypes.bool.def(false), + bordered: PropTypes.bool.def(true), pageField: PropTypes.string.def(tableConfig.pageField), pageCountField: PropTypes.string.def(tableConfig.pageCount), listField: PropTypes.string.def(tableConfig.listField), diff --git a/lib/component/tree/props.ts b/lib/component/tree/props.ts index a040b37..618bcd4 100644 --- a/lib/component/tree/props.ts +++ b/lib/component/tree/props.ts @@ -16,6 +16,7 @@ export const treeProps = { }, treeData: PropTypes.array.def([]), params: PropTypes.object.def(() => ({})), + showLine: PropTypes.object.def(() => ({ showLeafIcon: false })), dynamicParams: PropTypes.oneOfType([ PropTypes.string, PropTypes.array,