fix():bug修改

1 year ago · 33ac78b775
12 changed files with 80 additions and 35 deletions
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx
@ -1041,7 +1041,7 @@ function ParkingAlyDuration() {
                                    onChange={(key) => {
                                        setTabCarKey(key);
                                        setPageInfo({ ...pageInfo, ...{ pn: 1 } });
-                                        getListData({}, { pn: 1 })
+                                        getListData({ sort: 1 }, { pn: 1 })
                                    }}
                                    items={[
                                        {
--- a/src/pages/OutRoadMgm/OutDeviceMgm/OutDevice/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutDeviceMgm/OutDevice/loadable.jsx
@ -38,7 +38,7 @@ function OutDevice() {
    page_size: defaultParams ? defaultParams?.page_size : 15,
  });
  // 表单数据
-  const [formData, setFormData] = useState({...defaultData,...defaultParams});
+  const [formData, setFormData] = useState({ ...defaultData, ...defaultParams });
  // 搜索提交数据-存储
  const [holdData, setHoldData] = useState(formData);
  // 访问接口，isAjax改变时执行
@ -346,8 +346,8 @@ function OutDevice() {
                //allowClear
                //placeholder="全部"
                //showSearch
-               // optionFilterProp="label"
-               // options={roadData || []}
+                // optionFilterProp="label"
+                // options={roadData || []}
                value={formData?.road_id || undefined}
                onChange={(e) => setFormData({ ...formData, road_id: e.target.value })}
              />
@ -360,20 +360,20 @@ function OutDevice() {
                //placeholder="全部"
                options={[
                  {
-                    label:'全部',
-                    value:'0',
+                    label: '全部',
+                    value: '0',
                  },
                  {
-                    label:'地上',
-                    value:'1',
+                    label: '地上',
+                    value: '1',
                  },
                  {
-                    label:'地下',
-                    value:'2',
+                    label: '地下',
+                    value: '2',
                  },
                  {
-                    label:'地上+地下',
-                    value:'3',
+                    label: '地上+地下',
+                    value: '3',
                  },
                ]}
                value={formData?.physics_type || undefined}
@ -429,7 +429,7 @@ function OutDevice() {
              columns={columns}
              pagination={false}
              loading={tabLoading}
-              scroll={{y:620}}
+              scroll={{ y: "calc(100% - 50px)" }}
            />
            <Pagination {...paginationProps} className="pagination-common" />
          </ResultFlowResult>
--- a/src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx
@ -637,6 +637,7 @@ function OutNvrMgm(props) {
                columns={tableColumns}
                pagination={false}
                loading={tabLoading}
+                scroll={{ y: "calc(100% - 50px)" }}
              />
              <Pagination {...paginationProps} className="pagination-common" />
            </ResultFlowResult>
--- a/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx
@ -32,6 +32,24 @@ const OutRoadOverview = () => {
  const [recordData, setRecordData] = useState({});
  // 显示配置  根据系统管理 停车概览页面配置 进行显示与隐藏设置
  const [displayMapping, setDisplayMapping] = useState({})
+  const numberFormat = (num) => {
+    if (!num) {
+      return "0"
+    }
+    let str = JSON.stringify(num);
+    let len = str.length;
+    if (len > 8) {
+      let str1 = str.substring(0, len - 8);
+      let str2 = str.substring(str1.length, str1.length + 1);
+      str = str1 + "." + str2 + "亿";
+    }
+    else if (len > 4 && len <= 8) {
+      let str1 = str.substring(0, len - 4);
+      let str2 = str.substring(str1.length, str1.length + 1);
+      str = str1 + "." + str2 + '万';
+    }
+    return str;
+  }
  //停车场收入概览
  const getRevenueOption = (data) => {
    // 获取所有地区名称
@ -56,7 +74,7 @@ const OutRoadOverview = () => {
        data: dates.map((item) => {
          for (const { pay_date, income } of areaData) {
            console.log(pay_date, income);
-            if (pay_date === item) return income;
+            if (pay_date === item) return numberFormat(income);
          }
          return 0;
        }),
@ -79,7 +97,7 @@ const OutRoadOverview = () => {

    setRevenueData({
      title: {
-        text: "停车场收入概览",
+        text: "",
        textStyle: {
          color: "#fff",
        },
@ -428,7 +446,9 @@ const OutRoadOverview = () => {
      </div>
      <div id="body">
        <div className="left">
-          <div className="revenue-left card" style={{ visibility: displayMapping['13'] ? '' : 'hidden' }}>
+          {/* <div className="revenue-left card" style={{ visibility: displayMapping['13'] ? '' : 'hidden' }}> */}
+          <div className="revenue-left card">
+            <div style={{ fontSize: '18px', fontWeight: '800' }}>停车场收入概览</div>
            <ReactEcharts
              option={revenueData}
              style={{ height: "100%", width: "100%", overflow: "hidden" }}
--- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/EffectiveDate.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/EffectiveDate.jsx
@ -26,6 +26,12 @@ function EffectiveDate(props) {
    disable = false,
    record = {},
  } = props;
+  // 限制当天之前的日期不可选
+  const disabledDate = (current) => {
+    //return current && current < moment().subtract(1, "days"); //当天之前的不可选，不包括当天
+    return current && current < moment().endOf("day");//当天之前的不可选，包括当天
+  }
+
  const [form] = Form.useForm();
  const [effTimePart, setEffTimePart] = useState()
  const [timePartList, setTimePartList] = useState(() => {
@ -55,7 +61,7 @@ function EffectiveDate(props) {
  }
  const addTimePart = () => {
    if (flatten(effTimePart).some(ele => ele === false)) {
-      message.error("请先把当前时段填写完整")
+      message.error("请先把当前时段填写正确")
      return
    }
    const randomNum = Math.floor(Math.random() * 1000);
@ -142,7 +148,7 @@ function EffectiveDate(props) {
        initialValues={{
          unit_fee_type_group: [],
          ...record,
-          date: moment(record.date),
+          date: moment(new Date()).add(1, 'days'),
        }}
        disabled={disable}
      >
@ -153,7 +159,7 @@ function EffectiveDate(props) {
              name="date"
              rules={[{ required: true }]}
            >
-              <DatePicker />
+              <DatePicker disabledDate={disabledDate} getPopupContainer={(e) => e.parentNode}/>
            </Form.Item>
          </Col>
          <Col span={12}>
--- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx
@ -61,6 +61,10 @@ function TimePart(props) {
        //timePart(false)
        effTimePart(timearr)
      } else {
+        if (all.start != "00:00:00" && countDown(all.end) - countDown(all.start) < 0) {
+          message.error('结束时间需大于开始时间，设置00:00:00除外')
+          return
+        }
        console.log('完整了', all, countDown(all.end) - countDown(all.start), all.items[0].segment * 60)
        if (all.end != '00:00:00' && countDown(all.end) - countDown(all.start) < all.items[0].segment * 60) {
          message.error("输入的'前...分钟'数据要小于时间段时间")
@ -202,7 +206,7 @@ function TimePart(props) {
        <Row gutter={[30]}>
          <Col span={16}>
            <Form.Item label={`时段${index}`} name="time_part" rules={[{ required: true, message: '请选择时间段!' }]}>
-              <TimePicker.RangePicker style={{ width: "50%" }} order={false} secondStep={60} />
+              <TimePicker.RangePicker style={{ width: "50%" }} order={false} secondStep={60} getPopupContainer={(e) => e.parentNode}/>
            </Form.Item>
            <div style={{ marginBottom: '10px', color: '#858585' }}>*时段结束时间设置00:00:00相当于23:59:59</div>
          </Col>
@ -221,6 +225,7 @@ function TimePart(props) {
          <Col span={24}>
            <Form.Item label={`区间${index}`} name="type" initialValue={1}>
              <Select
+                getPopupContainer={(e) => e.parentNode}
                style={{ width: "20%" }}
                options={[
                  {
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/AddParking.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/AddParking.jsx
@ -28,6 +28,7 @@ function AddParking(props) {
    status = "add",
    type = 0,
    search = () => { },
+    closeDetail= () => { },
  } = props;
  useEffect(() => {
    if (type == 2 || type == 3 || type == 4) {
@ -231,6 +232,7 @@ function AddParking(props) {
      if (res.status === 20000) {
        message.success("编辑成功");
        close();
+        closeDetail(Math.ceil(Math.random()*10));
        //location.reload();
      } else {
        message.error(res.message);
@ -252,10 +254,10 @@ function AddParking(props) {
          message.error('车场泊位数必须为数字！')
          return
        }
-        // if (topBerthNum && parseFloat(values.total_berth_number) < topBerthNum) {
-        //   message.error('下级车场泊位数与一级车场泊位数之和不超过泊位总数！此处总车场泊位数不超过' + topBerthNum)
-        //   //return
-        // }
+        if (processImgData(fileList) && processImgData(fileList).length == 0) {
+          message.error('请上传图片！')
+          return
+        }
        if (!lngLat) {
          message.error('请选择经纬度')
          return
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/BillingRules.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/BillingRules.jsx
@ -302,7 +302,7 @@ function BillingRules(props) {
            name="rule_id"
            rules={[{ required: true }]}
          >
-            <Select options={chargeRuleList} />
+            <Select options={chargeRuleList.slice(1)} />
          </Form.Item>
        </Form>
      </Modal>
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/CarGroupMgm.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/CarGroupMgm.jsx
@ -152,8 +152,7 @@ function CarGroupMgm({ id }) {
      page_size,
    });
  }
-
-  useEffect(() => {
+  const getAllCarGroup = () => {
    ajax
      .getAllCarGroup({ road_id: id })
      .then((res) => {
@ -166,6 +165,9 @@ function CarGroupMgm({ id }) {
      .catch((err) => {
        console.log(err);
      });
+  }
+  useEffect(() => {
+    getAllCarGroup()
  }, []);

  const toCarGroup = (type) => {
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/CarManagement.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/CarManagement.jsx
@ -41,8 +41,8 @@ function CarManagement({ id }) {
    },
    {
      title: "车辆组",
-      dataIndex: "group_id",
-      key: "group_id",
+      dataIndex: "group_name",
+      key: "group_name",
      align: "center",
    },
    {
@ -135,7 +135,7 @@ function CarManagement({ id }) {
                <div>
                  <a
                    onClick={() => {
-                      if (record.status === 1) {
+                      if (record.status == "1") {
                        disableVehicle(record.id);
                        submit(form.getFieldValue());
                        return;
@ -241,6 +241,7 @@ function CarManagement({ id }) {
              setEditModal({ visible: false });
              submit(form.getFieldValue());
              editForm.resetFields();
+              getAllCarGroup()
            } else {
              message.error(res.message)
            }
@ -294,8 +295,7 @@ function CarManagement({ id }) {
  useEffect(() => {
    submit();
  }, [pageData]);
-
-  useEffect(() => {
+  const getAllCarGroup = () => {
    ajax
      .getAllCarGroup({ road_id: id })
      .then((res) => {
@ -308,6 +308,9 @@ function CarManagement({ id }) {
      .catch((err) => {
        console.log(err);
      });
+  }
+  useEffect(() => {
+    getAllCarGroup()
  }, []);
  return (
    <div style={{ margin: "20px 0 0" }}>
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/Detail.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/Detail.jsx
@ -15,6 +15,7 @@ function Detail(props) {
    detailData = {},
    visible = false,
    close = () => { },
+    closeDetail,//子车场编辑后调用子车场信息列表
    itemData = {},
    setConfigModal,//停车场配置
    setEditModal,
@ -33,7 +34,7 @@ function Detail(props) {
          {
            label: "停车场详情",
            key: "1",
-            children: <ParkingDetail itemData={itemData} setEditModal={setEditModal} setConfigModal={setConfigModal} />,
+            children: <ParkingDetail itemData={itemData} setEditModal={setEditModal} setConfigModal={setConfigModal} closeDetail={closeDetail} />,
          },
          {
            label: "车场评价详情",
@ -68,6 +69,7 @@ function ParkingDetail(props) {
  const { itemData,
    setConfigModal,
    setEditModal,//停车场配置
+    closeDetail,
  } = props;
  return (
    <Tabs
@ -80,7 +82,7 @@ function ParkingDetail(props) {
        {
          label: "子车场信息",
          key: "2",
-          children: <ChildParkingContent  itemData={itemData} id={itemData.id} ChildParkingContent setEditModal={setEditModal} setConfigModal={setConfigModal} />,
+          children: <ChildParkingContent closeDetail={closeDetail} itemData={itemData} id={itemData.id} ChildParkingContent setEditModal={setEditModal} setConfigModal={setConfigModal} />,
        },
      ]}
    ></Tabs>
@ -173,6 +175,7 @@ function ChildParkingContent(props) {
  const {
    setConfigModal,//停车场配置
    setEditModal,//编辑
+    closeDetail,
  } = props;

  const columns = [
@ -268,7 +271,7 @@ function ChildParkingContent(props) {
      .catch((err) => {
        console.log(err);
      });
-  }, []);
+  }, [closeDetail]);
  return (
    <>
      <Table
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx
@ -42,6 +42,7 @@ function OutSegment() {
  const [sessionTabList, setSessionTabList] = useSessionStorageState('outSegment', {
    value: ''
  })
+  const [closeDetail, setCloseDetail] = useState(false)
  const [formData, setFormData] = useState()
  const [tipData, setTipData] = useState({
    count: '',
@ -618,6 +619,7 @@ function OutSegment() {
          visible={checkModal.visible}
          close={checkModal.close}
          itemData={checkModal.record}
+          closeDetail={closeDetail}
          setConfigModal={(myData) => {
            console.log(myData, 'myData')
            if(myData){
@ -644,6 +646,7 @@ function OutSegment() {
          record={editModal.record}
          status={editModal.status}
          type={editModal.type}
+          closeDetail={(e)=>{console.log(12222,e);setCloseDetail(e)}}
        />
      )}
      <ConfigParking