Commit 3a4f3218cfe3bb34776044da650ff2b2d9e9e395

Authored by loveumiko
1 parent 9ed0e7cf

fix: 修复仪表盘设置单位无效

@@ -148,6 +148,7 @@ export const getFormSchemas = (event: EventTypeEnum): FormSchema[] => { @@ -148,6 +148,7 @@ export const getFormSchemas = (event: EventTypeEnum): FormSchema[] => {
148 [FormFieldsEnum.SERVICE]: undefined, 148 [FormFieldsEnum.SERVICE]: undefined,
149 [FormFieldsEnum.CUSTOM_COMMAND]: null, 149 [FormFieldsEnum.CUSTOM_COMMAND]: null,
150 [FormFieldsEnum.WAY]: CommandWayEnum.ONE_WAY, 150 [FormFieldsEnum.WAY]: CommandWayEnum.ONE_WAY,
  151 + [FormFieldsEnum.THINGS_MODEL]: null,
151 }) 152 })
152 }, 153 },
153 } 154 }
@@ -205,6 +206,9 @@ export const getFormSchemas = (event: EventTypeEnum): FormSchema[] => { @@ -205,6 +206,9 @@ export const getFormSchemas = (event: EventTypeEnum): FormSchema[] => {
205 formModel[FormFieldsEnum.THINGS_MODEL] = value ? options : null 206 formModel[FormFieldsEnum.THINGS_MODEL] = value ? options : null
206 formModel.callType = options.callType 207 formModel.callType = options.callType
207 }, 208 },
  209 + onChange(value: string | number | undefined) { // 因为select不会执行清除选择 所以使用change时间
  210 + if (!value) formModel[FormFieldsEnum.THINGS_MODEL] = null
  211 + },
208 onOptionsChange(options: ThingsModel[]) { 212 onOptionsChange(options: ThingsModel[]) {
209 const service = formModel[FormFieldsEnum.SERVICE] 213 const service = formModel[FormFieldsEnum.SERVICE]
210 if (service) { 214 if (service) {
@@ -31,9 +31,15 @@ onMounted(() => { @@ -31,9 +31,15 @@ onMounted(() => {
31 31
32 const onReceiveDataSourceMessage = (commandSource: CommandSource, message: SubscriptionUpdateMsg) => { 32 const onReceiveDataSourceMessage = (commandSource: CommandSource, message: SubscriptionUpdateMsg) => {
33 const { data } = commandSource 33 const { data } = commandSource
  34 + const { chartOption } = data || {}
  35 + const { unit } = chartOption || {}
34 const { attr } = data as NodeDataDataSourceJsonType 36 const { attr } = data as NodeDataDataSourceJsonType
35 const { latestValue } = useLatestMessageValue(message.data, attr) 37 const { latestValue } = useLatestMessageValue(message.data, attr)
36 - unref(chartInstance)?.setOption({ series: [{ data: [{ value: latestValue }] }] } as EChartsOption) 38 + unref(chartInstance)?.setOption({
  39 + series: [{
  40 + data: [{ value: latestValue }], detail: { formatter: `{value} ${unit || '℃'}` },
  41 + }],
  42 + } as EChartsOption)
37 } 43 }
38 44
39 const { onMessage } = useOnMessage({ onReceiveDataSourceMessage }) 45 const { onMessage } = useOnMessage({ onReceiveDataSourceMessage })