diff --git a/src/views/device/Instance/index.vue b/src/views/device/Instance/index.vue index 30270b39..2d3b82b7 100644 --- a/src/views/device/Instance/index.vue +++ b/src/views/device/Instance/index.vue @@ -328,6 +328,7 @@ const columns = [ title: 'ID', dataIndex: 'id', key: 'id', + ellipsis: true, search: { type: 'string', defaultTermType: 'eq', @@ -337,6 +338,7 @@ const columns = [ title: '设备名称', dataIndex: 'name', key: 'name', + ellipsis: true, search: { type: 'string', first: true, @@ -346,6 +348,7 @@ const columns = [ title: '产品名称', dataIndex: 'productName', key: 'productName', + ellipsis: true, search: { type: 'select', rename: 'productId', @@ -367,6 +370,7 @@ const columns = [ dataIndex: 'createTime', key: 'createTime', scopedSlots: true, + width: 200, search: { type: 'date', }, diff --git a/src/views/edge/Device/index.vue b/src/views/edge/Device/index.vue index 9d9bc8cb..116442f4 100644 --- a/src/views/edge/Device/index.vue +++ b/src/views/edge/Device/index.vue @@ -267,26 +267,26 @@ const columns = [ }), }, }, - { - key: 'productId$product-info', - dataIndex: 'productId$product-info', - title: '接入方式', - hideInTable: true, - search: { - type: 'select', - options: () => - new Promise((resolve) => { - queryGatewayList({}).then((resp: any) => { - resolve( - resp.result.map((item: any) => ({ - label: item.name, - value: `accessId is ${item.id}`, - })), - ); - }); - }), - }, - }, + // { + // key: 'productId$product-info', + // dataIndex: 'productId$product-info', + // title: '接入方式', + // hideInTable: true, + // search: { + // type: 'select', + // options: () => + // new Promise((resolve) => { + // queryGatewayList({}).then((resp: any) => { + // resolve( + // resp.result.map((item: any) => ({ + // label: item.name, + // value: `accessId is ${item.id}`, + // })), + // ); + // }); + // }), + // }, + // }, { dataIndex: 'deviceType', title: '设备类型', diff --git a/src/views/edge/Resource/Issue/Result.vue b/src/views/edge/Resource/Issue/Result.vue index 52589e13..339ddb2d 100644 --- a/src/views/edge/Resource/Issue/Result.vue +++ b/src/views/edge/Resource/Issue/Result.vue @@ -20,7 +20,7 @@ 已下发数量:{{ countErr + count }}
- +
@@ -86,7 +86,7 @@ const getData = () => { et += 1; countErr.value = et; flag.value = false; - if (errMessages.length <= 5) { + if (errMessages.length < 5) { errMessages.push({ ...res }); errMessage.value = [...errMessages]; } diff --git a/src/views/edge/Resource/Issue/index.vue b/src/views/edge/Resource/Issue/index.vue index 5bab28ac..b12f7554 100644 --- a/src/views/edge/Resource/Issue/index.vue +++ b/src/views/edge/Resource/Issue/index.vue @@ -169,7 +169,8 @@ const onCancel = () => {