fix: 解决看板组件之间的数据冲突问题

@@ -126,6 +126,7 @@ export interface MasterDeviceList {
   name: string;
   name: string;
   label?: string;
   label?: string;
   value?: string;
   value?: string;
+  alias?: string;
 }
 }
 
 
 export interface ComponentInfoDetail {
 export interface ComponentInfoDetail {

@@ -135,11 +135,11 @@
         time: 0,
         time: 0,
       };
       };
     }) as any;
     }) as any;
-    const { data } = message;
-    const alarmList = data?.data;
+    const { data, update } = message;
+    const alarmList = data?.data || update;
     const uniData = getReduce(alarmList); //去重得到最新的事件对象
     const uniData = getReduce(alarmList); //去重得到最新的事件对象
 
 
-    if (!data?.data.length) return;
+    // if (!data?.data.length) return;
     uniData.forEach((item) => {
     uniData.forEach((item) => {
       alarmStatusList.value?.forEach((item1) => {
       alarmStatusList.value?.forEach((item1) => {
         if (item.entityId.id == item1.id) {
         if (item.entityId.id == item1.id) {

@@ -147,8 +147,9 @@
 
 
   const updateFn = (message: ReceiveAlarmDataCmdsMessageType) => {
   const updateFn = (message: ReceiveAlarmDataCmdsMessageType) => {
     const { data } = message || {};
     const { data } = message || {};
+    if (!data?.data) return;
     const tableList = ref<any>(
     const tableList = ref<any>(
-      data?.data.map((item) => {
+      data?.data?.map((item) => {
         return {
         return {
           time: item.createdTime,
           time: item.createdTime,
           device: item.originatorName,
           device: item.originatorName,

@@ -104,7 +104,7 @@
   const updateFn: MultipleDataFetchUpdateFn = async (message, deviceId, attribute) => {
   const updateFn: MultipleDataFetchUpdateFn = async (message, deviceId, attribute) => {
     forEachGroupMessage(message, deviceId, attribute, (attribute, value) => {
     forEachGroupMessage(message, deviceId, attribute, (attribute, value) => {
       controlList.value.forEach((item) => {
       controlList.value.forEach((item) => {
-        if (item.id === deviceId && item.attribute === attribute) {
+        if (item.id === deviceId && item.attribute === attribute && value) {
           item.checked = Boolean(getNumberValue(value));
           item.checked = Boolean(getNumberValue(value));
         }
         }
       });
       });

@@ -79,6 +79,7 @@
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
     const { data = {} } = message;
     const { data = {} } = message;
     const [latest] = data[attribute] || [];
     const [latest] = data[attribute] || [];
+    if (!latest.length) return;
     const [timespan, value] = latest;
     const [timespan, value] = latest;
     time.value = timespan;
     time.value = timespan;
     currentValue.value = Number(value);
     currentValue.value = Number(value);

@@ -70,6 +70,7 @@
     const { data = {} } = message;
     const { data = {} } = message;
     const [latest] = data[attribute] || [];
     const [latest] = data[attribute] || [];
     const [timespan, value] = latest;
     const [timespan, value] = latest;
+    if (!latest.length) return;
     time.value = timespan;
     time.value = timespan;
     currentValue.value = Number(value);
     currentValue.value = Number(value);
   };
   };

@@ -50,6 +50,7 @@
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
     const { data = {} } = message;
     const { data = {} } = message;
     const [latest] = data[attribute] || [];
     const [latest] = data[attribute] || [];
+    if (!latest.length) return;
     const [timespan, value] = latest;
     const [timespan, value] = latest;
     time.value = timespan;
     time.value = timespan;
 
 

@@ -65,6 +65,7 @@
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
     const { data = {} } = message;
     const { data = {} } = message;
     const [latest] = data[attribute] || [];
     const [latest] = data[attribute] || [];
+    if (!latest.length) return;
     const [timespan, value] = latest;
     const [timespan, value] = latest;
     time.value = timespan;
     time.value = timespan;
     currentValue.value = isNaN(value as unknown as number) ? 0 : Number(value);
     currentValue.value = isNaN(value as unknown as number) ? 0 : Number(value);

@@ -166,6 +166,7 @@
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
     const { data = {} } = message;
     const { data = {} } = message;
     const [latest] = data[attribute] || [];
     const [latest] = data[attribute] || [];
+    if (!latest.length) return;
     const [timespan, value] = latest;
     const [timespan, value] = latest;
     time.value = timespan;
     time.value = timespan;
     updateChart(isNaN(value as unknown as number) ? 0 : Number(value));
     updateChart(isNaN(value as unknown as number) ? 0 : Number(value));

@@ -177,6 +177,7 @@
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
     const { data = {} } = message;
     const { data = {} } = message;
     const [latest] = data[attribute] || [];
     const [latest] = data[attribute] || [];
+    if (!latest.length) return;
     const [timespan, value] = latest;
     const [timespan, value] = latest;
     time.value = timespan;
     time.value = timespan;
     updateChart(isNaN(value as unknown as number) ? 0 : Number(value));
     updateChart(isNaN(value as unknown as number) ? 0 : Number(value));

@@ -261,7 +261,7 @@
   const updateFn: MultipleDataFetchUpdateFn = (message, deviceId, attribute) => {
   const updateFn: MultipleDataFetchUpdateFn = (message, deviceId, attribute) => {
     forEachGroupMessage(message, deviceId, attribute, (attribute, value) => {
     forEachGroupMessage(message, deviceId, attribute, (attribute, value) => {
       series.value.forEach((item) => {
       series.value.forEach((item) => {
-        if (item.id === deviceId && item.attribute === attribute) {
+        if (item.id === deviceId && item.attribute === attribute && value) {
           item.value = getNumberValue(value);
           item.value = getNumberValue(value);
           // time.value = timespan;
           // time.value = timespan;
         }
         }

@@ -148,6 +148,7 @@
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
     const { data = {} } = message;
     const { data = {} } = message;
     const [latest] = data[attribute] || [];
     const [latest] = data[attribute] || [];
+    if (!latest.length) return;
     const [timespan, value] = latest;
     const [timespan, value] = latest;
     time.value = timespan;
     time.value = timespan;
     updateChart(isNaN(value as unknown as number) ? 0 : Number(value));
     updateChart(isNaN(value as unknown as number) ? 0 : Number(value));

@@ -181,6 +181,7 @@
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
     const { data = {} } = message;
     const { data = {} } = message;
     const [latest] = data[attribute] || [];
     const [latest] = data[attribute] || [];
+    if (!latest.length) return;
     const [timespan, value] = latest;
     const [timespan, value] = latest;
     time.value = timespan;
     time.value = timespan;
     updateChart(isNaN(value as unknown as number) ? 0 : Number(value));
     updateChart(isNaN(value as unknown as number) ? 0 : Number(value));

@@ -157,6 +157,7 @@
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
     const { data = {} } = message;
     const { data = {} } = message;
     const [latest] = data[attribute] || [];
     const [latest] = data[attribute] || [];
+    if (!latest.length) return;
     const [timespan, value] = latest;
     const [timespan, value] = latest;
     time.value = timespan;
     time.value = timespan;
     updateChartFn(isNaN(value as unknown as number) ? 0 : Number(value));
     updateChartFn(isNaN(value as unknown as number) ? 0 : Number(value));

@@ -32,7 +32,7 @@
       );
       );
       const options = deviceList
       const options = deviceList
         .filter((item) => item.tbDeviceId === deviceRecord.deviceId)
         .filter((item) => item.tbDeviceId === deviceRecord.deviceId)
-        .map((item) => ({ ...item, label: item.name, value: item.tbDeviceId }));
+        .map((item) => ({ ...item, label: item.alias || item.name, value: item.tbDeviceId }));
 
 
       const attKey = dataSource.map((item) => ({
       const attKey = dataSource.map((item) => ({
         ...item,
         ...item,

@@ -47,6 +47,7 @@
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
     const { data = {} } = message;
     const { data = {} } = message;
     const [latest] = data[attribute] || [];
     const [latest] = data[attribute] || [];
+    if (!latest.length) return;
     const [timespan, value] = latest;
     const [timespan, value] = latest;
     time.value = timespan;
     time.value = timespan;
     isOpenClose.value = Boolean(getNumberValue(value));
     isOpenClose.value = Boolean(getNumberValue(value));

@@ -49,6 +49,7 @@
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
     const { data = {} } = message;
     const { data = {} } = message;
     const [latest] = data[attribute] || [];
     const [latest] = data[attribute] || [];
+    if (!latest.length) return;
     const [timespan, value] = latest;
     const [timespan, value] = latest;
     time.value = timespan;
     time.value = timespan;
     isOpenClose.value = Boolean(getNumberValue(value));
     isOpenClose.value = Boolean(getNumberValue(value));

@@ -156,7 +156,6 @@
   onMounted(() => {
   onMounted(() => {
     initial();
     initial();
     // !props.config.option.uuid && randomFn();
     // !props.config.option.uuid && randomFn();
-    !props.config.option.uuid;
   });
   });
 
 
   const resize = async () => {
   const resize = async () => {

@@ -13,12 +13,12 @@
         component: 'Input',
         component: 'Input',
         defaultValue: option.unit,
         defaultValue: option.unit,
       },
       },
-      {
-        field: ComponentConfigFieldEnum.SHOW_DEVICE_NAME,
-        label: '显示设备名称',
-        component: 'Checkbox',
-        defaultValue: option.showDeviceName,
-      },
+      // {
+      //   field: ComponentConfigFieldEnum.SHOW_DEVICE_NAME,
+      //   label: '显示设备名称',
+      //   component: 'Checkbox',
+      //   defaultValue: option.showDeviceName,
+      // },
     ],
     ],
     showActionButtonGroup: false,
     showActionButtonGroup: false,
     labelWidth: 120,
     labelWidth: 120,

@@ -86,7 +86,11 @@
   const getDesign = computed(() => {
   const getDesign = computed(() => {
     const { persetOption, option } = props.config;
     const { persetOption, option } = props.config;
     const { dataSource = [] } = option || {};
     const { dataSource = [] } = option || {};
-    const { unit: presetUnit, fontColor: presetFontColor } = persetOption || {};
+    const {
+      unit: presetUnit,
+      fontColor: presetFontColor,
+      // lineColor: persetLineColor,
+    } = persetOption || {};
 
 
     return {
     return {
       dataSource: dataSource?.map((item) => {
       dataSource: dataSource?.map((item) => {
@@ -97,12 +101,11 @@
           unit: unit ?? presetUnit,
           unit: unit ?? presetUnit,
           fontColor: fontColor ?? presetFontColor,
           fontColor: fontColor ?? presetFontColor,
           attribute,
           attribute,
-          attributeName,
-          attributeRename,
+          attributeName: attributeRename || attributeName,
           showDeviceName,
           showDeviceName,
-          deviceName,
-          deviceRename,
+          deviceName: deviceRename || deviceName,
           id: deviceId,
           id: deviceId,
+          // lineColor: lineColor || persetLineColor,
         };
         };
       }),
       }),
     };
     };
@@ -117,12 +120,16 @@
     unref(getDesign).dataSource.map((item) => {
     unref(getDesign).dataSource.map((item) => {
       return {
       return {
         type: 'line',
         type: 'line',
-        name: `${item.showDeviceName || item.deviceRename || item.deviceName} - ${
-          item.attributeRename || item.attributeName
-        }`,
+        name: `${item.deviceName} - ${item.attributeName}`,
         data: [] as { name: string; value: number }[],
         data: [] as { name: string; value: number }[],
         id: item.id,
         id: item.id,
         attribute: item.attribute,
         attribute: item.attribute,
+        // itemStyle: {
+        //   color: item.lineColor,
+        // },
+        // lineStyle: {
+        //   color: item.lineColor,
+        // },
       };
       };
     })
     })
   );
   );
@@ -131,15 +138,13 @@
 
 
   const updateFn: MultipleDataFetchUpdateFn = async (message, deviceId, attribute) => {
   const updateFn: MultipleDataFetchUpdateFn = async (message, deviceId, attribute) => {
     legendData.value = unref(getDesign).dataSource.map((item) => {
     legendData.value = unref(getDesign).dataSource.map((item) => {
-      return `${item.deviceRename || item.deviceName} - ${
-        item.attributeRename || item.attributeName
-      }`;
+      return `${item.deviceName} - ${item.attributeName}`;
     });
     });
     const list: IList | any = {};
     const list: IList | any = {};
     forEachGroupMessage(message, deviceId, attribute, (attribute, value, timespan) => {
     forEachGroupMessage(message, deviceId, attribute, (attribute, value, timespan) => {
       list.time = timespan || list.time;
       list.time = timespan || list.time;
       series.value.forEach((item) => {
       series.value.forEach((item) => {
-        if (item.id === deviceId && item.attribute === attribute) {
+        if (item.id === deviceId && item.attribute === attribute && value) {
           item.data.push({
           item.data.push({
             name: formatToDateTime(list.time, 'HH:mm:ss'),
             name: formatToDateTime(list.time, 'HH:mm:ss'),
             value: value,
             value: value,
@@ -169,6 +174,8 @@
             type,
             type,
             name,
             name,
             data,
             data,
+            // itemStyle,
+            // lineStyle,
           };
           };
         })
         })
       ),
       ),

@@ -31,6 +31,7 @@
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
     const { data = {} } = message;
     const { data = {} } = message;
     const [latest] = data[attribute] || [];
     const [latest] = data[attribute] || [];
+    if (!latest.length) return;
     const [_, value] = latest;
     const [_, value] = latest;
     currentValue.value = value;
     currentValue.value = value;
   };
   };

@@ -34,6 +34,7 @@
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
     const { data = {} } = message;
     const { data = {} } = message;
     const [info] = data[attribute] || [];
     const [info] = data[attribute] || [];
+    if (!info.length) return;
     const [timespan, value] = info;
     const [timespan, value] = info;
     currentValue.value = value;
     currentValue.value = value;
     time.value = timespan;
     time.value = timespan;

@@ -43,6 +43,7 @@
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
     const { data = {} } = message;
     const { data = {} } = message;
     const [latest] = data[attribute] || [];
     const [latest] = data[attribute] || [];
+    if (!latest.length) return;
     const [timespan, value] = latest;
     const [timespan, value] = latest;
     currentValue.value = value;
     currentValue.value = value;
     time.value = timespan;
     time.value = timespan;

@@ -40,6 +40,7 @@
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
   const updateFn: DataFetchUpdateFn = (message, attribute) => {
     const { data = {} } = message;
     const { data = {} } = message;
     const [info] = data[attribute] || [];
     const [info] = data[attribute] || [];
+    if (!info.length) return;
     const [_, value] = info;
     const [_, value] = info;
     currentValue.value = value;
     currentValue.value = value;
   };
   };

@@ -89,7 +89,7 @@
   const updateFn: MultipleDataFetchUpdateFn = (message, deviceId, attribute) => {
   const updateFn: MultipleDataFetchUpdateFn = (message, deviceId, attribute) => {
     forEachGroupMessage(message, deviceId, attribute, (attribute, value, timespan) => {
     forEachGroupMessage(message, deviceId, attribute, (attribute, value, timespan) => {
       percentList.value.forEach((item) => {
       percentList.value.forEach((item) => {
-        if (item.id === deviceId && item.attribute === attribute) {
+        if (item.id === deviceId && item.attribute === attribute && value) {
           item.value = getNumberValue(value);
           item.value = getNumberValue(value);
           time.value = timespan;
           time.value = timespan;
         }
         }

@@ -75,7 +75,7 @@
   const updateFn: MultipleDataFetchUpdateFn = (message, deviceId, attribute) => {
   const updateFn: MultipleDataFetchUpdateFn = (message, deviceId, attribute) => {
     forEachGroupMessage(message, deviceId, attribute, (attribute, value, timespan) => {
     forEachGroupMessage(message, deviceId, attribute, (attribute, value, timespan) => {
       updateSvgList.value.forEach((item) => {
       updateSvgList.value.forEach((item) => {
-        if (item.id === deviceId && item.attribute === attribute) {
+        if (item.id === deviceId && item.attribute === attribute && value) {
           item.value = getNumberValue(value);
           item.value = getNumberValue(value);
           time.value = timespan;
           time.value = timespan;
         }
         }