fix():bug修改

1 year ago · 6151004f88
9 changed files with 53 additions and 26 deletions
--- a/src/components/TableModule/index.jsx
+++ b/src/components/TableModule/index.jsx
@ -270,12 +270,13 @@ const TableModule = forwardRef((props, ref) => {
    console.log(11);
    setFormData({ ...searchForm.getFieldsValue() })
    //search({ ...searchForm.getFieldsValue() })
-    setTimeGroup({ timeType: '', 
-    timeRanges: {
-      start_time: moment().subtract(1, "day").format('YYYY-MM-DD 00:00:00'),
-      end_time: moment().format("YYYY-MM-DD 23:59:59"),
-    }
-  });
+    setTimeGroup({
+      timeType: '',
+      timeRanges: {
+        start_time: moment().subtract(1, "day").format('YYYY-MM-DD 00:00:00'),
+        end_time: moment().format("YYYY-MM-DD 23:59:59"),
+      }
+    });
  }
  useEffect(() => {
    !areaSelectedList.length && fetch()
@ -391,7 +392,7 @@ const TableModule = forwardRef((props, ref) => {
  const handlePlateChange = (newValue, e) => {
    //console.log(newValue,e)
    //setPlateValue(e);
-    setFormData({ ...formData, plateValue: e.label, plate2: newValue })
+    setFormData({ ...formData, plateValue: e?.label || '', plate2: newValue })
  };
  // useEffect(() => {
  //   console.log(deftime.startDateTime);
@ -617,6 +618,7 @@ const TableModule = forwardRef((props, ref) => {
                    <Select
                      getPopupContainer={(e) => e.parentNode}
                      showSearch
+                      allowClear={true}
                      placeholder={props.placeholder}
                      defaultActiveFirstOption={false}
                      showArrow={false}
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx
@ -681,7 +681,7 @@ function ParkingAlyPeriod() {
                            <ReactEcharts
                                key="99"
                                option={revenueData}
-                                style={{ height: "300px", width: "100%", overflow: "hidden" }}
+                                style={{ height: "300px", width: "100%" }}
                            />
                        </div>
                        <div className="result-box">
@ -720,7 +720,7 @@ function ParkingAlyPeriod() {
                                            <ReactEcharts
                                                key={keyVal}
                                                option={hourData}
-                                                style={{ height: "300px", width: "100%", background: '#545d74' }}
+                                                style={{ height: "300px", width: "100%" }}//#545d74
                                            /> :
                                            <div className="no-data-box">{loading ? "加载中" : "暂无数据"}</div>
                                        )
@ -730,7 +730,7 @@ function ParkingAlyPeriod() {
                                                <ReactEcharts
                                                    key="9999"
                                                    option={parkData}
-                                                    style={{ height: "300px", width: "100%", background: '#545d74' }}
+                                                    style={{ height: "300px", width: "100%" }}
                                                />
                                                :
                                                <div className="no-data-box">暂无数据</div>
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/echarts.config.js
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/echarts.config.js
@ -20,6 +20,11 @@ const lineChartOption = (areaNames, xAxisData, yAxisName, seriesData, reName, to
            //     fontSize: 14,
            //     color: 'white',
            // },
+            pageIconColor: '#3aa1f2', // 翻页按钮的颜色  
+            pageIconInactiveColor: '#545d74', // 翻页按钮不激活时（即翻页到头时）的颜色  
+            pageTextStyle: {
+                color: "#fff"
+            },
            formatter: [
                '{a|{name}}'
            ].join('\n'),
@ -117,7 +122,7 @@ const ringChartOption = (areaNames, ringData, tooltip) => {
                color: 'white',
            },
        },
-        color: ["#3AA9FF", "#F997DF","#f7b321"],
+        color: ["#3AA9FF", "#F997DF", "#f7b321"],
        series: [
            {
                type: 'pie',
--- a/src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx
+++ b/src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx
@ -710,7 +710,6 @@ function UserInfo() {
        if ((tabKey == '2' || tabKey == '5') && e && !e?.type) {
            e.type = 1
        }
-        console.log(2212, e)
        ajax({
            url: url,
            type: "post",
@ -1069,14 +1068,14 @@ function UserInfo() {
        </div>
        {timesVisible ? <>
            <div className="ltc-box-title"><div className="text">退款尝试详情</div><div className="line"></div></div>
-            {/* <Table
+            <Table
                columns={formRefundColumns}
                dataSource={ycddData.try_list}
                scroll={{ x: 1000 }}
                // className="yisa-table"
                pagination={false}
-                rowKey={(record) => record.id}
-            />  */}
+                rowKey={(record) => record.id+Math.random()*10000}
+            /> 
        </> :
            <>
                <div className="ltc-box-title"><div className="text">支付订单:{ycddData.order_id}</div><div className="line"></div></div>
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/AddParking.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/AddParking.jsx
@ -301,7 +301,7 @@ function AddParking(props) {
                moment(record.open_end_time, "HH:mm:ss"),
              ],
              filings_time: moment(record.filings_time),
-              area_id: record.area,
+              area_id: getAreaArr(areaList, record.area),
            }
            : {}
        }
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/BlacklistManagement.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/BlacklistManagement.jsx
@ -207,7 +207,11 @@ function BlacklistManagement() {
      .validateFields()
      .then((res) => {
        if (editModal.status === "add") {
-          ajax.addRoadBlackVehicle(res).then((res) => {
+          ajax.addRoadBlackVehicle({
+            ...res,
+            effective_begin_date: moment(res.effective_date[0]).format("YY-MM-DD HH:mm:ss"),
+            effective_end_date: moment(res.effective_date[1]).format("YY-MM-DD HH:mm:ss")
+          }).then((res) => {
            if (res.status === 20000) {
              message.success("添加成功");
              setEditModal({ visible: false });
@ -219,7 +223,11 @@ function BlacklistManagement() {
          });
        } else if (editModal.status === "edit") {
          res.id = currentId;
-          ajax.editBlackVehicle(res).then((res) => {
+          ajax.editBlackVehicle({
+            ...res,
+            effective_begin_date: moment(res.effective_date[0]).format("YY-MM-DD HH:mm:ss"),
+            effective_end_date: moment(res.effective_date[1]).format("YY-MM-DD HH:mm:ss")
+          }).then((res) => {
            if (res.status === 20000) {
              message.success("编辑成功");
              setEditModal({ visible: false });
@ -290,7 +298,7 @@ function BlacklistManagement() {
                  >
                    添加
                  </Button>
-                  <Button type="primary" style={{width:80}}>批量导入</Button>
+                  <Button type="primary" style={{ width: 80 }}>批量导入</Button>
                </div>
              </Form.Item>
            </Col>
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/CarManagement.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/CarManagement.jsx
@ -159,7 +159,7 @@ function CarManagement({ id }) {
  //查询方法
  const submit = (values) => {
    console.log(values);
-    values = { ...values, ...pageData };
+    values = { ...values, ...pageData, road_id: id, };
    ajax.getVehicleList(values).then((res) => {
      if (res.status === 20000) {
        setDataSource(res.data.list);
@ -171,7 +171,12 @@ function CarManagement({ id }) {
    editForm
      .validateFields()
      .then((res) => {
-        res = { ...res, road_id: id, effective_begin_date: moment(res.effective_date[0]).format("YYYY-MM-DD HH:mm:ss"), effective_end_date: moment(res.effective_date[1]).format("YYYY-MM-DD HH:mm:ss") };
+        res = {
+          ...res,
+          road_id: id,
+          effective_begin_date: moment(res.effective_date[0]).format("YYYY-MM-DD HH:mm:ss"),
+          effective_end_date: moment(res.effective_date[1]).format("YYYY-MM-DD HH:mm:ss")
+        };
        console.log(res);
        ajax.addVehicle(res).then((res) => {
          if (res.status === 20000) {
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/WhitelistManagement.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/WhitelistManagement.jsx
@ -207,7 +207,11 @@ function WhitelistManagement() {
      .validateFields()
      .then((res) => {
        if (editModal.status === "add") {
-          ajax.addWhiteList(res).then((res) => {
+          ajax.addWhiteList({
+            ...res,
+            effective_begin_date: moment(res.effective_date[0]).format("YY-MM-DD HH:mm:ss"),
+            effective_end_date: moment(res.effective_date[1]).format("YY-MM-DD HH:mm:ss")
+          }).then((res) => {
            if (res.status === 20000) {
              message.success("添加成功");
              setEditModal({ visible: false });
@ -219,7 +223,11 @@ function WhitelistManagement() {
          });
        } else if (editModal.status === "edit") {
          res.id = currentId;
-          ajax.editWhiteVehicle(res).then((res) => {
+          ajax.editWhiteVehicle({
+            ...res,
+            effective_begin_date: moment(res.effective_date[0]).format("YY-MM-DD HH:mm:ss"),
+            effective_end_date: moment(res.effective_date[1]).format("YY-MM-DD HH:mm:ss")
+          }).then((res) => {
            if (res.status === 20000) {
              message.success("编辑成功");
              setEditModal({ visible: false });
@ -263,7 +271,7 @@ function WhitelistManagement() {
            </Col>
            <Col span="4_8" style={{ width: "30%" }}>
              <Form.Item label="状态" name="status">
-              <Select
+                <Select
                  options={[
                    { label: "全部", value: '0' },
                    { label: "启用", value: '1' },
@ -343,7 +351,7 @@ function WhitelistManagement() {
                rules={[{ required: true }]}
                name="plate_color"
              >
-                <Select disabled={editModal.status === "edit"} options={sysConfig.plateColor}/>
+                <Select disabled={editModal.status === "edit"} options={sysConfig.plateColor} />
              </Form.Item>
            </Col>
            <Col span={12}>
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/Detail.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/Detail.jsx
@ -127,7 +127,7 @@ function ParkingContent(props) {
        <Descriptions.Item label="独立车场泊位数">
          {roadInfo.berth_number}
        </Descriptions.Item>
-        <Descriptions.Item label="区域">{roadInfo.area}</Descriptions.Item>
+        <Descriptions.Item label="区域">{roadInfo.area_name}</Descriptions.Item>
        <Descriptions.Item label="所属商户">
          {roadInfo.operator}
        </Descriptions.Item>