Commit 17886e0fc694b3ff323fef316fa4d33cf3ad52e7
Merge branch 'fix/product-transport-configuration' into 'main_dev'
fix: 修复产品详情传输配置回显错误 See merge request yunteng/thingskit-front!1241
Showing
2 changed files
with
6 additions
and
1 deletions
| @@ -68,6 +68,7 @@ | @@ -68,6 +68,7 @@ | ||
| 68 | { | 68 | { |
| 69 | field: 'authScriptId', | 69 | field: 'authScriptId', |
| 70 | label: '鉴权脚本', | 70 | label: '鉴权脚本', |
| 71 | + show: () => props.record.protocol !== TCPProtocolTypeEnum.MODBUS_RTU, | ||
| 71 | render: (value: string) => { | 72 | render: (value: string) => { |
| 72 | return ( | 73 | return ( |
| 73 | value && | 74 | value && |
| @@ -81,6 +82,7 @@ | @@ -81,6 +82,7 @@ | ||
| 81 | { | 82 | { |
| 82 | field: 'upScriptId', | 83 | field: 'upScriptId', |
| 83 | label: '上行脚本', | 84 | label: '上行脚本', |
| 85 | + show: () => props.record.protocol !== TCPProtocolTypeEnum.MODBUS_RTU, | ||
| 84 | render: (value: string) => { | 86 | render: (value: string) => { |
| 85 | return ( | 87 | return ( |
| 86 | value && | 88 | value && |
| @@ -23,7 +23,10 @@ | @@ -23,7 +23,10 @@ | ||
| 23 | <section> | 23 | <section> |
| 24 | <DefaultConfiguration | 24 | <DefaultConfiguration |
| 25 | :record="getTransportInfo" | 25 | :record="getTransportInfo" |
| 26 | - v-if="getTransportInfo.type === TransportTypeEnum.DEFAULT || TransportTypeEnum.GBT28181" | 26 | + v-if=" |
| 27 | + getTransportInfo.type === TransportTypeEnum.DEFAULT || | ||
| 28 | + getTransportInfo.type === TransportTypeEnum.GBT28181 | ||
| 29 | + " | ||
| 27 | /> | 30 | /> |
| 28 | 31 | ||
| 29 | <MQTTConfiguration | 32 | <MQTTConfiguration |