diff --git a/src/views/device/Product/Detail/DeviceAccess/index.vue b/src/views/device/Product/Detail/DeviceAccess/index.vue index b5448d3e..f4916bb9 100644 --- a/src/views/device/Product/Detail/DeviceAccess/index.vue +++ b/src/views/device/Product/Detail/DeviceAccess/index.vue @@ -130,7 +130,7 @@ 厂商 -
{{ slotProps.manufacturer }}
+ +
{{ slotProps.manufacturer }}
+
@@ -66,7 +68,7 @@
型号
- {{ slotProps.model }} + {{ slotProps.model }}
@@ -186,6 +188,7 @@ const columns = [ search: { type: 'string', }, + ellipsis: true, }, { title: '名称', @@ -195,12 +198,14 @@ const columns = [ type: 'string', first: true, }, + ellipsis: true, }, { title: '接入方式', dataIndex: 'provider', key: 'provider', scopedSlots: true, + width:120, search: { type: 'select', options: PROVIDER_OPTIONS, @@ -223,12 +228,14 @@ const columns = [ search: { type: 'string', }, + ellipsis: true, }, { title: '产品名称', dataIndex: 'productId', key: 'productId', scopedSlots: true, + ellipsis: true, search: { type: 'select', options: () => diff --git a/src/views/system/Department/components/AddDeviceOrProductDialog.vue b/src/views/system/Department/components/AddDeviceOrProductDialog.vue index cc8f8512..f6795640 100644 --- a/src/views/system/Department/components/AddDeviceOrProductDialog.vue +++ b/src/views/system/Department/components/AddDeviceOrProductDialog.vue @@ -27,8 +27,8 @@ :params="queryParams" :rowSelection="{ selectedRowKeys: table._selectedRowKeys.value, - onSelect: selectChange, - onSelectNone: ()=> table._selectedRowKeys.value = [], + onSelect: table.onSelectChange, + onSelectNone: table.cancelSelect, onSelectAll: selectAll }" :columns="columns" @@ -266,6 +266,7 @@ const table: any = { selectedRowKeys.splice(index, 1); table.selectedRows.splice(index, 1); } + table._selectedRowKeys.value = selectedRowKeys }, // 取消全选 cancelSelect: () => { @@ -438,17 +439,21 @@ const selectAll = (selected: Boolean, selectedRows: any,changeRows:any) => { changeRows.map((i: any) => { if (!table._selectedRowKeys.value.includes(i.id)) { table._selectedRowKeys.value.push(i.id) + table.selectedRows.push(i) } }) } else { const arr = changeRows.map((item: any) => item.id) const _ids: string[] = []; - table._selectedRowKeys.value.map((i: any) => { - if (!arr.includes(i)) { - _ids.push(i) + const _row: any[] = []; + table.selectedRows.map((i: any) => { + if (!arr.includes(i.id)) { + _ids.push(i.id) + _row.push(i) } }) - table._selectedRowKeys.value = _ids + table._selectedRowKeys.value = _ids; + table.selectedRows = _row; } } const cancel = () => { diff --git a/src/views/system/Department/components/EditDepartmentDialog.vue b/src/views/system/Department/components/EditDepartmentDialog.vue index 0e8251ef..c5a1fbe5 100644 --- a/src/views/system/Department/components/EditDepartmentDialog.vue +++ b/src/views/system/Department/components/EditDepartmentDialog.vue @@ -175,6 +175,7 @@ const form = reactive({ submit: () => { const api = form.data.id ? updateDepartment_api : addDepartment_api; + form.data.parentId = form.data.parentId ? form.data.parentId : ''; return api(form.data); }, });