update ts->js

.gitignore

@@ -1,7 +1,7 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
 # dependencies
-/node_modules
+**/node_modules
 /.pnp
 .pnp.js
 

package.json

@@ -70,6 +70,7 @@
   "scripts": {
     "start": "node scripts/start.js",
     "build": "node scripts/build.js",
+    "server": "node websocket/server.js",
     "test": "node scripts/test.js"
   },
   "eslintConfig": {

src/components/Common/NatGasFlow/gasChart/chart.config.js

@@ -1,5 +1,4 @@
 import * as echarts from "echarts";
-import { randomInt } from "../../../../utils";
 
 export default function getOptions(seriesData, name) {
   const colors = [

src/components/Common/TodayFaultType/index.jsx

@@ -3,7 +3,6 @@ import GraphBase from "../GraphBase";
 import ReactECharts from "echarts-for-react";
 import { useSelector } from "react-redux";
 import { useEffect, useState } from "react";
-import { randomInt } from "../../../utils";
 import * as echarts from "echarts";
 
 function FaultType(props) {

src/utils/IS.js

@@ -1,8 +1,7 @@
 import { store } from "../store";
-import { MessageItem } from "./checkTypeHelper";
 
-export default function handler(msg: MessageEvent) {
+export default function handler(msg) {
-  let serializedData: MessageItem | null = null;
+  let serializedData = null;
   try {
     serializedData = JSON.parse(msg.data);
   } catch (error) {

src/utils/checkTypeHelper.ts

@@ -1,26 +0,0 @@
-type CheckTypeItem = {
-  checkDiscard?: boolean;
-  checkType: string;
-  checkNum: number;
-  ip?: string;
-  israDefectType?: string;
-  israSeriousGrade?: string;
-};
-
-type ProductLineItem = {
-  name: string;
-  sum: number;
-  data: CheckTypeItem[];
-};
-
-export type MessageItem = {
-  type: string;
-  name: string;
-  detData: {
-    checkType: string[];
-    dayStatistic?: ProductLineItem[];
-    weekStatistic?: ProductLineItem[];
-    monthStatistic?: ProductLineItem[];
-    yearStatistic?: ProductLineItem[];
-  };
-};

src/utils/cutting.js

@@ -1,30 +1,14 @@
 import { store } from "../store";
-type TableDataType = {
-  name: "table";
-  type: "cutting";
-  data: any[];
-};
-type ChartDataType = {
-  name: "chart";
-  type: "cutting";
-  nightPushData: any[];
-  dayPushData: any[];
-  allPushData: any[];
-  dateType: "day" | "week" | "month" | "year";
-};
 
-export default function handler(msg: MessageEvent) {
+export default function handler(msg) {
-  let serializedData: TableDataType | ChartDataType | null = null;
+  let serializedData = null;
   try {
     serializedData = JSON.parse(msg.data);
   } catch (error) {
     console.log("[*] websocket: [unable to serialize] --->  ", msg);
   }
 
-  console.log("[CUTTING DATA] ---> ", serializedData);
-
   if (serializedData == null) return;
-
   switch (serializedData.name) {
     case "table":
       store.dispatch({

src/utils/dcs.js

@@ -1,8 +1,8 @@
 import { store } from "../store";
 import { setList } from "../store/features/alarmSlice";
 
-export default function handler(msg: MessageEvent) {
+export default function handler(msg) {
-  let serializedData: { type: string; data: any } | null = null;
+  let serializedData = null;
   try {
     serializedData = JSON.parse(msg.data);
   } catch (error) {
@@ -10,7 +10,7 @@ export default function handler(msg: MessageEvent) {
   }
   switch (serializedData?.type) {
     case "alarmList": {
-      store.dispatch(setList(serializedData.data))
+      store.dispatch(setList(serializedData.data));
       break;
     }
     case "KilnInfo": {

src/utils/energe.js

@@ -1,7 +1,7 @@
 import { store } from "../store";
 
-export default function handler(msg: MessageEvent) {
+export default function handler(msg) {
-  let serializedData: { type: string; data: any } | null = null;
+  let serializedData = null;
   try {
     serializedData = JSON.parse(msg.data);
   } catch (error) {

src/utils/energeChartOption.js

@@ -88,9 +88,6 @@ export function getOptions(period, source, trend, options = {}) {
           color: "#213259a0",
         },
       },
-      // interval: 10,
-      // min: 0,
-      // max: 100,
     },
     series: [
       {
@@ -123,7 +120,6 @@ export function getOptions(period, source, trend, options = {}) {
         type: "shadow",
       },
       className: "xc-chart-tooltip",
-      // backgroundColor: ''
     },
     ...options,
   };

src/utils/index.js

@@ -9,24 +9,16 @@ import smokeHandler from "./smoke";
  * new XClient('ws://192.168.1.12:8081/xc-screen/websocket/xc001', 'DCS')
  */
 class XClient {
-  url: string;
+  // url;
-  name: string;
+  // name;
-  ws: WebSocket;
+  // ws;
-  timeout: number = 1000 * 5;
+  // timeout = 1000 * 5;
-  heartbeatDelay: number = 1000 * 60 * 3;
+  // heartbeatDelay = 1000 * 60 * 3;
-  reconnectCount: number = 0;
+  // reconnectCount = 0;
-  onmessage: (msg: MessageEvent) => void;
+  // onmessage = (msg) => console.log(msg);
-  hb: number = 0;
+  // hb = 0;
 
-  constructor(
+  constructor(config, onmessage = (msg) => console.log(msg)) {
-    config: {
-      url: string;
-      name: string;
-      timeout?: number;
-      reconnectCount?: number;
-    },
-    onmessage: (msg: MessageEvent) => void
-  ) {
     this.url = config.url;
     this.name = config.name;
     this.ws = new WebSocket(config.url);
@@ -164,7 +156,7 @@ new XClient(
   smokeHandler
 );
 
-export function randomInt(min: number, max: number, includeMax = false) {
+export function randomInt(min, max, includeMax = false) {
   let Fn = includeMax ? Math.ceil : Math.floor;
   let num = Fn(Math.random() * max);
   while (num < min) {

src/utils/index.types.ts

@@ -1,4 +0,0 @@
-export type MessageEvent = {
-    type: string;
-    data: any;
-}

src/utils/smoke.js

@@ -0,0 +1,32 @@
+import { store } from "../store";
+
+export default function handler(msg) {
+  let serializedData = null;
+  try {
+    serializedData = JSON.parse(msg.data);
+  } catch (error) {
+    console.log("[*] websocket: [unable to serialize] --->  ", msg);
+  }
+  switch (serializedData?.type) {
+    case "exhaustGas": {
+      store.dispatch({
+        type: "smoke/setInfo",
+        payload: serializedData.realtime,
+      });
+      store.dispatch({
+        type: "smoke/setTrend",
+        payload: {
+          dayTrend: serializedData.dayTrend,
+          weekTrend: serializedData.weekTrend,
+          monthTrend: serializedData.monthTrend,
+          yearTrend: serializedData.yearTrend,
+        },
+      });
+      break;
+    }
+
+    default: {
+      console.log("websocket message: [unknown] --->  ", msg.data);
+    }
+  }
+}

src/utils/smoke.ts

@@ -1,114 +0,0 @@
-import { store } from "../store";
-
-type SmokeMessageItem = {
-  type: string;
-  realtime: {
-    SO2_float: number;
-    NOX_float: number;
-    O2_float: number;
-    dust_float: number;
-  };
-  dayTrend: {
-    SO2_float: Array<{
-      time: string;
-      value: number;
-    }>;
-    NOX_float: Array<{
-      time: string;
-      value: number;
-    }>;
-    O2_float: Array<{
-      time: string;
-      value: number;
-    }>;
-    dust_float: Array<{
-      time: string;
-      value: number;
-    }>;
-  };
-  weekTrend: {
-    SO2_float: Array<{
-      time: string;
-      value: number;
-    }>;
-    NOX_float: Array<{
-      time: string;
-      value: number;
-    }>;
-    O2_float: Array<{
-      time: string;
-      value: number;
-    }>;
-    dust_float: Array<{
-      time: string;
-      value: number;
-    }>;
-  };
-  monthTrend: {
-    SO2_float: Array<{
-      time: string;
-      value: number;
-    }>;
-    NOX_float: Array<{
-      time: string;
-      value: number;
-    }>;
-    O2_float: Array<{
-      time: string;
-      value: number;
-    }>;
-    dust_float: Array<{
-      time: string;
-      value: number;
-    }>;
-  };
-  yearTrend: {
-    SO2_float: Array<{
-      time: string;
-      value: number;
-    }>;
-    NOX_float: Array<{
-      time: string;
-      value: number;
-    }>;
-    O2_float: Array<{
-      time: string;
-      value: number;
-    }>;
-    dust_float: Array<{
-      time: string;
-      value: number;
-    }>;
-  };
-};
-
-export default function handler(msg: MessageEvent) {
-  let serializedData: SmokeMessageItem | null = null;
-  try {
-    serializedData = JSON.parse(msg.data);
-  } catch (error) {
-    console.log("[*] websocket: [unable to serialize] --->  ", msg);
-  }
-  switch (serializedData?.type) {
-    case "exhaustGas": {
-      store.dispatch({
-        type: "smoke/setInfo",
-        payload: serializedData.realtime,
-      });
-      store.dispatch({
-        type: "smoke/setTrend",
-        payload: {
-          dayTrend: serializedData.dayTrend,
-          weekTrend: serializedData.weekTrend,
-          monthTrend: serializedData.monthTrend,
-          yearTrend: serializedData.yearTrend,
-        },
-      });
-      break;
-    }
-
-    default: {
-      console.log("websocket message: [unknown] --->  ", msg.data);
-    }
-  }
-}