Showing
1 changed file
with
16 additions
and
24 deletions
@@ -15,7 +15,7 @@ | @@ -15,7 +15,7 @@ | ||
15 | 15 | ||
16 | const loading = ref(false); | 16 | const loading = ref(false); |
17 | 17 | ||
18 | - const props = defineProps<{ | 18 | + defineProps<{ |
19 | record: DeviceRecord; | 19 | record: DeviceRecord; |
20 | }>(); | 20 | }>(); |
21 | const go = useGo(); | 21 | const go = useGo(); |
@@ -35,7 +35,7 @@ | @@ -35,7 +35,7 @@ | ||
35 | }, | 35 | }, |
36 | }, | 36 | }, |
37 | { | 37 | { |
38 | - field: 'deviceType', | 38 | + field: 'deviceTypeName', |
39 | label: '设备类型', | 39 | label: '设备类型', |
40 | render: (_, data) => { | 40 | render: (_, data) => { |
41 | console.log(data); | 41 | console.log(data); |
@@ -55,7 +55,7 @@ | @@ -55,7 +55,7 @@ | ||
55 | ); | 55 | ); |
56 | }, | 56 | }, |
57 | }, | 57 | }, |
58 | - () => `${data.deviceType}(${data.deviceCount})` | 58 | + () => `${data.deviceTypeName}(${data.deviceCount})` |
59 | ); | 59 | ); |
60 | }, | 60 | }, |
61 | }, | 61 | }, |
@@ -87,7 +87,7 @@ | @@ -87,7 +87,7 @@ | ||
87 | ); | 87 | ); |
88 | if (!error) { | 88 | if (!error) { |
89 | const record = data.find((item) => item.itemValue === deviceType); | 89 | const record = data.find((item) => item.itemValue === deviceType); |
90 | - return { deviceType: record?.itemText }; | 90 | + return { deviceTypeName: record?.itemText }; |
91 | } | 91 | } |
92 | return {}; | 92 | return {}; |
93 | }; | 93 | }; |
@@ -112,30 +112,22 @@ | @@ -112,30 +112,22 @@ | ||
112 | return {}; | 112 | return {}; |
113 | }; | 113 | }; |
114 | 114 | ||
115 | - async function getValues() { | ||
116 | - const { defaultRuleChainId, deviceType, defaultQueueName } = props.record; | ||
117 | - return await Promise.all([ | ||
118 | - findDeviceType(deviceType), | ||
119 | - findHandleQueue(defaultQueueName), | ||
120 | - findRuleChain(defaultRuleChainId), | ||
121 | - ]); | ||
122 | - } | ||
123 | - | ||
124 | - const renderProductInfo = async () => { | 115 | + const renderProductInfo = async (record: DeviceRecord) => { |
125 | try { | 116 | try { |
126 | data.value = {} as unknown as DeviceRecord; | 117 | data.value = {} as unknown as DeviceRecord; |
127 | loading.value = true; | 118 | loading.value = true; |
128 | - const values = await getValues(); | ||
129 | - // const { defaultRuleChainId, deviceType, defaultQueueName } = props.record; | ||
130 | - // data.value = props.record; | ||
131 | - // const values = await Promise.all([ | ||
132 | - // findDeviceType(deviceType), | ||
133 | - // findHandleQueue(defaultQueueName), | ||
134 | - // findRuleChain(defaultRuleChainId), | ||
135 | - // ]); | 119 | + const { defaultRuleChainId, deviceType, defaultQueueName } = record; |
120 | + if (![defaultRuleChainId, deviceType, defaultQueueName].some(Boolean)) { | ||
121 | + return; | ||
122 | + } | ||
123 | + data.value = record; | ||
124 | + const values = await Promise.all([ | ||
125 | + findDeviceType(deviceType), | ||
126 | + findHandleQueue(defaultQueueName), | ||
127 | + findRuleChain(defaultRuleChainId), | ||
128 | + ]); | ||
136 | const value = values.reduce((prev, next) => ({ ...prev, ...next }), {}); | 129 | const value = values.reduce((prev, next) => ({ ...prev, ...next }), {}); |
137 | - data.value = Object.assign(unref(data), props.record, value); | ||
138 | - console.log(data.value); | 130 | + data.value = Object.assign(unref(data), value); |
139 | setDescProps({ data: unref(data) }); | 131 | setDescProps({ data: unref(data) }); |
140 | } catch (error) { | 132 | } catch (error) { |
141 | throw error; | 133 | throw error; |