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 ( -
-
-
{ +// return ( +//
+//
+// { - setQuery({ - ...query, page: 1, unit: v.unit, startTime: v?.time && moment(v?.time[0]).startOf('day').format('YYYY-MM-DD HH:mm:ss'), - endTime: v?.time && moment(v?.time[1]).add(1, 'days').endOf('day').format('YYYY-MM-DD HH:mm:ss') - }) - }}> +// setQuery({ +// ...query, page: 1, unit: v.unit, startTime: v?.time && moment(v?.time[0]).startOf('day').format('YYYY-MM-DD HH:mm:ss'), +// endTime: v?.time && moment(v?.time[1]).add(1, 'days').endOf('day').format('YYYY-MM-DD HH:mm:ss') +// }) +// }}> - {/* - - */} - +// {/* +// +// */} +// - {/* */} -
- { - if (r?.url && r?.id) { - return - - - } else { - return '--' - } - } - }, - { - title: '日期', - dataIndex: 'time', - key: 'time', - render: (t, r) => { - const localTime = moment.utc(r?.time).format('YYYY-MM-DD HH:mm:ss') - return r?.time ? localTime : '--' - } - }, - ]} - dataSource={datasource || []} - loading={loading} - pagination={{ - total: total || 0, - pageSize: 10, - defaultPageSize: 10, - showSizeChanger: false, - onChange: (page, pageSize) => { - setQuery({ - ...query, - page, - limit: pageSize - }) - } - }} - rowKey="key" - toolBarRender={false} - search={false} - /> +// {/* */} +//
+// { +// if (r?.url && r?.id) { +// return +// +// +// } else { +// return '--' +// } +// } +// }, +// { +// title: '日期', +// dataIndex: 'time', +// key: 'time', +// render: (t, r) => { +// const localTime = moment.utc(r?.time).format('YYYY-MM-DD HH:mm:ss') +// return r?.time ? localTime : '--' +// } +// }, +// ]} +// dataSource={datasource || []} +// loading={loading} +// pagination={{ +// total: total || 0, +// pageSize: 10, +// defaultPageSize: 10, +// showSizeChanger: false, +// onChange: (page, pageSize) => { +// setQuery({ +// ...query, +// page, +// limit: pageSize +// }) +// } +// }} +// rowKey="key" +// toolBarRender={false} +// search={false} +// /> -
- ) -} -function mapStateToProps (state) { - const { auth, assess } = state - return { - user: auth.user, - assess: assess.data || [], - } -} -export default connect(mapStateToProps)(Carimages) \ No newline at end of file +//
+// ) +// } +// function mapStateToProps (state) { +// const { auth, assess } = state +// return { +// user: auth.user, +// assess: assess.data || [], +// } +// } +// export default connect(mapStateToProps)(Carimages) \ No newline at end of file diff --git a/web/client/src/sections/fillion/nav-item.js b/web/client/src/sections/fillion/nav-item.js index 80b147c1..2afb0eb5 100644 --- a/web/client/src/sections/fillion/nav-item.js +++ b/web/client/src/sections/fillion/nav-item.js @@ -73,10 +73,10 @@ export function getNavItem (user, dispatch) { 治超管理 : ''} - {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'OVERLOADMANAGE') ? + {/* {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'OVERLOADMANAGE') ? 车辆抓拍管理 - : ''} + : ''}*/} : '' } diff --git a/web/client/src/sections/fillion/routes.js b/web/client/src/sections/fillion/routes.js index 9e32bce8..ba33bc39 100644 --- a/web/client/src/sections/fillion/routes.js +++ b/web/client/src/sections/fillion/routes.js @@ -33,14 +33,14 @@ export default [{ breadcrumb: '治超管理', authCode: 'OVERLOADMANAGE' }, - { - path: '/carimages', - key: 'fillioncarimages', - menuSelectKeys: ['fillioncarimages'], - component: Carimages, - breadcrumb: '车辆抓拍管理', - authCode: 'OVERLOADMANAGE' - }, + // { + // path: '/carimages', + // key: 'fillioncarimages', + // menuSelectKeys: ['fillioncarimages'], + // component: Carimages, + // breadcrumb: '车辆抓拍管理', + // authCode: 'OVERLOADMANAGE' + // }, { path: '/luzheng', key: 'luzheng',