From 1d274786cd2e9bde612f82a09c0f2399931b939c Mon Sep 17 00:00:00 2001
From: chenli <chenli@yisa.com>
Date: Fri, 26 Jan 2024 10:34:19 +0800
Subject: [PATCH] =?UTF-8?q?fix():=20=E5=AE=9E=E6=97=B6=E7=9B=91=E6=8E=A7?=
 =?UTF-8?q?=EF=BC=8C=E6=9F=A5=E7=9C=8B=E5=9B=BE=E7=89=87=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=8C=E8=A1=A8=E6=A0=BC=E6=97=A0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RealtimeMonitor/ChargerMonitor/loadable.jsx    | 70 +++++++++++++---------
 .../RealtimeMonitor/PileMonitor/loadable.jsx       | 47 +++++++++++----
 .../RecordsInquiry/Unlocking/loadable.jsx          | 26 ++++++--
 3 files changed, 101 insertions(+), 42 deletions(-)

diff --git a/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/loadable.jsx b/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/loadable.jsx
index 2ecd594..8525d17 100644
--- a/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/loadable.jsx
+++ b/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/loadable.jsx
@@ -58,26 +58,23 @@ function ChargerMonitor() {
   ]; // 检索栏
 
   const columns = [
-    // {
-    //   title: "序号",
-    //   dataIndex: "index",
-    //   key: "index",
-    //   align: "center",
-    //   fixed: "left",
-    //   render: (text, record, index) => index + 1,
-    //   width: 100,
-    // },
     {
       title: "用户手机号",
       dataIndex: "phone",
       key: "phone",
       align: "center",
+      render: (val, record) => {
+        return <>{val || "-"}</>;
+      },
     },
     {
       title: "车牌号",
       dataIndex: "plate",
       key: "plate",
       align: "center",
+      render: (val, record) => {
+        return <>{val || "-"}</>;
+      },
     },
     {
       title: "枪名称",
@@ -98,14 +95,19 @@ function ChargerMonitor() {
       title: "充电站",
       dataIndex: "station_name",
       key: "station_name",
-      // width: 100,
       align: "center",
+      render: (val, record) => {
+        return <>{val || "-"}</>;
+      },
     },
     {
       title: "充电开始时间",
       dataIndex: "charge_start_time",
       key: "charge_start_time",
       align: "center",
+      render: (val, record) => {
+        return <>{val || "-"}</>;
+      },
     },
     {
       title: "充电状态",
@@ -116,11 +118,17 @@ function ChargerMonitor() {
       // width: 100,
       render: (val, record) => {
         return (
-          <span
-            className={`custom-table-cell-span charge-status charge-status__${record?.charge_status}`}
-          >
-            {val || "-"}
-          </span>
+          <>
+            {val ? (
+              <span
+                className={`custom-table-cell-span charge-status charge-status__${record?.charge_status}`}
+              >
+                {val || "-"}
+              </span>
+            ) : (
+              <>-</>
+            )}
+          </>
         );
       },
     },
@@ -132,16 +140,21 @@ function ChargerMonitor() {
       // fixed: "right",
       // width: 100,
       render: (val, record) => {
+        console.log("pic_url", val);
         return (
           <>
-            <a
-              href="javascript:void(0)"
-              onClick={() => {
-                openImgRecordModal(val);
-              }}
-            >
-              查看
-            </a>
+            {val ? (
+              <a
+                href="javascript:void(0)"
+                onClick={() => {
+                  openImgRecordModal(val);
+                }}
+              >
+                查看
+              </a>
+            ) : (
+              <>-</>
+            )}
           </>
         );
       },
@@ -186,6 +199,7 @@ function ChargerMonitor() {
   });
 
   const openImgRecordModal = (pic_url = "") => {
+    console.log("open", pic_url);
     setImgRecordShow(true);
     setImgRecordData({ pic_url });
   };
@@ -219,11 +233,13 @@ function ChargerMonitor() {
           closeImgRecordModal();
         }}
       >
-        <div className="content" style={{ minHeight: 500 }}>
+        <div className="content" style={{ height: 600 }}>
           <Image
-            width={800}
-            height={600}
-            url={ImgRecordData?.pic_url}
+            // width={900}
+            // height={600}
+            width={"100%"}
+            height={"100%"}
+            src={ImgRecordData?.pic_url}
             preview={false}
             fallback="data:image/png;base64,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"
           ></Image>
diff --git a/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/loadable.jsx b/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/loadable.jsx
index 557af96..9a2fd71 100644
--- a/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/loadable.jsx
+++ b/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/loadable.jsx
@@ -58,12 +58,18 @@ function PileMonitor() {
       dataIndex: "name",
       key: "name",
       align: "center",
+      render: (val, record) => {
+        return <>{val || "-"}</>;
+      },
     },
     {
       title: "枪名称",
       dataIndex: "muzzle_text",
       key: "muzzle_text",
       align: "center",
+      render: (val, record) => {
+        return <>{val || "-"}</>;
+      },
     },
     {
       title: "在线状态",
@@ -72,11 +78,17 @@ function PileMonitor() {
       align: "center",
       render: (val, record) => {
         return (
-          <span
-            className={`custom-table-cell-span online-status__${record?.pile_status}`}
-          >
-            {val}
-          </span>
+          <>
+            {val ? (
+              <span
+                className={`custom-table-cell-span online-status__${record?.pile_status}`}
+              >
+                {val}
+              </span>
+            ) : (
+              <>-</>
+            )}
+          </>
         );
       },
     },
@@ -87,11 +99,17 @@ function PileMonitor() {
       align: "center",
       render: (val, record) => {
         return (
-          <span
-            className={`custom-table-cell-span gun-status__${record?.charge_status}`}
-          >
-            {val}
-          </span>
+          <>
+            {val ? (
+              <span
+                className={`custom-table-cell-span gun-status__${record?.charge_status}`}
+              >
+                {val || "-"}
+              </span>
+            ) : (
+              <>-</>
+            )}
+          </>
         );
       },
     },
@@ -100,18 +118,27 @@ function PileMonitor() {
       dataIndex: "lock_status_text",
       key: "lock_status_text",
       align: "center",
+      render: (val, record) => {
+        return <>{val || "-"}</>;
+      },
     },
     {
       title: "充电类型",
       dataIndex: "type_text",
       key: "type_text",
       align: "center",
+      render: (val, record) => {
+        return <>{val || "-"}</>;
+      },
     },
     {
       title: "充电站",
       dataIndex: "station_name",
       key: "station_name",
       align: "center",
+      render: (val, record) => {
+        return <>{val || "-"}</>;
+      },
     },
     {
       title: "操作",
diff --git a/src/pages/NewEnergy/RecordsInquiry/Unlocking/loadable.jsx b/src/pages/NewEnergy/RecordsInquiry/Unlocking/loadable.jsx
index c60d66f..b969b30 100644
--- a/src/pages/NewEnergy/RecordsInquiry/Unlocking/loadable.jsx
+++ b/src/pages/NewEnergy/RecordsInquiry/Unlocking/loadable.jsx
@@ -54,47 +54,63 @@ function Unlocking() {
       dataIndex: "tel",
       key: "tel",
       align: "center",
+      render: (val, record) => {
+        return <>{val || "-"}</>;
+      },
     },
     {
       title: "车牌号",
       dataIndex: "plate",
       key: "plate",
       align: "center",
+      render: (val, record) => {
+        return <>{val || "-"}</>;
+      },
     },
     {
       title: "地锁名称",
       dataIndex: "ground_lock_name",
       key: "ground_lock_name",
       align: "center",
+      render: (val, record) => {
+        return <>{val || "-"}</>;
+      },
     },
     {
       title: "所在充电站",
       dataIndex: "local_charging_station",
       key: "local_charging_station",
-      // width: 100,
       align: "center",
+      render: (val, record) => {
+        return <>{val || "-"}</>;
+      },
     },
     {
       title: "降锁时间",
       dataIndex: "lockdown_time",
       key: "lockdown_time",
       align: "center",
+      render: (val, record) => {
+        return <>{val || "-"}</>;
+      },
     },
     {
       title: "升锁时间",
       dataIndex: "unlocking_time",
       key: "unlocking_time",
       align: "center",
-      // fixed: "right",
-      // width: 100,
+      render: (val, record) => {
+        return <>{val || "-"}</>;
+      },
     },
     {
       title: "开锁方式",
       dataIndex: "unlocking_method",
       key: "unlocking_method",
       align: "center",
-      // fixed: "right",
-      // width: 100,
+      render: (val, record) => {
+        return <>{val || "-"}</>;
+      },
     },
   ]; // 表头