From d4a5ded6c4732733b495d8ad2cd29c38b70f3722 Mon Sep 17 00:00:00 2001
From: mhy <2624196756@qq.com>
Date: Thu, 5 Dec 2024 19:31:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.ts                              |  13 +-
 .../BasicsInput/BasicsInput.module.less       |  10 +
 src/components/BasicsInput/BasicsInput.tsx    |  24 +++
 src/components/BasicsModal/BasicsModal.tsx    |   3 +-
 .../BasicsSelect/BasicsSelect.module.less     |  26 +++
 src/components/BasicsSelect/BasicsSelect.tsx  |  20 ++
 .../BasicsTable/BasicsTable.module.less       |  54 +++++
 src/components/BasicsTable/BasicsTable.tsx    | 122 +++++++++++
 src/components/Modal1/Modal1.tsx              |   2 +-
 src/index.css                                 |  31 ---
 src/index.less                                |  36 ++++
 src/main.tsx                                  |   2 +-
 .../DataReport/DataReport.module.less         |   3 +
 .../CompletePeriod/DataReport/DataReport.tsx  | 106 +++++++++
 .../pages/CompletePeriod/index.tsx            | 204 ++++++++++--------
 .../IntegratedCommand/pages/Map/index.tsx     |   1 -
 16 files changed, 526 insertions(+), 131 deletions(-)
 create mode 100644 src/components/BasicsInput/BasicsInput.module.less
 create mode 100644 src/components/BasicsInput/BasicsInput.tsx
 create mode 100644 src/components/BasicsSelect/BasicsSelect.module.less
 create mode 100644 src/components/BasicsSelect/BasicsSelect.tsx
 create mode 100644 src/components/BasicsTable/BasicsTable.module.less
 create mode 100644 src/components/BasicsTable/BasicsTable.tsx
 delete mode 100644 src/index.css
 create mode 100644 src/index.less
 create mode 100644 src/pages/IntegratedCommand/pages/CompletePeriod/DataReport/DataReport.module.less
 create mode 100644 src/pages/IntegratedCommand/pages/CompletePeriod/DataReport/DataReport.tsx

diff --git a/src/api/index.ts b/src/api/index.ts
index 054985a..cc58c6c 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -54,4 +54,15 @@ export async function rubbishStatisc(dateType: 'day' | 'month') {
 // 违规驾驶报警统计
 export async function outLineStatisc() {
     return request.post(handleGateway('/supervisoryCommand/drivingAlarmMonth', '/element'))
-}
\ No newline at end of file
+}
+
+// 获取垃圾车类型
+export async function carTypeOptions(id: string) {
+    return request.post(handleGateway('/supervisoryCommand/findGarbageCarTypeOptions?garbageTypeIds=' + id, '/element'))
+}
+
+// 获取垃圾列表 
+export async function rubbishPageList(data: any) {
+    return request.postForm(handleGateway('/supervisoryCommand/garbageWeightChangeForCar', '/element'), data)
+}
+
diff --git a/src/components/BasicsInput/BasicsInput.module.less b/src/components/BasicsInput/BasicsInput.module.less
new file mode 100644
index 0000000..9d922f0
--- /dev/null
+++ b/src/components/BasicsInput/BasicsInput.module.less
@@ -0,0 +1,10 @@
+.inp {
+    height: 80px;
+    border-radius: 15px;
+    background-color: rgba(38, 99, 156, 0.3);
+    color: #fff;
+
+    &::placeholder {
+        color: gray;
+    }
+}
\ No newline at end of file
diff --git a/src/components/BasicsInput/BasicsInput.tsx b/src/components/BasicsInput/BasicsInput.tsx
new file mode 100644
index 0000000..53c0751
--- /dev/null
+++ b/src/components/BasicsInput/BasicsInput.tsx
@@ -0,0 +1,24 @@
+import { Input, InputProps, ConfigProvider } from "antd"
+import styles from './BasicsInput.module.less'
+import { FC } from "react"
+
+type BasicsInputProps = InputProps
+const BasicsInput: FC<BasicsInputProps> = ({ className, ...props }) => {
+    return <ConfigProvider theme={{
+        components: {
+            Input: {
+                activeBg: 'rgba(38,99,156,0.3)',
+                activeBorderColor: '#3893BD',
+                hoverBg: 'rgba(38,99,156,0.3)',
+                hoverBorderColor: '#3893BD',
+                inputFontSize: 30,
+                paddingBlock: 0,
+                paddingInline: 25
+            }
+        }
+    }}>
+        <Input className={`${styles.inp} ${className || ''}`} placeholder="请输入" {...props} />
+    </ConfigProvider>
+}
+
+export default BasicsInput
\ No newline at end of file
diff --git a/src/components/BasicsModal/BasicsModal.tsx b/src/components/BasicsModal/BasicsModal.tsx
index b99eaf5..8e0c566 100644
--- a/src/components/BasicsModal/BasicsModal.tsx
+++ b/src/components/BasicsModal/BasicsModal.tsx
@@ -15,11 +15,12 @@ const BasicsModal: FC<BasicsModalProps> = (props) => {
         style={{
             minWidth: modalProps.width
         }}
-        destroyOnClose
         getContainer={() => document.querySelector('#root') as HTMLElement}
         classNames={{
             content: styles.content
         }}
+        destroyOnClose
+        centered
         {...modalProps}
     >
         {children}
diff --git a/src/components/BasicsSelect/BasicsSelect.module.less b/src/components/BasicsSelect/BasicsSelect.module.less
new file mode 100644
index 0000000..9da2a31
--- /dev/null
+++ b/src/components/BasicsSelect/BasicsSelect.module.less
@@ -0,0 +1,26 @@
+.select {
+    height: 80px;
+
+
+    :global {
+        .ant-select-selector {
+            background: rgba(38, 99, 156, 0.3) !important;
+            color: #fff;
+            font-size: 30px;
+            border-radius: 15px;
+
+            .ant-select-selection-search {
+                .ant-select-selection-search-input {
+                    height: 100%;
+                    font-size: inherit;
+                }
+            }
+
+            &::placeholder,
+            .ant-select-selection-placeholder {
+                color: gray;
+
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/components/BasicsSelect/BasicsSelect.tsx b/src/components/BasicsSelect/BasicsSelect.tsx
new file mode 100644
index 0000000..2344901
--- /dev/null
+++ b/src/components/BasicsSelect/BasicsSelect.tsx
@@ -0,0 +1,20 @@
+import { ConfigProvider, Select, SelectProps } from "antd"
+import styles from './BasicsSelect.module.less'
+import { FC } from "react"
+
+type BasicsSelectProps = SelectProps
+const BasicsSelect: FC<BasicsSelectProps> = ({ className, ...props }) => {
+    return <ConfigProvider theme={{
+        components: {
+            Select: {
+                // activeBorderColor:'#3893BD',
+                // hoverBorderColor:'#3893BD',
+                selectorBg:'red'
+            }
+        }
+    }}>
+        <Select className={`${styles.select} ${className || ''}`} placeholder='请选择' {...props} />
+    </ConfigProvider>
+}
+
+export default BasicsSelect
\ No newline at end of file
diff --git a/src/components/BasicsTable/BasicsTable.module.less b/src/components/BasicsTable/BasicsTable.module.less
new file mode 100644
index 0000000..a4dc7cd
--- /dev/null
+++ b/src/components/BasicsTable/BasicsTable.module.less
@@ -0,0 +1,54 @@
+.table {
+    :global {
+        .ant-pagination {
+            .ant-pagination-item {
+                font-size: 30px;
+            }
+
+            .ant-select {
+                height: 100%;
+
+                .ant-select-selection-item {
+                    font-size: 25px;
+                }
+            }
+
+            .ant-pagination-total-text,
+            .ant-pagination-item-link {
+                font-size: 30px;
+                color: #1677ff;
+            }
+        }
+
+        .ant-table {
+            background: #fff;
+
+            .ant-table-content {
+                // .ant-table-thead {
+                //     .ant-table-cell {
+                //         background: #fff;
+                //     }
+                // }
+
+                .ant-table-tbody {
+                    .ant-table-row {
+                        .ant-table-cell {
+                            background: #fff;
+                        }
+                    }
+                }
+            }
+        }
+
+        .ant-spin {
+            .ant-spin-dot {
+                font-size: 60px;
+
+                .ant-spin-dot-item {
+                    width: 30px;
+                    height: 30px;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/components/BasicsTable/BasicsTable.tsx b/src/components/BasicsTable/BasicsTable.tsx
new file mode 100644
index 0000000..40ab0f7
--- /dev/null
+++ b/src/components/BasicsTable/BasicsTable.tsx
@@ -0,0 +1,122 @@
+import { useSetState, useUpdateEffect } from "ahooks"
+import { ConfigProvider, Table, TableProps } from "antd"
+import { useEffect, useMemo, useState } from "react"
+import styles from './BasicsTable.module.less'
+
+type BasicsTableProps<T> = {
+    getList: (params: any) => Promise<{
+        code: number
+        data: {
+            total: number
+            list: T[]
+        }
+    }>
+    params?: { [x: string]: any }
+    firstLoad?: boolean
+    serialNumber?: boolean
+    cellCenter?: boolean
+} & TableProps
+
+const BasicsTable = <T extends any>(props: BasicsTableProps<T>) => {
+    const { getList, params, firstLoad = true, serialNumber = true, cellCenter = true, columns, className, ...tableProps } = props
+    const [isFirst, setIsFirst] = useState(firstLoad)
+    const [loading, setLoading] = useState(false)
+    const [pageData, setPageData] = useSetState({
+        pageNum: 1,
+        pageSize: 10,
+    })
+    const [listData, setListData] = useSetState({
+        total: 0,
+        list: [] as any[]
+    })
+
+    const getListData = async () => {
+        setLoading(true)
+        const res = await getList({
+            ...pageData,
+            ...params
+        }).finally(() => {
+            setLoading(false)
+            setIsFirst(false)
+        })
+        if (res.code === 0) {
+            const { total, list } = res.data
+            setListData({ total, list })
+        }
+    }
+
+    useEffect(() => {
+        if (isFirst) {
+            getListData()
+        }
+    }, [])
+
+    useUpdateEffect(() => {
+        getListData()
+    }, [pageData])
+
+    useUpdateEffect(() => {
+        setPageData({ ...pageData, pageNum: 1 })
+    }, [params])
+
+    // const tabRef = useRef(null)
+    const customColumns = useMemo<TableProps['columns']>(() => {
+        if (columns) {
+            if (cellCenter) {
+                columns.forEach((v) => {
+                    v.align = v.align ? v.align : 'center'
+                })
+            }
+            if (serialNumber) {
+                return [
+                    {
+                        title: '序号',
+                        width: 100,
+                        align: 'center',
+                        render: (_val, _record, index) => (pageData.pageNum - 1) * pageData.pageSize + index + 1
+                    },
+                    ...columns
+                ]
+            }
+        }
+    }, [columns, pageData])
+
+    return <ConfigProvider
+        theme={{
+            components: {
+                Table: {
+                    headerBorderRadius: 20,
+                    cellFontSize: 30
+                },
+                Pagination: {
+                    itemSize: 50
+                }
+            }
+        }}
+    >
+        <Table
+            scroll={{ y: 1200 }}
+            rowKey='id'
+            {...tableProps}
+            columns={customColumns}
+            className={`${styles.table} ${className || ''}`}
+            loading={loading}
+            dataSource={listData.list}
+            pagination={{
+                showTotal: (total) => `共 ${total} 条`,
+                total: listData.total,
+                current: pageData.pageNum,
+                pageSize: pageData.pageSize,
+                showSizeChanger: true,
+                onShowSizeChange: (_, pageSize) => {
+                    setPageData({ pageNum: 1, pageSize })
+                },
+                onChange: (pageNum, pageSize) => {
+                    setPageData({ pageNum, pageSize })
+                },
+            }}
+        />
+    </ConfigProvider>
+}
+
+export default BasicsTable
\ No newline at end of file
diff --git a/src/components/Modal1/Modal1.tsx b/src/components/Modal1/Modal1.tsx
index 7cd9735..1b12fd6 100644
--- a/src/components/Modal1/Modal1.tsx
+++ b/src/components/Modal1/Modal1.tsx
@@ -9,7 +9,7 @@ import headUlr2 from '@/assets/images/bg/head2.png'
 type Modal1Props = {
     open: boolean
     onCancel: () => void
-    title: ReactNode
+    title?: ReactNode
     children: ReactNode
     type?: keyof typeof bgTypes
     width?: CSSProperties['width']
diff --git a/src/index.css b/src/index.css
deleted file mode 100644
index a3f520e..0000000
--- a/src/index.css
+++ /dev/null
@@ -1,31 +0,0 @@
-#root {
-  margin: 0;
-  position: absolute;
-  inset: 0;
-}
-
-*{
-    scrollbar-width: none; 
-
-    ::-webkit-scrollbar {
-        width: 0 !important;
-        display: none; 
-    };
-    -ms-overflow-style: none;
-}
-
-@font-face {
-  font-family: "DIN"; /* 定义字体名称 */
-  src: url("./assets/fonts/D-DIN.otf"),
-    /* 字体文件路径及格式 */ url("./assets/fonts/D-DINCondensed.otf"); /* 可以指定多个备用格式 */
-}
-
-@font-face {
-  font-family: "YouSheBiaoTiHei";
-  src: url("./assets/fonts/youshebiaoti.ttf");
-}
-
-
-.anchorBL {
-    display: none;
-}
\ No newline at end of file
diff --git a/src/index.less b/src/index.less
new file mode 100644
index 0000000..af0bad3
--- /dev/null
+++ b/src/index.less
@@ -0,0 +1,36 @@
+#root {
+    margin: 0;
+    position: absolute;
+    inset: 0;
+}
+
+* {
+    scrollbar-width: none;
+
+    ::-webkit-scrollbar {
+        width: 0 !important;
+        display: none;
+    }
+
+    ;
+    -ms-overflow-style: none;
+}
+
+@font-face {
+    font-family: "DIN";
+    /* 定义字体名称 */
+    src: url("./assets/fonts/D-DIN.otf"),
+        /* 字体文件路径及格式 */
+        url("./assets/fonts/D-DINCondensed.otf");
+    /* 可以指定多个备用格式 */
+}
+
+@font-face {
+    font-family: "YouSheBiaoTiHei";
+    src: url("./assets/fonts/youshebiaoti.ttf");
+}
+
+
+.anchorBL {
+    display: none;
+}
\ No newline at end of file
diff --git a/src/main.tsx b/src/main.tsx
index 4b46bf6..05ea210 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -1,5 +1,5 @@
 import ReactDOM from "react-dom/client";
-import "./index.css";
+import "./index.less";
 import { RouterProvider } from "react-router-dom";
 import router from "./router";
 import locale from "antd/locale/zh_CN";
diff --git a/src/pages/IntegratedCommand/pages/CompletePeriod/DataReport/DataReport.module.less b/src/pages/IntegratedCommand/pages/CompletePeriod/DataReport/DataReport.module.less
new file mode 100644
index 0000000..c341be0
--- /dev/null
+++ b/src/pages/IntegratedCommand/pages/CompletePeriod/DataReport/DataReport.module.less
@@ -0,0 +1,3 @@
+.box {
+    padding: 30px;
+}
\ No newline at end of file
diff --git a/src/pages/IntegratedCommand/pages/CompletePeriod/DataReport/DataReport.tsx b/src/pages/IntegratedCommand/pages/CompletePeriod/DataReport/DataReport.tsx
new file mode 100644
index 0000000..2056c00
--- /dev/null
+++ b/src/pages/IntegratedCommand/pages/CompletePeriod/DataReport/DataReport.tsx
@@ -0,0 +1,106 @@
+import Modal1 from "@/components/Modal1/Modal1"
+import { Flex, TableProps } from "antd"
+import { FC, useEffect, useState } from "react"
+import styles from './DataReport.module.less'
+import BasicsTable from "@/components/BasicsTable/BasicsTable"
+import BasicsInput from "@/components/BasicsInput/BasicsInput"
+import BasicsSelect from "@/components/BasicsSelect/BasicsSelect"
+import { carTypeOptions, rubbishPageList } from "@/api"
+import { useSetState } from "ahooks"
+
+type DataReportProps = {
+    open: boolean
+    onCancel: () => void
+    otherData: {
+        typeName: string
+        typeCode: string
+        dateType: string
+    }
+}
+
+const DataReport: FC<DataReportProps> = (props) => {
+    const { open, onCancel, otherData: { typeName, typeCode, dateType } } = props
+
+    const [carOption, setCarOption] = useState([])
+    const getCarType = async () => {
+        const res = await carTypeOptions(typeCode)
+        if (res.code === 0) {
+            setCarOption(res.data)
+        }
+    }
+
+    useEffect(() => {
+        if (open) {
+            getCarType()
+            setQuery({
+                garbageTypeIds: typeCode,
+                dateType,
+                carTypeId: '',
+                plateNumber: ''
+            })
+        }
+    }, [open])
+
+    const [query, setQuery] = useSetState<any>({})
+    const columns: TableProps['columns'] = [
+        {
+            title: '时间',
+            dataIndex: 'sendTime',
+            width: 200
+        },
+        {
+            title: '车辆',
+            dataIndex: 'plateNumber',
+        },
+        {
+            title: '垃圾类型',
+            dataIndex: 'garbageType',
+        },
+        {
+            title: '收集量(T)',
+            dataIndex: 'weight',
+            render: (val) => (val / 1000).toFixed(2),
+            width: 180
+        },
+        {
+            title: '收集地点',
+            dataIndex: 'address'
+        },
+    ]
+
+    return <Modal1
+        open={open}
+        onCancel={onCancel}
+        title={`数据报表-${typeName}`}
+        width={2310}
+    >
+        <Flex className={styles.box} vertical gap={20}>
+            <Flex gap={20}>
+                <BasicsSelect
+                    style={{ width: 500 }}
+                    showSearch
+                    options={carOption}
+                    onChange={(carTypeId) => {
+                        setQuery({ carTypeId })
+                    }}
+                />
+                <BasicsInput
+                    style={{ width: 500 }}
+                    onKeyUp={(e) => {
+                        if (e.key === 'Enter') {
+                            const plateNumber = e.currentTarget.value
+                            setQuery({ plateNumber })
+                        }
+                    }}
+                />
+            </Flex>
+            <BasicsTable
+                params={query}
+                getList={rubbishPageList}
+                columns={columns}
+            />
+        </Flex>
+    </Modal1>
+}
+
+export default DataReport
\ No newline at end of file
diff --git a/src/pages/IntegratedCommand/pages/CompletePeriod/index.tsx b/src/pages/IntegratedCommand/pages/CompletePeriod/index.tsx
index 815087f..ed34b27 100644
--- a/src/pages/IntegratedCommand/pages/CompletePeriod/index.tsx
+++ b/src/pages/IntegratedCommand/pages/CompletePeriod/index.tsx
@@ -17,6 +17,7 @@ import testImg1 from '@/assets/images/imgs/testImg1.png'
 import testImg2 from '@/assets/images/imgs/testImg2.png'
 import { useEffect, useState } from "react";
 import { rubbishStatisc } from "@/api";
+import DataReport from "./DataReport/DataReport";
 
 const icons = [icon20, icon22, icon23, icon21]
 
@@ -36,6 +37,10 @@ export default function () {
     useEffect(() => {
         getData()
     }, [dateType])
+
+    const [dataReportShow, setDataReportShow] = useState(false)
+    const [reportData, setReportData] = useState<any>({})
+
     return (
         <GlassCard width={784} height={863} size="small" style={{ padding: 30, position: 'relative', zIndex: 20 }}>
             <Title
@@ -48,90 +53,97 @@ export default function () {
                     { label: '本月', value: 'month' },
                 ]} onChange={(val) => setDateType(val as any)} />}
             />
-            <SubTitle>
-                <div>
-                    {datas.name}<span className={styles.value}>{datas.totalValue}</span>{datas.unit}
-                </div>
-            </SubTitle>
-            <Row style={{ margin: "16px 0" }}>
-                {datas?.childrens?.map((v: any, i: number) => {
-                    const { name, totalValue, unit } = v
-                    return <Col span={12} style={{ marginBottom: 20 }} key={i}>
-                        <ImgAndValue
-                            icon={icons[i]}
-                            title={name}
-                            value={totalValue}
-                            unit={unit}
-                        />
-                    </Col>
-                })}
-            </Row>
-            <SubTitle title="垃圾流转"></SubTitle>
-            <Flex align="center" style={{ margin: "16px 0" }}>
-                <div className={styles.flowItem}>
-                    <div className={styles.value_1}>
-                        0<span className={styles.unit}>T</span>
+            <div style={{
+                height: 680,
+                overflow: 'auto'
+            }}>
+                <SubTitle>
+                    <div>
+                        {datas.name}<span className={styles.value}>{datas.totalValue}</span>{datas.unit}
                     </div>
-                    <div className={styles.desc}>垃圾收集点</div>
-                </div>
-                <div>
-                    <img src={icon24} alt=""></img>
-                </div>
-                <div className={styles.flowItem}>
-                    <div className={styles.value_2}>
-                        0<span className={styles.unit}>T</span>
+                </SubTitle>
+                <Row style={{ margin: "16px 0" }}>
+                    {datas?.childrens?.map((v: any, i: number) => {
+                        const { name, totalValue, unit, value } = v
+                        return <Col span={12} style={{ marginBottom: 20, cursor: 'pointer' }} key={i} onClick={() => {
+                            setReportData({ typeName: name, typeCode: value, dateType })
+                            setDataReportShow(true)
+                        }}>
+                            <ImgAndValue
+                                icon={icons[i] ? icons[i] : icons[0]}
+                                title={name}
+                                value={totalValue}
+                                unit={unit}
+                            />
+                        </Col>
+                    })}
+                </Row>
+                <SubTitle title="垃圾流转"></SubTitle>
+                <Flex align="center" style={{ margin: "16px 0" }}>
+                    <div className={styles.flowItem}>
+                        <div className={styles.value_1}>
+                            0<span className={styles.unit}>T</span>
+                        </div>
+                        <div className={styles.desc}>垃圾收集点</div>
                     </div>
-                    <div className={styles.desc}>收运车辆 </div>
-                </div>
-                <div>
-                    <img src={icon24} alt=""></img>
-                </div>
-                <div className={styles.flowItem}>
-                    <div className={styles.value_3}>
-                        0<span className={styles.unit}>T</span>
+                    <div>
+                        <img src={icon24} alt=""></img>
                     </div>
-                    <div className={styles.desc}>转运站 </div>
-                </div>
-                <div>
-                    <img src={icon24} alt=""></img>
-                </div>
-                <div className={styles.flowItem}>
-                    <div className={styles.value_4}>
-                        0<span className={styles.unit}>T</span>
+                    <div className={styles.flowItem}>
+                        <div className={styles.value_2}>
+                            0<span className={styles.unit}>T</span>
+                        </div>
+                        <div className={styles.desc}>收运车辆 </div>
                     </div>
-                    <div className={styles.desc}>末端处置厂</div>
-                </div>
-            </Flex>
-            <SubTitle title="收运作业问题"></SubTitle>
-            <Image
-                width={200}
-                style={{ display: 'none' }}
-                src={prevUrl}
-                preview={{
-                    visible: prevShow,
-                    scaleStep: 0.5,
-                    src: prevUrl,
-                    onVisibleChange: (value) => {
-                        setPrevShow(value);
-                    },
-                }}
-            />
-            <Row style={{ margin: "16px 0" }}>
-                <Col span={8} style={{ cursor: 'pointer' }}>
-                    <ImgAndValue
-                        icon={icon25}
-                        title={"混装混运"}
-                        gap={6}
-                        value={1}
-                        valueStyle={{ color: "#fff" }}
-                        unit={"次"}
-                        onClick={() => {
-                            setPrevUrl(testImg1)
-                            setPrevShow(true)
-                        }}
-                    />
-                </Col>
-                {/* <Col span={8}>
+                    <div>
+                        <img src={icon24} alt=""></img>
+                    </div>
+                    <div className={styles.flowItem}>
+                        <div className={styles.value_3}>
+                            0<span className={styles.unit}>T</span>
+                        </div>
+                        <div className={styles.desc}>转运站 </div>
+                    </div>
+                    <div>
+                        <img src={icon24} alt=""></img>
+                    </div>
+                    <div className={styles.flowItem}>
+                        <div className={styles.value_4}>
+                            0<span className={styles.unit}>T</span>
+                        </div>
+                        <div className={styles.desc}>末端处置厂</div>
+                    </div>
+                </Flex>
+                <SubTitle title="收运作业问题"></SubTitle>
+                <Image
+                    width={200}
+                    style={{ display: 'none' }}
+                    src={prevUrl}
+                    preview={{
+                        visible: prevShow,
+                        scaleStep: 0.5,
+                        src: prevUrl,
+                        onVisibleChange: (value) => {
+                            setPrevShow(value);
+                        },
+                    }}
+                />
+                <Row style={{ margin: "16px 0" }}>
+                    <Col span={8} style={{ cursor: 'pointer' }}>
+                        <ImgAndValue
+                            icon={icon25}
+                            title={"混装混运"}
+                            gap={6}
+                            value={'0'}
+                            valueStyle={{ color: "#fff" }}
+                            unit={"次"}
+                            onClick={() => {
+                                setPrevUrl(testImg1)
+                                setPrevShow(true)
+                            }}
+                        />
+                    </Col>
+                    {/* <Col span={8}>
                     <ImgAndValue
                         icon={icon25}
                         title={"跨区域收运"}
@@ -141,21 +153,23 @@ export default function () {
                         unit={"次"}
                     />
                 </Col> */}
-                <Col span={8} style={{ cursor: 'pointer' }}>
-                    <ImgAndValue
-                        icon={icon25}
-                        title={"抛洒滴漏"}
-                        value={1}
-                        valueStyle={{ color: "#fff" }}
-                        gap={6}
-                        unit={"次"}
-                        onClick={() => {
-                            setPrevUrl(testImg2)
-                            setPrevShow(true)
-                        }}
-                    />
-                </Col>
-            </Row>
+                    <Col span={8} style={{ cursor: 'pointer' }}>
+                        <ImgAndValue
+                            icon={icon25}
+                            title={"抛洒滴漏"}
+                            value={'0'}
+                            valueStyle={{ color: "#fff" }}
+                            gap={6}
+                            unit={"次"}
+                            onClick={() => {
+                                setPrevUrl(testImg2)
+                                setPrevShow(true)
+                            }}
+                        />
+                    </Col>
+                </Row>
+            </div>
+            <DataReport open={dataReportShow} onCancel={() => setDataReportShow(false)} otherData={reportData} />
         </GlassCard>
     );
 }
diff --git a/src/pages/IntegratedCommand/pages/Map/index.tsx b/src/pages/IntegratedCommand/pages/Map/index.tsx
index fd6e9c6..3db1952 100644
--- a/src/pages/IntegratedCommand/pages/Map/index.tsx
+++ b/src/pages/IntegratedCommand/pages/Map/index.tsx
@@ -105,7 +105,6 @@ const CustomMap: React.FC = () => {
 
     const Timer = useRef<NodeJS.Timeout>()
     useEffect(() => {
-        getGpsCarFrom808()
         getCarMarker()
         clearInterval(Timer.current)
         Timer.current = setInterval(() => {
-- 
GitLab