Merge branch 'develop' of http://120.27.195.166:3000/chenglb/PMS_Frontend_v1.0.0.git into develop

src/components/layout/Header/downloadModal.jsx

@@ -33,7 +33,7 @@ function DownloadModal (props)  {
             width: 200,
             align: 'center',
             dataIndex: 'progress',
-            render: (progress) => ((progress || 0) * 100) + '%'
+            render: (progress) => ((progress || 0)) + '%'
         },
         {
             title: '文件大小',
@@ -83,7 +83,7 @@ function DownloadModal (props)  {
                     <div className='download-list-action'>
                         {
                             record.status == 2 ? (
-                                <div className="download-btn-download" style={{color: '#3AA9FF'}} onClick={() => handleDownload(record.url)}>下载</div>
+                                <div className="download-btn-download" style={{color: '#3AA9FF'}} onClick={() => handleDownload(record.file_url)}>下载</div>
                             ) : null
                         }
                         <div className="download-btn-del" style={{color: '#EC5761'}} onClick={() => handleDel(record)}>删除</div>

src/pages/NewEnergy/ChargeStationMgm/loadable.jsx

@@ -13,6 +13,7 @@ import "./index.scss";
 
 
 function Appointment() {
+  
   // 详情弹窗
   const [detailVisible, setDetailVisible] = useState(false);
   // 列表数据
@@ -139,7 +140,7 @@ function Appointment() {
       label: "站点状态",
       options: [
         { value: "0", label: "全部" },
-        ...sysConfig?.stationType || []
+        ...sysConfig?.stationStatus || []
       ],
       defaultValue: "0",
       placeholder: "请选择站点状态",
@@ -374,15 +375,6 @@ function Appointment() {
               />
             </div>
             <div className="row">
-              <FormInput
-                yisaLabel="详细地址"
-                placeholder="请输入详细地址"
-                isShowAfterIcon={false}
-                value={addFormData.address}
-                onChange={e => { setAddFormData({ address: e.target.value }) }}
-              />
-            </div>
-            <div className="row">
               <FormSelect
                 yisaLabel="站点类型"
                 placeholder="请选择站点类型"
@@ -438,12 +430,22 @@ function Appointment() {
                     setAddFormData({ lng_lat: value })
                   }}
                   onChange={(adress) => {
-                    console.log(adress);
+                    // console.log(adress);
+                    setAddFormData({ address: adress })
                   }}
                   close={() => setLngLatVisible(false)}
                 />
               </div>
             </div>
+            <div className="row">
+              <FormInput
+                yisaLabel="详细地址"
+                placeholder="请输入详细地址"
+                isShowAfterIcon={false}
+                value={addFormData.address}
+                onChange={e => { setAddFormData({ address: e.target.value }) }}
+              />
+            </div>
           </div>
           <div className="right">
             <Upload

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";
@@ -14,7 +14,7 @@ function ChargerMonitor() {
     station_name: "", // 充电桩
     phone: "", // 手机号
     plate: "", // 车牌号
-    status: sysConfig?.energyChargingStatus[0]?.value ?? 0, // 充电状态
+    status: sysConfig?.energyChargingStatus?.[0]?.value ?? 0, // 充电状态
     timePeriod: moment().format("YYYY-MM-DD HH:mm:ss"),
     // start_time: "", // 开始时间
     // end_time: "", // 结束时间
@@ -45,7 +45,7 @@ function ChargerMonitor() {
       type: "Select",
       placeholder: "请选择充电状态",
       defaultValue: initFormData.status,
-      options: sysConfig.energyChargingStatus ?? [],
+      options: sysConfig?.energyChargingStatus ?? [],
     },
     {
       name: "timePeriod",
@@ -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) => {

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;
+              }
+            }
           }
         }
       }

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";
@@ -19,8 +19,8 @@ function PileMonitor() {
   const initFormData = {
     station_name: "", // 充电桩
     muzzle_text: "", // 枪名称
-    pile_type: sysConfig?.energyChargingType[0]?.value ?? 0, // 充电类型
-    charge_status: sysConfig?.energyChargingGunStatus[0]?.value ?? 0, // 枪状态
+    pile_type: sysConfig?.energyChargingType?.[0]?.value ?? 0, // 充电类型
+    charge_status: sysConfig?.energyChargingGunStatus?.[0]?.value ?? 0, // 枪状态
   }; // 初始数据
 
   const formSearch = [
@@ -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) => {

src/pages/OperationCenter/OperationSales/CreditScoreMgm/loadable.jsx

@@ -414,7 +414,7 @@ function CreditScoreMgm() {
       if (e.status == 20000) {
         setPayVisible(true)
         setPayData(e.data)
-      }else {
+      } else {
         message.error(e.message)
       }
     })
@@ -429,16 +429,23 @@ function CreditScoreMgm() {
   const getRechargeRulesUpdate = (e) => {
     let flag = []
     let arr = []
+    let couflag = []
     e.list.map((item) => {
       if (item.recharge == null || item.recharge == '') {
         flag.push(false)
       } else {
         arr.push(item.recharge)
+        let couponArr = []
         item.children.map((res) => {
           if (res.couponId == null || res.couponId == '' || res.num == null || res.num == '') {
             flag.push(false)
+          }else {
+            couponArr.push(res.couponId)
           }
         })
+        if (couponArr.length != [...new Set(couponArr)].length) {
+          couflag.push(false)
+        }
       }
     })
     if (flatten(flag).some(ele => ele === false)) {
@@ -449,6 +456,10 @@ function CreditScoreMgm() {
       message.error("每个规则对应的充值金额不能相同，请修改")
       return
     }
+    if (flatten(couflag).some(ele => ele === false)) {
+      message.error("每个规则添加的消费券不能相同，请修改")
+      return
+    }
     ajax.getRechargeRulesUpdate(e).then((e) => {
       if (e.status == 20000) {
         message.success(e.message)
@@ -463,7 +474,7 @@ function CreditScoreMgm() {
       if (e.status == 20000) {
         message.success(e.message)
         return 1
-      }else {
+      } else {
         message.error(e.message)
       }
     })
@@ -832,7 +843,9 @@ function CreditScoreMgm() {
               return <div className="pay-box">
                 <div className="title">规则{index + 1}</div>
                 {index > 0 ? <div className="delrule-btn" onClick={() => {
-                  getRechargeRulesDel({ rid: item.rid });
+                  if (item.rid) {
+                    getRechargeRulesDel({ rid: item.rid });
+                  }
                   let arr = payData
                   arr.list.splice(index, 1);
                   setFlag(flag + 1)
@@ -891,10 +904,11 @@ function CreditScoreMgm() {
                             {
                               index2 > 0 && index2 + 1 == item.children.length ?
                                 <div className="add-btn del-btn" onClick={() => {
-                                  getRechargeRulesDel({ cid: res.couponId })
+                                  if (res.cid) {
+                                    getRechargeRulesDel({ cid: res.cid })
+                                  }
                                   let arr = payData
                                   arr.list[index].children.splice(index2, 1);
-                                  console.log(847, arr)
                                   setFlag(flag + 1)
                                   setPayData(arr)
                                 }

src/services/NewEnergy/realtimeMonitor.js

@@ -31,7 +31,7 @@ const getPileMonitorList = (params) => {
 const getPileMonitorStatsData = (params) => {
   return ajax({
     url: "/api/nes/piles/count",
-    type: "post",
+    type: "get",
     data: params,
   });
 };