Commit bc2f92fef8868ae10b75a27a965cf3f01d086624

Authored by fengtao
1 parent 3f242e9e

feat:产品详情新增设备类型数量跳转

@@ -275,8 +275,9 @@ @@ -275,8 +275,9 @@
275 const deviceProfileId = ref(''); 275 const deviceProfileId = ref('');
276 count.value = Number(getParams('count')); 276 count.value = Number(getParams('count'));
277 deviceProfileId.value = getParams('deviceProfileId') || ''; 277 deviceProfileId.value = getParams('deviceProfileId') || '';
  278 + console.log(deviceProfileId.value);
278 const setRowClassName = async () => { 279 const setRowClassName = async () => {
279 - if (deviceProfileId.value !== '') { 280 + if (deviceProfileId.value !== undefined) {
280 const { items } = await devicePage({ 281 const { items } = await devicePage({
281 page: 1, 282 page: 1,
282 pageSize: count.value === 0 ? 10 : count.value, 283 pageSize: count.value === 0 ? 10 : count.value,
@@ -38,6 +38,7 @@ @@ -38,6 +38,7 @@
38 field: 'deviceType', 38 field: 'deviceType',
39 label: '设备类型', 39 label: '设备类型',
40 render: (_, data) => { 40 render: (_, data) => {
  41 + console.log(data);
41 return h( 42 return h(
42 Button, 43 Button,
43 { 44 {
@@ -111,21 +112,30 @@ @@ -111,21 +112,30 @@
111 return {}; 112 return {};
112 }; 113 };
113 114
114 - const renderProductInfo = async (record) => { 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 try { 125 try {
116 data.value = {} as unknown as DeviceRecord; 126 data.value = {} as unknown as DeviceRecord;
117 loading.value = true; 127 loading.value = true;
118 - const { defaultRuleChainId, deviceType, defaultQueueName } = props.record;  
119 - data.value = props.record;  
120 - const values = await Promise.all([  
121 - findDeviceType(deviceType),  
122 - findHandleQueue(defaultQueueName),  
123 - findRuleChain(defaultRuleChainId),  
124 - ]);  
125 - if (values) {  
126 - const value = values.reduce((prev, next) => ({ ...prev, ...next }), {});  
127 - data.value = Object.assign(unref(data), value, { deviceCount: record.deviceCount });  
128 - } 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 + // ]);
  136 + const value = values.reduce((prev, next) => ({ ...prev, ...next }), {});
  137 + data.value = Object.assign(unref(data), props.record, value);
  138 + console.log(data.value);
129 setDescProps({ data: unref(data) }); 139 setDescProps({ data: unref(data) });
130 } catch (error) { 140 } catch (error) {
131 throw error; 141 throw error;