done alarm

src/components/Common/WarnAlert/ListContainer.jsx

@@ -107,15 +107,15 @@ AN_26_3,5#压延机报警
 `;
 
 function AlarmListContainer(props) {
-  // const alarmList = useSelector((state) => state.alarm.list);
-  const alarmList = total
-    .split("\n")
-    .filter((str) => str.trim())
-    .map((item) => ({
-      id: item.split(",")[0],
-      title: item.split(",")[0],
-      content: item.split(",")[1],
-    }));
+  const alarmList = useSelector((state) => state.alarm.list);
+  // const alarmList = total
+  //   .split("\n")
+  //   .filter((str) => str.trim())
+  //   .map((item) => ({
+  //     id: item.split(",")[0],
+  //     title: item.split(",")[0],
+  //     content: item.split(",")[1],
+  //   }));
   return alarmList.map((alarm) => (
     <WarnAlert
       key={alarm.id}

src/components/Common/WarnAlert/position.json

@@ -1,34 +1,34 @@
 {
-  "AN_1_1": { "x": 0, "y": 0 },
-  "AN_1_2": { "x": 0, "y": 0 },
-  "AN_1_3": { "x": 0, "y": 0 },
-  "AN_1_4": { "x": 0, "y": 0 },
+  "AN_1_1": { "x": 650, "y": 645 },
+  "AN_1_2": { "x": 1450, "y": 540 },
+  "AN_1_3": { "x": 640, "y": 285 },
+  "AN_1_4": { "x": 720, "y": 645 },
   "AN_2_1": { "x": 1250, "y": 540 },
   "AN_2_2": { "x": 1200, "y": 540 },
-  "AN_2_3": { "x": 0, "y": 0 },
-  "AN_2_4": { "x": 0, "y": 0 },
-  "AN_3_1": { "x": 0, "y": 0 },
-  "AN_3_2": { "x": 0, "y": 0 },
-  "AN_3_3": { "x": 0, "y": 0 },
-  "AN_3_4": { "x": 0, "y": 0 },
-  "AN_4_1": { "x": 0, "y": 0 },
-  "AN_4_2": { "x": 0, "y": 0 },
-  "AN_4_3": { "x": 0, "y": 0 },
+  "AN_2_3": { "x": 1460, "y": 410 },
+  "AN_2_4": { "x": 650, "y": 420 },
+  "AN_3_1": { "x": 1360, "y": 380 },
+  "AN_3_2": { "x": 1360, "y": 380 },
+  "AN_3_3": { "x": 1360, "y": 420 },
+  "AN_3_4": { "x": 1360, "y": 420 },
+  "AN_4_1": { "x": 1350, "y": 460 },
+  "AN_4_2": { "x": 1350, "y": 460 },
+  "AN_4_3": { "x": 1270, "y": 320 },
   "AN_4_4": { "x": 900, "y": 420 },
-  "AN_5_1": { "x": 0, "y": 0 },
+  "AN_5_1": { "x": 650, "y": 645 },
   "AN_5_2": { "x": 980, "y": 420 },
   "AN_5_3": { "x": 1050, "y": 420 },
   "AN_5_4": { "x": 1130, "y": 420 },
   "AN_6_1": { "x": 1220, "y": 420 },
   "AN_6_2": { "x": 1290, "y": 420 },
-  "AN_6_3": { "x": 0, "y": 0 },
-  "AN_6_4": { "x": 0, "y": 0 },
+  "AN_6_3": { "x": 650, "y": 440 },
+  "AN_6_4": { "x": 1400, "y": 650 },
   "AN_7_1": { "x": 1450, "y": 540 },
   "AN_7_2": { "x": 1450, "y": 540 },
-  "AN_7_3": { "x": 0, "y": 0 },
-  "AN_7_4": { "x": 0, "y": 0 },
-  "AN_8_1": { "x": 0, "y": 0 },
-  "AN_8_2": { "x": 0, "y": 0 },
+  "AN_7_3": { "x": 1470, "y": 540 },
+  "AN_7_4": { "x": 1470, "y": 540 },
+  "AN_8_1": { "x": 1470, "y": 540 },
+  "AN_8_2": { "x": 1470, "y": 540 },
   "AN_8_3": { "x": 1480, "y": 540 },
   "AN_8_4": { "x": 1580, "y": 540 },
   "AN_9_1": { "x": 1700, "y": 540 },
@@ -38,13 +38,13 @@
   "AN_10_1": { "x": 1780, "y": 540 },
   "AN_10_2": { "x": 1390, "y": 540 },
   "AN_10_3": { "x": 1450, "y": 540 },
-  "AN_10_4": { "x": 0, "y": 0 },
-  "AN_11_1": { "x": 0, "y": 0 },
-  "AN_11_2": { "x": 0, "y": 0 },
-  "AN_11_3": { "x": 0, "y": 0 },
-  "AN_11_4": { "x": 0, "y": 0 },
-  "AN_12_1": { "x": 0, "y": 0 },
-  "AN_12_2": { "x": 0, "y": 0 },
+  "AN_10_4": { "x": 1400, "y": 650 },
+  "AN_11_1": { "x": 1450, "y": 480 },
+  "AN_11_2": { "x": 1450, "y": 480 },
+  "AN_11_3": { "x": 1450, "y": 480 },
+  "AN_11_4": { "x": 1450, "y": 480 },
+  "AN_12_1": { "x": 1450, "y": 480 },
+  "AN_12_2": { "x": 1450, "y": 480 },
   "AN_12_3": { "x": 1550, "y": 480 },
   "AN_12_4": { "x": 1650, "y": 480 },
   "AN_13_1": { "x": 1750, "y": 480 },
@@ -53,14 +53,14 @@
   "AN_13_4": { "x": 1910, "y": 480 },
   "AN_14_1": { "x": 1920, "y": 480 },
   "AN_14_2": { "x": 1450, "y": 480 },
-  "AN_14_3": { "x": 0, "y": 0 },
-  "AN_14_4": { "x": 0, "y": 0 },
-  "AN_15_1": { "x": 0, "y": 0 },
-  "AN_15_2": { "x": 0, "y": 0 },
-  "AN_15_3": { "x": 0, "y": 0 },
-  "AN_15_4": { "x": 0, "y": 0 },
-  "AN_16_1": { "x": 0, "y": 0 },
-  "AN_16_2": { "x": 0, "y": 0 },
+  "AN_14_3": { "x": 1450, "y": 480 },
+  "AN_14_4": { "x": 1400, "y": 650 },
+  "AN_15_1": { "x": 1450, "y": 430 },
+  "AN_15_2": { "x": 1450, "y": 430 },
+  "AN_15_3": { "x": 1470, "y": 430 },
+  "AN_15_4": { "x": 1470, "y": 430 },
+  "AN_16_1": { "x": 1470, "y": 430 },
+  "AN_16_2": { "x": 1470, "y": 430 },
   "AN_16_3": { "x": 1600, "y": 430 },
   "AN_16_4": { "x": 1700, "y": 430 },
   "AN_17_1": { "x": 1800, "y": 430 },
@@ -69,14 +69,14 @@
   "AN_17_4": { "x": 1960, "y": 430 },
   "AN_18_1": { "x": 1970, "y": 430 },
   "AN_18_2": { "x": 1450, "y": 430 },
-  "AN_18_3": { "x": 0, "y": 0 },
-  "AN_18_4": { "x": 0, "y": 0 },
-  "AN_19_1": { "x": 0, "y": 0 },
-  "AN_19_2": { "x": 0, "y": 0 },
-  "AN_19_3": { "x": 0, "y": 0 },
-  "AN_19_4": { "x": 0, "y": 0 },
-  "AN_20_1": { "x": 0, "y": 0 },
-  "AN_20_2": { "x": 0, "y": 0 },
+  "AN_18_3": { "x": 1450, "y": 430 },
+  "AN_18_4": { "x": 1400, "y": 650 },
+  "AN_19_1": { "x": 1450, "y": 370 },
+  "AN_19_2": { "x": 1450, "y": 370 },
+  "AN_19_3": { "x": 1460, "y": 370 },
+  "AN_19_4": { "x": 1460, "y": 370 },
+  "AN_20_1": { "x": 1460, "y": 370 },
+  "AN_20_2": { "x": 1460, "y": 370 },
   "AN_20_3": { "x": 1500, "y": 370 },
   "AN_20_4": { "x": 1600, "y": 370 },
   "AN_21_1": { "x": 1700, "y": 370 },
@@ -85,13 +85,13 @@
   "AN_21_4": { "x": 1860, "y": 370 },
   "AN_22_1": { "x": 1870, "y": 370 },
   "AN_22_2": { "x": 1450, "y": 370 },
-  "AN_22_3": { "x": 0, "y": 0 },
-  "AN_23_1": { "x": 0, "y": 0 },
-  "AN_23_2": { "x": 0, "y": 0 },
-  "AN_23_3": { "x": 0, "y": 0 },
-  "AN_23_4": { "x": 0, "y": 0 },
-  "AN_24_1": { "x": 0, "y": 0 },
-  "AN_24_2": { "x": 0, "y": 0 },
+  "AN_22_3": { "x": 1460, "y": 370 },
+  "AN_23_1": { "x": 1460, "y": 320 },
+  "AN_23_2": { "x": 1460, "y": 320 },
+  "AN_23_3": { "x": 1465, "y": 320 },
+  "AN_23_4": { "x": 1465, "y": 320 },
+  "AN_24_1": { "x": 1465, "y": 320 },
+  "AN_24_2": { "x": 1465, "y": 320 },
   "AN_24_3": { "x": 1480, "y": 320 },
   "AN_24_4": { "x": 1580, "y": 320 },
   "AN_25_1": { "x": 1680, "y": 320 },
@@ -100,5 +100,5 @@
   "AN_25_4": { "x": 1760, "y": 320 },
   "AN_26_1": { "x": 1770, "y": 320 },
   "AN_26_2": { "x": 1430, "y": 320 },
-  "AN_26_3": { "x": 0, "y": 0 }
+  "AN_26_3": { "x": 1460, "y": 320 }
 }