diff --git a/api/.vscode/launch.json b/api/.vscode/launch.json index 9801c188..5e7bdb8a 100644 --- a/api/.vscode/launch.json +++ b/api/.vscode/launch.json @@ -16,8 +16,8 @@ "-p 13400", "-f http://localhost:13400", // "-g postgres://FashionAdmin:123456@10.8.16.184:5432/sihaogonglu", - "-g postgres://postgres:123@10.8.30.32:5432/highways4good", - // "-g postgres://postgres:123@10.8.30.32:5432/highway4test", + // "-g postgres://postgres:123@10.8.30.32:5432/highways4good", + "-g postgres://postgres:123@10.8.30.32:5432/highway4test", // "-g postgres://FashionAdmin:123456@10.8.30.156:5432/highway4goodn0728", "--qnak XuDgkao6cL0HidoMAPnA5OB10Mc_Ew08mpIfRJK5", "--qnsk yewcieZLzKZuDfig0wLZ9if9jKp2P_1jd3CMJPSa", diff --git a/web/client/src/sections/fillion/containers/carimages.js b/web/client/src/sections/fillion/containers/carimages.js index 6e354754..4e85fee9 100644 --- a/web/client/src/sections/fillion/containers/carimages.js +++ b/web/client/src/sections/fillion/containers/carimages.js @@ -1,124 +1,124 @@ -import React, { useState, useEffect } from 'react' -import { connect } from 'react-redux' -import { getCarImages } from '../actions/carimages' -import ProTable from '@ant-design/pro-table' -import { Form, Space, DatePicker, Button, Select, Popconfirm, Image, Tooltip } from 'antd' -import moment from 'moment' +// import React, { useState, useEffect } from 'react' +// import { connect } from 'react-redux' +// import { getCarImages } from '../actions/carimages' +// import ProTable from '@ant-design/pro-table' +// import { Form, Space, DatePicker, Button, Select, Popconfirm, Image, Tooltip } from 'antd' +// import moment from 'moment' -function Carimages (props) { - const { dispatch, assess, user } = props - const [query, setQuery] = useState({ page: 1, pageSize: 10, }) - const [loading, setLoading] = useState(false) - const [datasource, setdatasource] = useState([]) - const [dateRange, setDateRange] = useState(['1970-1-1', '2099-12-31']) - const { RangePicker } = DatePicker - const [total, settotal] = useState(0) - const [editAble, setEditAble] = useState(user?.username !== 'SuperAdmin' && user?.userResources?.find(i => i.resourceId === 'ASSESSMANAGE')?.isshow === "true" ? true : '') - useEffect(() => { +// function Carimages (props) { +// const { dispatch, assess, user } = props +// const [query, setQuery] = useState({ page: 1, pageSize: 10, }) +// const [loading, setLoading] = useState(false) +// const [datasource, setdatasource] = useState([]) +// const [dateRange, setDateRange] = useState(['1970-1-1', '2099-12-31']) +// const { RangePicker } = DatePicker +// const [total, settotal] = useState(0) +// const [editAble, setEditAble] = useState(user?.username !== 'SuperAdmin' && user?.userResources?.find(i => i.resourceId === 'ASSESSMANAGE')?.isshow === "true" ? true : '') +// useEffect(() => { - return () => { } - }, []) +// return () => { } +// }, []) - useEffect(() => { - getData() - }, [query]) +// useEffect(() => { +// getData() +// }, [query]) - const getData = () => { - console.log(query, 'query') - dispatch(getCarImages({ ...query })).then(res => { - if (res?.success) { - setdatasource(res?.payload?.data?.rows) - settotal(res?.payload?.data?.count) - } - }) - } +// const getData = () => { +// console.log(query, 'query') +// dispatch(getCarImages({ ...query })).then(res => { +// if (res?.success) { +// setdatasource(res?.payload?.data?.rows) +// settotal(res?.payload?.data?.count) +// } +// }) +// } - return ( -