fix: 修改bug

This commit is contained in:
100011797 2023-03-23 15:08:36 +08:00
parent e9d5c8e9c3
commit 73351235ce
4 changed files with 28 additions and 23 deletions

View File

@ -328,6 +328,7 @@ const columns = [
title: 'ID', title: 'ID',
dataIndex: 'id', dataIndex: 'id',
key: 'id', key: 'id',
ellipsis: true,
search: { search: {
type: 'string', type: 'string',
defaultTermType: 'eq', defaultTermType: 'eq',
@ -337,6 +338,7 @@ const columns = [
title: '设备名称', title: '设备名称',
dataIndex: 'name', dataIndex: 'name',
key: 'name', key: 'name',
ellipsis: true,
search: { search: {
type: 'string', type: 'string',
first: true, first: true,
@ -346,6 +348,7 @@ const columns = [
title: '产品名称', title: '产品名称',
dataIndex: 'productName', dataIndex: 'productName',
key: 'productName', key: 'productName',
ellipsis: true,
search: { search: {
type: 'select', type: 'select',
rename: 'productId', rename: 'productId',
@ -367,6 +370,7 @@ const columns = [
dataIndex: 'createTime', dataIndex: 'createTime',
key: 'createTime', key: 'createTime',
scopedSlots: true, scopedSlots: true,
width: 200,
search: { search: {
type: 'date', type: 'date',
}, },

View File

@ -267,26 +267,26 @@ const columns = [
}), }),
}, },
}, },
{ // {
key: 'productId$product-info', // key: 'productId$product-info',
dataIndex: 'productId$product-info', // dataIndex: 'productId$product-info',
title: '接入方式', // title: '',
hideInTable: true, // hideInTable: true,
search: { // search: {
type: 'select', // type: 'select',
options: () => // options: () =>
new Promise((resolve) => { // new Promise((resolve) => {
queryGatewayList({}).then((resp: any) => { // queryGatewayList({}).then((resp: any) => {
resolve( // resolve(
resp.result.map((item: any) => ({ // resp.result.map((item: any) => ({
label: item.name, // label: item.name,
value: `accessId is ${item.id}`, // value: `accessId is ${item.id}`,
})), // })),
); // );
}); // });
}), // }),
}, // },
}, // },
{ {
dataIndex: 'deviceType', dataIndex: 'deviceType',
title: '设备类型', title: '设备类型',

View File

@ -20,7 +20,7 @@
<j-col :span="8">已下发数量{{ countErr + count }}</j-col> <j-col :span="8">已下发数量{{ countErr + count }}</j-col>
</j-row> </j-row>
<div v-if="!flag"> <div v-if="!flag">
<j-textarea :rows="20" :value="JSON.stringify(errMessage)" /> <j-textarea :rows="10" :value="JSON.stringify(errMessage)" />
</div> </div>
</j-modal> </j-modal>
</template> </template>
@ -86,7 +86,7 @@ const getData = () => {
et += 1; et += 1;
countErr.value = et; countErr.value = et;
flag.value = false; flag.value = false;
if (errMessages.length <= 5) { if (errMessages.length < 5) {
errMessages.push({ ...res }); errMessages.push({ ...res });
errMessage.value = [...errMessages]; errMessage.value = [...errMessages];
} }

View File

@ -169,7 +169,8 @@ const onCancel = () => {
<style lang="less" scoped> <style lang="less" scoped>
.search { .search {
padding: 0 0 0 24px; padding: 0px;
margin: 0px;
} }
.alert { .alert {
height: 40px; height: 40px;