Commit eba9e51c88728b95f6c8dbcc3e149539fd6d508e
Merge branch 'cherry-pick-90c541f9' into 'main'
fix: 修复看板组件湿度符号不对应 See merge request yunteng/thingskit-front!1409
Showing
5 changed files
with
5 additions
and
5 deletions
| @@ -24,7 +24,7 @@ export const option: PublicPresetOptions = { | @@ -24,7 +24,7 @@ export const option: PublicPresetOptions = { | ||
| 24 | [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: false, | 24 | [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: false, |
| 25 | [ComponentConfigFieldEnum.MAX_NUMBER]: 100, | 25 | [ComponentConfigFieldEnum.MAX_NUMBER]: 100, |
| 26 | [ComponentConfigFieldEnum.SHOW_TIME]: false, | 26 | [ComponentConfigFieldEnum.SHOW_TIME]: false, |
| 27 | - [ComponentConfigFieldEnum.UNIT]: '℃', | 27 | + [ComponentConfigFieldEnum.UNIT]: '%RH', |
| 28 | [ComponentConfigFieldEnum.POINTER_COLOR]: '#15E2C6', | 28 | [ComponentConfigFieldEnum.POINTER_COLOR]: '#15E2C6', |
| 29 | [ComponentConfigFieldEnum.INSTRUMENT_PANEL_COLOR]: '#61D4C5', | 29 | [ComponentConfigFieldEnum.INSTRUMENT_PANEL_COLOR]: '#61D4C5', |
| 30 | [ComponentConfigFieldEnum.FONT_SIZE]: 14, | 30 | [ComponentConfigFieldEnum.FONT_SIZE]: 14, |
| @@ -22,7 +22,7 @@ export const option: PublicPresetOptions = { | @@ -22,7 +22,7 @@ export const option: PublicPresetOptions = { | ||
| 22 | [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: false, | 22 | [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: false, |
| 23 | [ComponentConfigFieldEnum.SHOW_TIME]: false, | 23 | [ComponentConfigFieldEnum.SHOW_TIME]: false, |
| 24 | [ComponentConfigFieldEnum.PROGRESS_BAR_CIRCLE]: false, | 24 | [ComponentConfigFieldEnum.PROGRESS_BAR_CIRCLE]: false, |
| 25 | - [ComponentConfigFieldEnum.UNIT]: '℃', | 25 | + [ComponentConfigFieldEnum.UNIT]: '%RH', |
| 26 | [ComponentConfigFieldEnum.POINTER_COLOR]: '#15E2C6', | 26 | [ComponentConfigFieldEnum.POINTER_COLOR]: '#15E2C6', |
| 27 | [ComponentConfigFieldEnum.INSTRUMENT_PANEL_COLOR]: '#61D4C5', | 27 | [ComponentConfigFieldEnum.INSTRUMENT_PANEL_COLOR]: '#61D4C5', |
| 28 | [ComponentConfigFieldEnum.MAX_NUMBER]: 100, | 28 | [ComponentConfigFieldEnum.MAX_NUMBER]: 100, |
| @@ -22,7 +22,7 @@ export const option: PublicPresetOptions = { | @@ -22,7 +22,7 @@ export const option: PublicPresetOptions = { | ||
| 22 | [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: false, | 22 | [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: false, |
| 23 | [ComponentConfigFieldEnum.SHOW_TIME]: false, | 23 | [ComponentConfigFieldEnum.SHOW_TIME]: false, |
| 24 | [ComponentConfigFieldEnum.MAX_NUMBER]: 100, | 24 | [ComponentConfigFieldEnum.MAX_NUMBER]: 100, |
| 25 | - [ComponentConfigFieldEnum.UNIT]: 'kw', | 25 | + [ComponentConfigFieldEnum.UNIT]: 'kw/h', |
| 26 | [ComponentConfigFieldEnum.FONT_SIZE]: 14, | 26 | [ComponentConfigFieldEnum.FONT_SIZE]: 14, |
| 27 | [ComponentConfigFieldEnum.VALUE_SIZE]: 14, | 27 | [ComponentConfigFieldEnum.VALUE_SIZE]: 14, |
| 28 | }; | 28 | }; |
| @@ -50,7 +50,7 @@ | @@ -50,7 +50,7 @@ | ||
| 50 | value: 66, | 50 | value: 66, |
| 51 | fontColor: '#1E8667', | 51 | fontColor: '#1E8667', |
| 52 | backgroundColor: '#1E8667', | 52 | backgroundColor: '#1E8667', |
| 53 | - unit: '℃', | 53 | + unit: '%RH', |
| 54 | deviceName: '温湿度', | 54 | deviceName: '温湿度', |
| 55 | attribute: '湿度', | 55 | attribute: '湿度', |
| 56 | id: buildUUID(), | 56 | id: buildUUID(), |
| @@ -74,7 +74,7 @@ | @@ -74,7 +74,7 @@ | ||
| 74 | deviceName: '温湿度', | 74 | deviceName: '温湿度', |
| 75 | attributeName: '湿度', | 75 | attributeName: '湿度', |
| 76 | icon: 'guangzhaoqiangdu', | 76 | icon: 'guangzhaoqiangdu', |
| 77 | - unit: '℃', | 77 | + unit: '%RH', |
| 78 | iconColor: '#FFA000', | 78 | iconColor: '#FFA000', |
| 79 | fontColor: '#FFA000', | 79 | fontColor: '#FFA000', |
| 80 | fontSize: 16, | 80 | fontSize: 16, |