From fa3f6ca665efba651a08ce72077027a56895c2d7 Mon Sep 17 00:00:00 2001
From: chenli <chenli@yisa.com>
Date: Fri, 19 Jan 2024 15:54:26 +0800
Subject: [PATCH] =?UTF-8?q?fix():=20=E7=94=B5=E6=A1=A9=E7=9B=91=E6=8E=A7?=
 =?UTF-8?q?=E3=80=81=E5=85=85=E7=94=B5=E7=9B=91=E6=8E=A7=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RealtimeMonitor/ChargerMonitor/loadable.jsx    | 10 +++-----
 .../RealtimeMonitor/PileMonitor/index.scss         | 19 ++++++++++++--
 .../RealtimeMonitor/PileMonitor/loadable.jsx       | 30 ++++++++++------------
 3 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/loadable.jsx b/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/loadable.jsx
index ed0c614..2ecd594 100644
--- a/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/loadable.jsx
+++ b/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/loadable.jsx
@@ -1,5 +1,5 @@
 import React, { useState, useRef, useEffect } from "react";
-import { message, Modal, Image } from "antd";
+import { message as Message, Modal, Image, Button } from "antd";
 import { dictionary, utils } from "@/config/common";
 import ajax from "@/services";
 import { TableModule } from "@/components";
@@ -154,11 +154,7 @@ function ChargerMonitor() {
       fixed: "right",
       width: 100,
       render: (val, record) => {
-        return (
-          <>
-            <span>-</span>
-          </>
-        );
+        return <Button type="primary">操作</Button>;
       },
     },
   ]; // 表头
@@ -172,7 +168,7 @@ function ChargerMonitor() {
           setTableData(res.data.list);
           setTotal(res.data.total);
         } else {
-          message.error(res.message);
+          Message.error(res.message);
         }
       })
       .catch((err) => {
diff --git a/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/index.scss b/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/index.scss
index 9a7abf9..943eb9d 100644
--- a/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/index.scss
+++ b/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/index.scss
@@ -70,13 +70,28 @@
         .ant-table-wrapper {
           .custom-table-cell-span {
             &.online-status {
-              &__2 {
+              &__1 {
                 color: #2adc41;
               }
-              &__1 {
+              &__2 {
                 color: #ec5761;
               }
             }
+
+            &.gun-status{
+              &__1{
+                color: #62CFA7;
+              }
+              &__2{
+                color: #F99B2F;
+              }
+              &__3{
+                color: #FF6978;
+              }
+              &__4{
+                color: #A0B0BD;
+              }
+            }
           }
         }
       }
diff --git a/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/loadable.jsx b/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/loadable.jsx
index 928b728..557af96 100644
--- a/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/loadable.jsx
+++ b/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/loadable.jsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useMemo } from "react";
-import { message } from "antd";
+import { message as Message, Button } from "antd";
 import { utils } from "@/config/common";
 import ajax from "@/services";
 import { TableModule } from "@/components";
@@ -85,15 +85,15 @@ function PileMonitor() {
       dataIndex: "charge_status_text",
       key: "charge_status_text",
       align: "center",
-      // render: (val, record) => {
-      //   return (
-      //     <span
-      //       className={`custom-table-cell-span gun-status__${record?.muzzle_type}`}
-      //     >
-      //       {val}
-      //     </span>
-      //   );
-      // },
+      render: (val, record) => {
+        return (
+          <span
+            className={`custom-table-cell-span gun-status__${record?.charge_status}`}
+          >
+            {val}
+          </span>
+        );
+      },
     },
     {
       title: "地锁状态",
@@ -119,8 +119,7 @@ function PileMonitor() {
       key: "operation",
       align: "center",
       render: (_, record) => {
-        return <></>;
-        // return <Button type="primary">操作</Button>;
+        return <Button type="primary">操作</Button>;
       },
     },
   ]; // 表头
@@ -135,14 +134,13 @@ function PileMonitor() {
           setTableData(res?.data?.list ?? []);
           setTotal(res?.data?.total ?? 0);
         } else {
-          message.error(res.message);
+          Message.error(res.message);
         }
       })
       .catch((err) => {
         console.error(err);
       })
-      .finally(() => {
-      });
+      .finally(() => {});
   }
 
   // 获取统计数据
@@ -153,7 +151,7 @@ function PileMonitor() {
         if (res.status === 20000) {
           setStatsData(res.data ?? {});
         } else {
-          message.error(res.message);
+          Message.error(res.message);
         }
       })
       .catch((err) => {