Commit 522ffd00d55b94ed284538ef932a669bc925d3c2
Merge branch 'ft' into 'main_dev'
perf: DEFECT-1481 优化物模型内容说明多了空格和DEFECT-1484 优化物模型数据,第一次进入界面为图一,切换了列表模式后,样式变为图二了 See merge request yunteng/thingskit-front!801
Showing
3 changed files
with
4 additions
and
4 deletions
@@ -315,7 +315,7 @@ | @@ -315,7 +315,7 @@ | ||
315 | <ModeSwitchButton v-model:value="mode" @change="switchMode" /> | 315 | <ModeSwitchButton v-model:value="mode" @change="switchMode" /> |
316 | </div> | 316 | </div> |
317 | <List | 317 | <List |
318 | - v-if="mode === EnumTableCardMode.CARD" | 318 | + v-show="mode === EnumTableCardMode.CARD" |
319 | ref="listElRef" | 319 | ref="listElRef" |
320 | class="list-mode !px-2" | 320 | class="list-mode !px-2" |
321 | :data-source="socketInfo.originData" | 321 | :data-source="socketInfo.originData" |
@@ -85,7 +85,8 @@ | @@ -85,7 +85,8 @@ | ||
85 | }; | 85 | }; |
86 | const handleRecordContent = (record) => { | 86 | const handleRecordContent = (record) => { |
87 | if (!record?.request?.body) return; | 87 | if (!record?.request?.body) return; |
88 | - const jsonParams = record?.request?.body; | 88 | + if (Object.prototype.toString.call(record?.request?.body) !== '[object Object]') return; |
89 | + const jsonParams = record?.request?.body?.params; | ||
89 | commonModalInfo('命令下发内容', jsonParams); | 90 | commonModalInfo('命令下发内容', jsonParams); |
90 | }; | 91 | }; |
91 | const handleRecordResponseContent = (record) => { | 92 | const handleRecordResponseContent = (record) => { |
@@ -78,8 +78,7 @@ | @@ -78,8 +78,7 @@ | ||
78 | return deviceType === DeviceTypeEnum.SENSOR && transportType === 'TCP'; | 78 | return deviceType === DeviceTypeEnum.SENSOR && transportType === 'TCP'; |
79 | }); | 79 | }); |
80 | 80 | ||
81 | - const blockContent = `属性一般是设备的运行状态,如当前温度等;服务是设备可被调用的方法,支持定义参数,如执行某项任务;事件则是设备上报的 | ||
82 | -通知,如告警,需要被及时处理。`; | 81 | + const blockContent = `属性一般是指设备的运行状态,如当前温度等;服务是指设备可被调用的方法,支持定义参数,如执行某项任务;事件则是指设备上报的通知,如告警,需要被及时处理。`; |
83 | const activeKey = ref<FunctionType>(FunctionType.PROPERTIES); | 82 | const activeKey = ref<FunctionType>(FunctionType.PROPERTIES); |
84 | const size = ref('small'); | 83 | const size = ref('small'); |
85 | 84 |