From 4f400d288a537b902317e991ed410d15f738d5e8 Mon Sep 17 00:00:00 2001 From: xingyongchun Date: Thu, 21 Jul 2022 09:56:14 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/client/assets/color.less | 10 +- web/client/src/app.js | 5 +- .../src/layout/containers/layout/index.js | 8 +- .../src/sections/example/actions/example.js | 15 - .../src/sections/example/actions/index.js | 7 - .../sections/example/containers/example.js | 43 - .../src/sections/example/containers/index.js | 5 - web/client/src/sections/example/index.js | 15 - web/client/src/sections/example/nav-item.js | 16 - .../src/sections/example/reducers/index.js | 5 - web/client/src/sections/example/routes.js | 18 - web/client/src/sections/example/style.less | 3 - .../fillion/components/bridgeTable.js | 2 +- .../fillion/components/highwaysTable.js | 2 +- .../sections/fillion/components/inforTable.js | 405 ++- .../sections/fillion/components/protable.less | 9 + .../fillion/components/publicTable.js | 2248 +---------------- .../src/sections/fillion/containers/index.js | 12 +- .../src/sections/fillion/containers/infor.js | 29 +- web/client/src/sections/fillion/nav-item.js | 24 +- web/client/src/sections/fillion/routes.js | 68 +- .../src/sections/middleground/actions/data.js | 30 - .../sections/middleground/actions/index.js | 7 - .../middleground/components/dateModal.js | 118 - .../sections/middleground/components/index.js | 5 - .../sections/middleground/containers/data.js | 157 -- .../sections/middleground/containers/index.js | 5 - web/client/src/sections/middleground/index.js | 15 - .../src/sections/middleground/nav-item.js | 18 - .../sections/middleground/reducers/index.js | 5 - .../src/sections/middleground/routes.js | 14 - .../src/sections/middleground/style.less | 86 - .../sections/organization/containers/index.js | 5 +- .../src/sections/organization/nav-item.js | 11 +- .../src/sections/organization/routes.js | 10 +- .../src/sections/report/actions/compile.js | 37 - .../src/sections/report/actions/config.js | 59 - .../src/sections/report/actions/download.js | 26 - .../src/sections/report/actions/index.js | 11 - .../report/components/compileDrawer.js | 118 - .../sections/report/components/configModal.js | 124 - .../src/sections/report/containers/compile.js | 111 - .../src/sections/report/containers/config.js | 157 -- .../sections/report/containers/download.js | 129 - .../src/sections/report/containers/index.js | 7 - web/client/src/sections/report/index.js | 15 - web/client/src/sections/report/nav-item.js | 35 - .../src/sections/report/reducers/index.js | 5 - web/client/src/sections/report/routes.js | 33 - web/client/src/sections/report/style.less | 3 - web/log/development.txt | 4 +- web/package-lock.json | 615 ++++- web/package.json | 1 + 53 files changed, 1129 insertions(+), 3796 deletions(-) delete mode 100644 web/client/src/sections/example/actions/example.js delete mode 100644 web/client/src/sections/example/actions/index.js delete mode 100644 web/client/src/sections/example/containers/example.js delete mode 100644 web/client/src/sections/example/containers/index.js delete mode 100644 web/client/src/sections/example/index.js delete mode 100644 web/client/src/sections/example/nav-item.js delete mode 100644 web/client/src/sections/example/reducers/index.js delete mode 100644 web/client/src/sections/example/routes.js delete mode 100644 web/client/src/sections/example/style.less delete mode 100644 web/client/src/sections/middleground/actions/data.js delete mode 100644 web/client/src/sections/middleground/actions/index.js delete mode 100644 web/client/src/sections/middleground/components/dateModal.js delete mode 100644 web/client/src/sections/middleground/components/index.js delete mode 100644 web/client/src/sections/middleground/containers/data.js delete mode 100644 web/client/src/sections/middleground/containers/index.js delete mode 100644 web/client/src/sections/middleground/index.js delete mode 100644 web/client/src/sections/middleground/nav-item.js delete mode 100644 web/client/src/sections/middleground/reducers/index.js delete mode 100644 web/client/src/sections/middleground/routes.js delete mode 100644 web/client/src/sections/middleground/style.less delete mode 100644 web/client/src/sections/report/actions/compile.js delete mode 100644 web/client/src/sections/report/actions/config.js delete mode 100644 web/client/src/sections/report/actions/download.js delete mode 100644 web/client/src/sections/report/actions/index.js delete mode 100644 web/client/src/sections/report/components/compileDrawer.js delete mode 100644 web/client/src/sections/report/components/configModal.js delete mode 100644 web/client/src/sections/report/containers/compile.js delete mode 100644 web/client/src/sections/report/containers/config.js delete mode 100644 web/client/src/sections/report/containers/download.js delete mode 100644 web/client/src/sections/report/containers/index.js delete mode 100644 web/client/src/sections/report/index.js delete mode 100644 web/client/src/sections/report/nav-item.js delete mode 100644 web/client/src/sections/report/reducers/index.js delete mode 100644 web/client/src/sections/report/routes.js delete mode 100644 web/client/src/sections/report/style.less diff --git a/web/client/assets/color.less b/web/client/assets/color.less index fb497618..f684d0bc 100644 --- a/web/client/assets/color.less +++ b/web/client/assets/color.less @@ -1149,10 +1149,10 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte .ant-mentions-dropdown-menu-item-active {background-color: @item-hover-bg;} .ant-menu-item-danger.ant-menu-item {color: #ff4d4f;} .ant-menu-item-danger.ant-menu-item:hover, .ant-menu-item-danger.ant-menu-item-active {color: #ff4d4f;} -.ant-menu-item-danger.ant-menu-item:active {background: #fff1f0;} +.ant-menu-item-danger.ant-menu-item:active {background: color(~`colorPalette("@{radio-dot-disabled-color}", 1)`);} .ant-menu-item-danger.ant-menu-item-selected {color: #ff4d4f;} .ant-menu-item-danger.ant-menu-item-selected > a, .ant-menu-item-danger.ant-menu-item-selected > a:hover {color: #ff4d4f;} -.ant-menu:not(.ant-menu-horizontal) .ant-menu-item-danger.ant-menu-item-selected {background-color: #fff1f0;} +.ant-menu:not(.ant-menu-horizontal) .ant-menu-item-danger.ant-menu-item-selected {background-color: color(~`colorPalette("@{radio-dot-disabled-color}", 1)`);} .ant-menu-inline .ant-menu-item-danger.ant-menu-item::after {border-right-color: #ff4d4f;} .ant-menu-dark .ant-menu-item-danger.ant-menu-item, .ant-menu-dark .ant-menu-item-danger.ant-menu-item:hover, .ant-menu-dark .ant-menu-item-danger.ant-menu-item > a {color: #ff4d4f;} .ant-menu-dark.ant-menu-dark:not(.ant-menu-horizontal) .ant-menu-item-danger.ant-menu-item-selected {color: #fff;background-color: #ff4d4f;} @@ -1722,11 +1722,11 @@ tr.ant-table-expanded-row:hover > td {background: @table-expanded-row-bg;} .ant-tag-checkable:active, .ant-tag-checkable-checked {color: #fff;} .ant-tag-checkable-checked {background-color: @primary-color;} .ant-tag-checkable:active {background-color: color(~`colorPalette("@{primary-color}", 7)`);} -.ant-tag-pink {color: #c41d7f;background: #fff0f6;border-color: #ffadd2;} +.ant-tag-pink {color: #c41d7f;background: color(~`colorPalette("@{alert-info-bg-color}", 1)`);border-color: #ffadd2;} .ant-tag-pink-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;} -.ant-tag-magenta {color: #c41d7f;background: #fff0f6;border-color: #ffadd2;} +.ant-tag-magenta {color: #c41d7f;background: color(~`colorPalette("@{alert-info-bg-color}", 1)`);border-color: #ffadd2;} .ant-tag-magenta-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;} -.ant-tag-red {color: #cf1322;background: #fff1f0;border-color: #ffa39e;} +.ant-tag-red {color: #cf1322;background: color(~`colorPalette("@{radio-dot-disabled-color}", 1)`);border-color: #ffa39e;} .ant-tag-red-inverse {color: #fff;background: #f5222d;border-color: #f5222d;} .ant-tag-volcano {color: #d4380d;background: #fff2e8;border-color: #ffbb96;} .ant-tag-volcano-inverse {color: #fff;background: #fa541c;border-color: #fa541c;} diff --git a/web/client/src/app.js b/web/client/src/app.js index bae8fe06..967a18ac 100644 --- a/web/client/src/app.js +++ b/web/client/src/app.js @@ -3,11 +3,8 @@ import React, { useEffect } from 'react'; import Layout from './layout'; import Auth from './sections/auth'; -import Report from './sections/report'; -import Example from './sections/example'; import Quanju from './sections/quanju'; import Organization from './sections/organization' -import Middleground from './sections/middleground'; import Fillion from './sections/fillion' @@ -21,7 +18,7 @@ const App = props => { return ( ) } diff --git a/web/client/src/layout/containers/layout/index.js b/web/client/src/layout/containers/layout/index.js index 4b85bb3f..f9ffcc21 100644 --- a/web/client/src/layout/containers/layout/index.js +++ b/web/client/src/layout/containers/layout/index.js @@ -8,7 +8,6 @@ import { connect } from 'react-redux'; import { message, Layout, Breadcrumb, Badge } from 'antd'; import Sider from '../../components/sider'; import { getDepMessage } from "../../../sections/organization/actions/user" -import { getFundamental } from "../../../sections/middleground/actions/data" import Header from '../../components/header'; import Footer from '../../components/footer'; import Breadcrumbs from './breadcrumb'; @@ -60,12 +59,7 @@ const LayoutContainer = props => { }); scrollbar = new PerfectScrollbar('#page-content', { suppressScrollX: true }); }, []) - useEffect(() => { - // 获取数据 - dispatch(getFundamental()).then(res => { - setDatas(res) - }) - }, [true]) + useEffect(() => { NProgress.done(); if (!user || !user.authorized) { diff --git a/web/client/src/sections/example/actions/example.js b/web/client/src/sections/example/actions/example.js deleted file mode 100644 index b9b2ffbd..00000000 --- a/web/client/src/sections/example/actions/example.js +++ /dev/null @@ -1,15 +0,0 @@ -'use strict'; - -import { basicAction } from '@peace/utils' -import { ApiTable } from '$utils' - -export function getMembers(orgId) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - actionType: 'GET_MEMBERS', - url: `${ApiTable.getEnterprisesMembers.replace('{enterpriseId}', orgId)}`, - msg: { error: '获取用户列表失败' }, - reducer: { name: 'members' } - }); -} diff --git a/web/client/src/sections/example/actions/index.js b/web/client/src/sections/example/actions/index.js deleted file mode 100644 index 090c73f2..00000000 --- a/web/client/src/sections/example/actions/index.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict'; - -import * as example from './example' - -export default { - ...example -} \ No newline at end of file diff --git a/web/client/src/sections/example/containers/example.js b/web/client/src/sections/example/containers/example.js deleted file mode 100644 index 483cb1da..00000000 --- a/web/client/src/sections/example/containers/example.js +++ /dev/null @@ -1,43 +0,0 @@ -import React, { useEffect } from 'react'; -import { connect } from 'react-redux'; -import { Spin, Card } from 'antd'; -import '../style.less'; -import ProTable, { TableDropdown } from '@ant-design/pro-table'; - -const Example = (props) => { - const { dispatch, actions, user, loading } = props - - useEffect(() => { - dispatch(actions.example.getMembers(user.orgId)) - }, []) - - return ( - -
-

STYLE EXAMPLE

-
- - - - - ) -} - -function mapStateToProps(state) { - const { auth, global, members } = state; - return { - loading: members.isRequesting, - user: auth.user, - actions: global.actions, - members: members.data - }; -} - -export default connect(mapStateToProps)(Example); diff --git a/web/client/src/sections/example/containers/index.js b/web/client/src/sections/example/containers/index.js deleted file mode 100644 index 19e6695d..00000000 --- a/web/client/src/sections/example/containers/index.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -import Example from './example'; - -export { Example }; \ No newline at end of file diff --git a/web/client/src/sections/example/index.js b/web/client/src/sections/example/index.js deleted file mode 100644 index 92c4b452..00000000 --- a/web/client/src/sections/example/index.js +++ /dev/null @@ -1,15 +0,0 @@ -'use strict'; - -import reducers from './reducers'; -import routes from './routes'; -import actions from './actions'; -import { getNavItem } from './nav-item'; - -export default { - key: 'example', - name: '书写示例', - reducers: reducers, - routes: routes, - actions: actions, - getNavItem: getNavItem -}; \ No newline at end of file diff --git a/web/client/src/sections/example/nav-item.js b/web/client/src/sections/example/nav-item.js deleted file mode 100644 index 845c1aa1..00000000 --- a/web/client/src/sections/example/nav-item.js +++ /dev/null @@ -1,16 +0,0 @@ -import React from 'react'; -import { Link } from 'react-router-dom'; -import { Menu } from 'antd'; -import { SettingOutlined } from '@ant-design/icons'; - -const SubMenu = Menu.SubMenu; - -export function getNavItem(user, dispatch) { - return ( - } title={'举个栗子'}> - - 举个棒子 - - - ); -} \ No newline at end of file diff --git a/web/client/src/sections/example/reducers/index.js b/web/client/src/sections/example/reducers/index.js deleted file mode 100644 index 7ed10886..00000000 --- a/web/client/src/sections/example/reducers/index.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -export default { - -} \ No newline at end of file diff --git a/web/client/src/sections/example/routes.js b/web/client/src/sections/example/routes.js deleted file mode 100644 index 591e4ce8..00000000 --- a/web/client/src/sections/example/routes.js +++ /dev/null @@ -1,18 +0,0 @@ -'use strict'; -import { Example, } from './containers'; - -export default [{ - type: 'inner', - route: { - path: '/example', - key: 'example', - breadcrumb: '栗子', - // 不设置 component 则面包屑禁止跳转 - childRoutes: [{ - path: '/e1', - key: 'e1', - component: Example, - breadcrumb: '棒子', - }] - } -}]; \ No newline at end of file diff --git a/web/client/src/sections/example/style.less b/web/client/src/sections/example/style.less deleted file mode 100644 index 33234528..00000000 --- a/web/client/src/sections/example/style.less +++ /dev/null @@ -1,3 +0,0 @@ -#example:hover { - font-size: larger; -} \ No newline at end of file diff --git a/web/client/src/sections/fillion/components/bridgeTable.js b/web/client/src/sections/fillion/components/bridgeTable.js index 2195fba7..7dab06ad 100644 --- a/web/client/src/sections/fillion/components/bridgeTable.js +++ b/web/client/src/sections/fillion/components/bridgeTable.js @@ -30,7 +30,7 @@ const BrideTable = (props) => { onChange: (value, cs) => { setSitename(value.currentTarget.value) }, - placeholder: '请输入道路名称进行搜索', + placeholder: '请输入桥梁代码进行搜索', getPopupContainer: (triggerNode) => triggerNode.parentNode, }, }, diff --git a/web/client/src/sections/fillion/components/highwaysTable.js b/web/client/src/sections/fillion/components/highwaysTable.js index 9efcf91d..ff18948b 100644 --- a/web/client/src/sections/fillion/components/highwaysTable.js +++ b/web/client/src/sections/fillion/components/highwaysTable.js @@ -30,7 +30,7 @@ const HigwaysTable = (props) => { onChange: (value, cs) => { setSitename(value.currentTarget.value) }, - placeholder: '请输入道路名称进行搜索', + placeholder: '请输入桥梁代码进行搜索', getPopupContainer: (triggerNode) => triggerNode.parentNode, }, }, diff --git a/web/client/src/sections/fillion/components/inforTable.js b/web/client/src/sections/fillion/components/inforTable.js index d7c55160..58dc18bf 100644 --- a/web/client/src/sections/fillion/components/inforTable.js +++ b/web/client/src/sections/fillion/components/inforTable.js @@ -1,8 +1,8 @@ import React, { useEffect, useState } from 'react'; import { connect } from 'react-redux'; -import { Spin, Button, Popconfirm, TreeSelect } from 'antd'; +import { Spin, Button, Popconfirm, Badge } from 'antd'; import ProTable from '@ant-design/pro-table'; - +import './protable.less' import moment from 'moment'; import { getReportStatistic } from "../actions/infor" const InForTable = (props) => { @@ -16,137 +16,295 @@ const InForTable = (props) => { useEffect(() => { setRegionId(user.departmentId) }, [user]) - useEffect(() => { - setDay([moment('2022-03-01').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')]) - }, [depData]) - const onChange = (value) => { - // setRegionName(value) - setRegionId(value) - } - const columns = [ - { - title: '场所名称', - dataIndex: 'placeName', - formItemProps: { - label: '场所名称', - }, - fieldProps: { - onChange: (value, cs) => { - setSitename(value.currentTarget.value) + + const columns = + [ + { + title: '检测点名称', + dataIndex: 'placeName', + fixed: 'left', + width: 120, + options: 1, + backgroundColor: "#ffffff", + fieldProps: { + onChange: (value, cs) => { + setSitename(value.currentTarget.value) + }, + placeholder: '请输入检测点名称进行搜索', + getPopupContainer: (triggerNode) => triggerNode.parentNode, }, - placeholder: '请输入场所名称进行搜索', - getPopupContainer: (triggerNode) => triggerNode.parentNode, }, - }, - { - title: '场所地址', - search: false, - dataIndex: 'time', - valueType: 'dateRange', - initialValue: day, - order: 4, - render: (dom, record) => { - return record.address + { + title: '车牌号', + // search: false, + dataIndex: 'containers1', + + fixed: 'left', + width: 120, + render: (dom, record) => { + return record.address + }, + fieldProps: { + placeholder: '请输入车牌号进行搜索', + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, - { - title: '隐患场所', - dataIndex: 'regionName', - valueType: 'select', - initialValue: -1, - fieldProps: { - label: null, - onChange: (value, cs) => { - setPlaceType(value); - }, - options: [{ - - label: '全部', - value: -1 - }, - { - label: '隐患场所', - value: 0 - }, { - label: '非隐患场所', - value: 1 - }, { - label: '非合用场所', - value: 2 - },], - getPopupContainer: (triggerNode) => triggerNode.parentNode, + { + title: '车轴数', + // search: false, + dataIndex: 'containers2', + width: 120, + render: (dom, record) => { + return record.address + }, + fieldProps: { + placeholder: '请输入车轴数进行搜索', + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } }, - order: 5, - render: (dom, record) => { - let flag = "是" - if (record.hiddenDangerItem12 == null) { - flag = / + { + title: '超限率(%)', + // search: false, + dataIndex: 'containers3', + // valueType: 'dateRange', + // initialValue: day, + width: 120, + render: (dom, record) => { + return record.address + }, + fieldProps: { + placeholder: '请输入超限率进行搜索', + getPopupContainer: (triggerNode) => triggerNode.parentNode, } - if (record.hiddenDangerItem12 && record.correctiveAction == null && record.punishment == null) { - flag = 否 + + }, { + title: '超限重量(kg)', + search: false, + dataIndex: 'containers4', + valueType: 'dateRange', + initialValue: day, + + width: 120, + render: (dom, record) => { + return record.address + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '车货总重(kg)', + search: false, + dataIndex: 'containers5', + valueType: 'dateRange', + initialValue: day, + + width: 120, + render: (dom, record) => { + return record.address + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '车货限重(kg)', + search: false, + dataIndex: 'containers6', + valueType: 'dateRange', + initialValue: day, + + width: 120, + render: (dom, record) => { + return record.address + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '检测时间', + // search: false, + key: 'since', + dataIndex: 'createdAt', + valueType: 'dateTime', + width: 120, + render: (dom, record) => { + return record.address + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '经营业户名称', + search: false, + dataIndex: 'containers8', + valueType: 'dateRange', + initialValue: day, + + width: 120, + render: (dom, record) => { + return record.address + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '经营业户地址', + search: false, + dataIndex: 'containers9', + valueType: 'dateRange', + initialValue: day, + + width: 140, + + render: (dom, record) => { + return record.address + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '通知人', + search: false, + dataIndex: 'containers10', + valueType: 'dateRange', + initialValue: day, + + width: 140, + + render: (dom, record) => { + return record.address + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '通知方式', + search: false, + dataIndex: 'containers11', + valueType: 'dateRange', + initialValue: day, + + width: 140, + + render: (dom, record) => { + return record.address + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '通知结果(打不通、表示不来、不是当事人)', + search: false, + dataIndex: 'containers12', + valueType: 'dateRange', + initialValue: day, + + width: 140, + + render: (dom, record) => { + return record.address + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '处理时间', + search: false, + dataIndex: 'time9', + valueType: 'dateRange', + initialValue: day, + + width: 140, + + render: (dom, record) => { + return record.address + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '扣分', + search: false, + dataIndex: 'containers13', + valueType: 'dateRange', + initialValue: day, + + width: 140, + + render: (dom, record) => { + return record.address + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, { + title: '罚款', + search: false, + dataIndex: 'containers14', + valueType: 'dateRange', + initialValue: day, + + width: 140, + + render: (dom, record) => { + return record.address + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, } - return flag - } - }, - { - title: '排查日期', - dataIndex: 'time', - valueType: 'dateRange', - initialValue: day, - order: 4, - fieldProps: { - onChange: (value, cs) => { - setDay(cs) - }, - getPopupContainer: (triggerNode) => triggerNode.parentNode, }, - render: (dom, record) => { - return [moment(record.time).format('YYYY-MM-DD HH:mm:ss'),] - } - }, - { - title: '操作', - dataIndex: 'creatTime', - valueType: 'dateTimeRange', - hideInSearch: true, - render: (dom, record) => { - return - } - }, - ] + { + title: '操作', + dataIndex: 'creatTime', + valueType: 'dateTimeRange', + hideInSearch: true, + width: 120, + fixed: 'right', + render: (dom, record) => { + return
+ + } + }, + { + key: "direction", + hideInTable: true, + dataIndex: "direction", + order: 6, + renderFormItem: (item, { type, defaultRender, ...rest }, form) => { + return ( +
+ +
+ + + ); + }, + }, + ] return ( -

区域：

- { - return depData - }} - expandedKeys={["title"]} - notFoundContent={ - depLoading ? -

- -

: -

暂无数据

- } - getPopupContainer={(triggerNode) => triggerNode.parentNode} - /> -
+
{ finishedProductTable = c; }} style={{ width: "100% ", overflow: "auto", height: '760px' }} - rowKey="id" + rowKey='id' onReset={(v) => { const { id } = depMessage[0] console.log(id) @@ -162,7 +320,7 @@ const InForTable = (props) => { }, }} columns={columns} - options={false} + dataSource={(counts || {}).rows || []} request={async (params) => { const query = { @@ -194,6 +352,7 @@ const InForTable = (props) => { ], }} + >
diff --git a/web/client/src/sections/fillion/components/protable.less b/web/client/src/sections/fillion/components/protable.less index be3408c0..79869a9f 100644 --- a/web/client/src/sections/fillion/components/protable.less +++ b/web/client/src/sections/fillion/components/protable.less @@ -6,4 +6,13 @@ background-color: #ffffff !important; } +} +.spilce{ + .split-row-select-active { + background-color: #e6f7ff; + } +} +.card-protable{display: flex; + flex-direction:row; + width: 100%; } \ No newline at end of file diff --git a/web/client/src/sections/fillion/components/publicTable.js b/web/client/src/sections/fillion/components/publicTable.js index c0d1ff6a..d0aba20d 100644 --- a/web/client/src/sections/fillion/components/publicTable.js +++ b/web/client/src/sections/fillion/components/publicTable.js @@ -17,23 +17,24 @@ const PublicTable = (props) => { setRegionId(user.departmentId) }, [user]) const [activeKey, setActiveKey] = useState('tab1'); - // const renderBadge = (count, active = false) => { - // return ( - // - // ); - // }; const columns = { tab1: [ { - title: '路线名称', + title: '公司', + search: false, + dataIndex: 'containers', + + fixed: 'left', + width: 120, + render: (dom, record) => { + return record.address + }, + fieldProps: { + getPopupContainer: (triggerNode) => triggerNode.parentNode, + } + }, + { + title: '车队', dataIndex: 'placeName', fixed: 'left', width: 120, @@ -43,26 +44,12 @@ const PublicTable = (props) => { onChange: (value, cs) => { setSitename(value.currentTarget.value) }, - placeholder: '请输入道路名称进行搜索', + placeholder: '请输入所属车队', getPopupContainer: (triggerNode) => triggerNode.parentNode, }, }, { - title: '路线代码', - search: false, - dataIndex: 'containers', - - fixed: 'left', - width: 120, - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, - { - title: '路段序号', + title: '车队长', search: false, dataIndex: 'time2', valueType: 'dateRange', @@ -76,7 +63,7 @@ const PublicTable = (props) => { } }, { - title: '乡镇编码', + title: '副车队长', search: false, dataIndex: 'time3', valueType: 'dateRange', @@ -91,7 +78,7 @@ const PublicTable = (props) => { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '起点地名', + title: '办公地点', search: false, dataIndex: 'time4', valueType: 'dateRange', @@ -105,7 +92,7 @@ const PublicTable = (props) => { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '起点桩号', + title: '线路名称', search: false, dataIndex: 'time5', valueType: 'dateRange', @@ -119,7 +106,7 @@ const PublicTable = (props) => { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '起点分界点类别', + title: '线路类型', search: false, dataIndex: 'time6', valueType: 'dateRange', @@ -132,238 +119,106 @@ const PublicTable = (props) => { fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } - }, { - title: '止点地名', - search: false, - dataIndex: 'time7', - valueType: 'dateRange', - initialValue: day, - - width: 120, - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '止点分界点类别', - search: false, - dataIndex: 'time8', - valueType: 'dateRange', - initialValue: day, - + }, + { + title: '操作', + dataIndex: 'creatTime', + valueType: 'dateTimeRange', + hideInSearch: true, width: 120, + fixed: 'right', render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '止点桩号', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '路段类型', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '路网调整前路线编码', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '原路段序号', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '原路段起点桩号', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '原路段止点桩号', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '路线等级', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '路段性质', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, + return
- render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, } - }, { - title: '建成时间', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, + }, + { + key: "direction", + hideInTable: true, + dataIndex: "direction", + order: 6, + renderFormItem: (item, { type, defaultRender, ...rest }, form) => { + return ( +
+ +
- width: 140, - render: (dom, record) => { - return record.address + ); }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '改建时间', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, + }, + ], tab2: [ + { + title: '所属公司', + search: false, + dataIndex: 'containers', + fixed: 'left', + width: 120, render: (dom, record) => { return record.address }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } - }, { - title: '建设性质', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, + }, + { + title: '所属车队', + dataIndex: 'placeName', + fixed: 'left', + width: 120, + options: 1, + backgroundColor: "#ffffff", + // render: (dom, record) => { + // return record.address + // }, fieldProps: { + onChange: (value, cs) => { + setSitename(value.currentTarget.value) + }, + placeholder: '请输入所属车队', getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '最近一次修复养护年度', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: 'GBM及文明样板路', + }, + { + title: '所属线路', search: false, - dataIndex: 'time9', + dataIndex: 'time2', valueType: 'dateRange', - initialValue: day, - - width: 140, - + // align: 'right', + width: 120, render: (dom, record) => { return record.address }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } - }, { - title: '地貌', + }, + { + title: '车辆编号', search: false, - dataIndex: 'time9', + dataIndex: 'time3', valueType: 'dateRange', initialValue: day, - width: 140, + width: 120, render: (dom, record) => { return record.address }, @@ -371,14 +226,13 @@ const PublicTable = (props) => { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '收费性质', + title: '车辆牌照号', search: false, - dataIndex: 'time9', + dataIndex: 'time4', valueType: 'dateRange', initialValue: day, - width: 140, - + width: 120, render: (dom, record) => { return record.address }, @@ -386,14 +240,13 @@ const PublicTable = (props) => { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '所属收费站', + title: '运营类别', search: false, - dataIndex: 'time9', + dataIndex: 'time5', valueType: 'dateRange', initialValue: day, - width: 140, - + width: 120, render: (dom, record) => { return record.address }, @@ -401,1919 +254,20 @@ const PublicTable = (props) => { getPopupContainer: (triggerNode) => triggerNode.parentNode, } }, { - title: '涵洞数量', + title: '已使用年限', search: false, - dataIndex: 'time9', + dataIndex: 'time6', valueType: 'dateRange', initialValue: day, - width: 140, - + width: 120, render: (dom, record) => { return record.address }, fieldProps: { getPopupContainer: (triggerNode) => triggerNode.parentNode, } - }, { - title: '技术等级', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '路面类型', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '面层厚度（厘米）', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '路面宽度', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '路基宽度', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '是否晴雨通车', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '车道特征', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '设计时速', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '是否城管路段', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '管养单位', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '路政管理单位', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '列养情况', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '列养资金来源', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '养护时间', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '可绿化里程', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '已绿化里程', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '重复道路路段类型', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '重复路段序号', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '重复路段路线编码', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划资金类别', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划年度', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划文号', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划项目唯一编码', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划项目路线编码', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划项目名称', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划项目类型', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '完工情况', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '完工年度', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划资金类别', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划年度', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划文号', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划项目唯一编码', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划项目名称', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '完工情况', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '完工年度', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '桩号范围', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '填报单位', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '变更原因', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '变更时间', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '是否按干线公路管理接养', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '备注', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '上年路线编码', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '上年路线名称', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '上年起点桩号', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '上年止点桩号', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '图形里程', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '桩号里程', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '所在区县', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '所在地市', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, - { - title: '操作', - dataIndex: 'creatTime', - valueType: 'dateTimeRange', - hideInSearch: true, - width: 120, - fixed: 'right', - render: (dom, record) => { - return
- - } - }, - { - key: "direction", - hideInTable: true, - dataIndex: "direction", - order: 6, - renderFormItem: (item, { type, defaultRender, ...rest }, form) => { - return ( -
- -
- - - ); - }, - }, - ], tab2: [ - { - title: '路线名称', - dataIndex: 'placeName', - fixed: 'left', - width: 120, - options: 1, - backgroundColor: "#ffffff", - fieldProps: { - onChange: (value, cs) => { - setSitename(value.currentTarget.value) - }, - placeholder: '请输入道路名称进行搜索', - getPopupContainer: (triggerNode) => triggerNode.parentNode, - }, - }, - { - title: '路线代码', - search: false, - dataIndex: 'containers', - - fixed: 'left', - width: 120, - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, - { - title: '路段序号', - search: false, - dataIndex: 'time2', - valueType: 'dateRange', - // align: 'right', - width: 120, - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, - { - title: '乡镇编码', - search: false, - dataIndex: 'time3', - valueType: 'dateRange', - initialValue: day, - - - width: 120, - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '起点地名', - search: false, - dataIndex: 'time4', - valueType: 'dateRange', - initialValue: day, - - width: 120, - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '起点桩号', - search: false, - dataIndex: 'time5', - valueType: 'dateRange', - initialValue: day, - - width: 120, - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '起点分界点类别', - search: false, - dataIndex: 'time6', - valueType: 'dateRange', - initialValue: day, - - width: 120, - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '止点地名', - search: false, - dataIndex: 'time7', - valueType: 'dateRange', - initialValue: day, - - width: 120, - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '止点分界点类别', - search: false, - dataIndex: 'time8', - valueType: 'dateRange', - initialValue: day, - - width: 120, - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '止点桩号', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '路段类型', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '路网调整前路线编码', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '原路段序号', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '原路段起点桩号', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '原路段止点桩号', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '路线等级', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '路段性质', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '建成时间', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '改建时间', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '建设性质', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '最近一次修复养护年度', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: 'GBM及文明样板路', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '地貌', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '收费性质', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '所属收费站', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '涵洞数量', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '技术等级', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '路面类型', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '面层厚度（厘米）', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '路面宽度', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '路基宽度', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '是否晴雨通车', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '车道特征', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '设计时速', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '是否城管路段', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '管养单位', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '路政管理单位', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '列养情况', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '列养资金来源', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '养护时间', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '可绿化里程', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '已绿化里程', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '重复道路路段类型', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '重复路段序号', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '重复路段路线编码', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划资金类别', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划年度', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划文号', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划项目唯一编码', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划项目路线编码', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划项目名称', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划项目类型', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '完工情况', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '完工年度', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划资金类别', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划年度', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划文号', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划项目唯一编码', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '计划项目名称', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '完工情况', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '完工年度', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '桩号范围', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '填报单位', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '变更原因', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '变更时间', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '是否按干线公路管理接养', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '备注', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '上年路线编码', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '上年路线名称', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '上年起点桩号', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '上年止点桩号', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '图形里程', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '桩号里程', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '所在区县', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, { - title: '所在地市', - search: false, - dataIndex: 'time9', - valueType: 'dateRange', - initialValue: day, - - width: 140, - - render: (dom, record) => { - return record.address - }, - fieldProps: { - getPopupContainer: (triggerNode) => triggerNode.parentNode, - } - }, + }, { title: '操作', dataIndex: 'creatTime', diff --git a/web/client/src/sections/fillion/containers/index.js b/web/client/src/sections/fillion/containers/index.js index 3cfa6ecf..b135e3ee 100644 --- a/web/client/src/sections/fillion/containers/index.js +++ b/web/client/src/sections/fillion/containers/index.js @@ -1,6 +1,12 @@ 'use strict'; -import infor from './infor'; +import Infor from './infor'; +import transportation from './transportation'; +import BridgeTable from './bridge'; +import HigHways from './highways'; +import OperaTional from './operational'; +import Enforce from './enforce'; +import Public from './public'; +import Videois from './videois'; - -export { infor }; \ No newline at end of file +export { Infor,transportation,BridgeTable,HigHways,OperaTional,Enforce,Public,Videois }; \ No newline at end of file diff --git a/web/client/src/sections/fillion/containers/infor.js b/web/client/src/sections/fillion/containers/infor.js index 4e2c3b21..eb72fbcd 100644 --- a/web/client/src/sections/fillion/containers/infor.js +++ b/web/client/src/sections/fillion/containers/infor.js @@ -3,7 +3,6 @@ import { connect } from 'react-redux'; import '../style.less'; import { getDepMessage, getReportStatistic } from "../actions/infor" import InForTable from '../components/inforTable'; -import UserModal from '../components/infor/details'; const superagent = require('superagent'); const infor = (props) => { const { dispatch, user} = props @@ -15,16 +14,16 @@ const infor = (props) => { dispatch(getReportStatistic()) setData(props) }, []); - //打开弹窗 - const openModal = (type, record) => { - setModalVisible(true); - // setModalType(type); - if (type == 'edit') { - setModalRecord(record); - } else { - setModalRecord(null); - } - } + // //打开弹窗 + // const openModal = (type, record) => { + // setModalVisible(true); + // // setModalType(type); + // if (type == 'edit') { + // setModalRecord(record); + // } else { + // setModalRecord(null); + // } + // } //批量导出 const exports = (ids,counts) => { // console.log(user); @@ -42,12 +41,8 @@ const infor = (props) => { }) } return ( - <> - + <> + ) } function mapStateToProps(state) { diff --git a/web/client/src/sections/fillion/nav-item.js b/web/client/src/sections/fillion/nav-item.js index 70b55fd6..6517d23a 100644 --- a/web/client/src/sections/fillion/nav-item.js +++ b/web/client/src/sections/fillion/nav-item.js @@ -5,9 +5,29 @@ import { ReadOutlined } from '@ant-design/icons'; const SubMenu = Menu.SubMenu; export function getNavItem(user, dispatch) { return ( - } title={'填报管理'}> + } title={'数据管理'}> - 填报信息 + 治超管理 + + + 道路管理 + + 桥梁管理 + + + 路政管理 + + + 运政管理 + + + 执法管理 + + + 公交管理 + + + 视频管理 ); diff --git a/web/client/src/sections/fillion/routes.js b/web/client/src/sections/fillion/routes.js index 693ca601..aeba08d1 100644 --- a/web/client/src/sections/fillion/routes.js +++ b/web/client/src/sections/fillion/routes.js @@ -1,19 +1,71 @@ 'use strict'; -import { infor } from './containers'; +import { Infor } from './containers'; +import { transportation } from './containers'; +import { BridgeTable } from './containers'; +import { HigHways } from './containers'; +import { OperaTional } from './containers'; +import { Enforce } from './containers'; +import { Public } from './containers'; +import { Videois } from './containers'; export default [{ type: 'inner', route: { path: '/fillion', key: 'fillion', - breadcrumb: '填报管理', + breadcrumb: '数据管理', menuSelectKeys: ['fillion'], menuOpenKeys: ['fillion'], - childRoutes: [ { + childRoutes: [{ path: '/infor', key: 'fillioninfor', - menuSelectKeys:['fillioninfor'], - component: infor, - breadcrumb: '填报信息', - }] + menuSelectKeys: ['fillioninfor'], + component: Infor, + breadcrumb: '治超管理', + }, { + path: '/transportation', + key: 'filliontransportation', + menuSelectKeys: ['filliontransportation'], + component: transportation, + breadcrumb: '道路管理', + } + , { + path: '/bridge', + key: 'fillionbridge', + menuSelectKeys: ['fillionbridge'], + component: BridgeTable, + breadcrumb: '桥梁管理', + } + , { + path: '/highways', + key: 'fillionhighways', + menuSelectKeys: ['fillionhighways'], + component: HigHways, + breadcrumb: '路政管理', + }, { + path: '/operational', + key: 'fillionoperational', + menuSelectKeys: ['fillionoperational'], + component: OperaTional, + breadcrumb: '运政管理', + }, { + path: '/enforce', + key: 'fillionenforce', + menuSelectKeys: ['fillionenforce'], + component: Enforce, + breadcrumb: '执法管理', + }, { + path: '/public', + key: 'fillionpublic', + menuSelectKeys: ['fillionpublic'], + component: Public, + breadcrumb: '公交管理', + }, { + path: '/videois', + key: 'fillionvideois', + menuSelectKeys: ['fillionvideois'], + component: Videois, + breadcrumb: '视频管理', + } + ] } -}]; \ No newline at end of file +}]; diff --git a/web/client/src/sections/middleground/actions/data.js b/web/client/src/sections/middleground/actions/data.js deleted file mode 100644 index 73080b05..00000000 --- a/web/client/src/sections/middleground/actions/data.js +++ /dev/null @@ -1,30 +0,0 @@ -'use strict'; - -import { basicAction } from '@peace/utils' -import { ApiTable } from '$utils' -export function getFundamental() { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - actionType: 'GET_DATA', - url: ApiTable.getFundamental, - msg: { error: '获取数据失败' }, - reducer: { name: 'datas' } - }); -} - - -export function getsortord(zuo, day) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - actionType: 'GET_PATIENTIA', - url: ApiTable.getsortord.replace('{zuo}', zuo).replace('{day}', day), - msg: { error: '日期更新失败' }, - reducer: { name: 'Patientia' } - }); -} -export default { - getFundamental, - getsortord -} \ No newline at end of file diff --git a/web/client/src/sections/middleground/actions/index.js b/web/client/src/sections/middleground/actions/index.js deleted file mode 100644 index 077a957b..00000000 --- a/web/client/src/sections/middleground/actions/index.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict'; - -import * as date from "./data" - -export default { - ...date -} \ No newline at end of file diff --git a/web/client/src/sections/middleground/components/dateModal.js b/web/client/src/sections/middleground/components/dateModal.js deleted file mode 100644 index 5b83cbed..00000000 --- a/web/client/src/sections/middleground/components/dateModal.js +++ /dev/null @@ -1,118 +0,0 @@ -import React, { useState, useEffect } from 'react' -import { connect } from 'react-redux'; -import { getFundamental } from '../actions/data'; -import * as echarts from "echarts" -import "../style.less" - -const DateModal = (props) => { - const { dispatch } = props - const [lists, setLists] = useState([]) - const [keys, setKeys] = useState([]) - const [days, setDays] = useState() - const [unkeys, setUnkeys] = useState([]) - const [num, setNum] = useState(1) - useEffect(() => { - // 获取数据 - dispatch(getFundamental()).then(res => { - setDays(res.payload.data.date) - - }) - }, [true]) - - const op = () => { - // 把获取的数据进行加工 - if (days && num == 1) { - - var daysValues = Object.values(days) - var daysKeys = Object.keys(days) - var list = [] - var arr = [] - var months = [] - for (let index = 6; index >= 0; index--) { - list.push(daysValues[index]) - } - setLists(list) - for (let index = 6; index >= 0; index--) { - arr.push(daysKeys[index].substring(8)) - } - for (let index = 6; index >= 0; index--) { - months.push(daysKeys[index].charAt(5) + "" + daysKeys[index].charAt(6)) - } - setUnkeys(months) - setKeys(arr) - setNum(2) - } - } - op() - useEffect(() => { - let a = ([...keys]) - let list = [] - for (let index = 0; index < 7; index++) { - list.push(a[index]) - } - for (let index = 0; index < 7; index++) { - list[index] = list[index] + "日" - } - var myChart = echarts.init(document.getElementById('echarts')); - // window.onresize在重复使用过程中会被覆盖 - // window.onresize = myChart.resize; - // addEventListener来添加监听resize的事件，将能避免onresize的覆盖问题，并能实现对窗口的监听操作 - window.addEventListener("resize", function () { - myChart.resize() - }) - var option = { - title: { - text: '近七日填报数量', - left: "7%" - }, - grid: { - left: '3%', - right: '4%', - bottom: '3%', - containLabel: true - }, - tooltip: { - trigger: 'item', - formatter: function (params) { - var htmlStr = `填报数量:${params.value}条
${unkeys[params.dataIndex] + "月" + params.name}
` - return htmlStr; - } - }, - xAxis: { - type: 'category', - data: list, - axisTick: { - alignWithLabel: true - } - }, - yAxis: { - type: "value", - }, - series: [ - { - name: '填报数量', - type: 'bar', - data: lists, - barWidth: 40 - } - ] - }; - - // 使用刚指定的配置项和数据显示图表。 - myChart.setOption(option); - }, [lists]) - return ( -
- ) -} -function mapStateToProps(state) { - const { auth, depMessage, depUser, global } = state; - return { - user: auth.user, - clientHeight: global.clientHeight, - loading: depMessage.isRequesting, - depMessage: depMessage.data || [], - depUser: depUser.data || [] - }; -} -export default connect(mapStateToProps)(DateModal) \ No newline at end of file diff --git a/web/client/src/sections/middleground/components/index.js b/web/client/src/sections/middleground/components/index.js deleted file mode 100644 index 70405b5b..00000000 --- a/web/client/src/sections/middleground/components/index.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -import DateModal from './dateModal'; - -export { DateModal }; \ No newline at end of file diff --git a/web/client/src/sections/middleground/containers/data.js b/web/client/src/sections/middleground/containers/data.js deleted file mode 100644 index 72a46915..00000000 --- a/web/client/src/sections/middleground/containers/data.js +++ /dev/null @@ -1,157 +0,0 @@ -import React, { useEffect, useState } from "react"; -import { connect } from "react-redux"; -import { Space, Row, Col, DatePicker, Spin } from "antd"; -import { getFundamental, getsortord } from "../actions/data"; -import { DateModal } from "../components"; -import moment from "moment"; -import "../style.less"; -const { RangePicker } = DatePicker; -const UserManage = (props) => { - const { dispatch, loading, datas, Patientias } = props; - const dateFormat = "YYYY/MM/DD"; - const [data, setData] = useState(); - const [Patientia, setPatientia] = useState(); - useEffect(() => { - // 获取数据 - dispatch(getFundamental()).then((res) => { - setData(res); - }); - }, [true]); - useEffect(() => { - // 根据接口获取规定时间内获取到的数据 - var customField = [ - moment().add(-6, "day").format("YYYY-MM-DD"), - moment(new Date(), dateFormat).format("YYYY-MM-DD"), - ]; - dispatch(getsortord(customField[0], customField[1])).then((res) => { - setPatientia(res.payload.data); - }); - }, [true]); - // useEffect(() => { - /* Patientia ? setPatientia(Patientia */ /* .sort(sortByKey("count")) */ /* ) : null */ - // }, [Patientia]) - // 根据数组里面对象的key值进行排序 - // const sortByKey = (key) => { - // return function (a, b) { - // var value1 = a[key]; - // var value2 = b[key]; - // return value2 - value1; - // } - // } - const disabledDate = (current) => { - return ( - (current && current < moment("2022/03/01").subtract("day")) || - current > moment(new Date()).subtract("days") - ); - }; - const getTime = (date) => { - // 根据时间框时间获取数据进行展示 - if (date) { - var ao = []; - ao.push(date[0].format("YYYY/MM/DD")); - ao.push(date[1].format("YYYY/MM/DD")); - } - dispatch(getsortord(ao[0], ao[1])).then((res) => { - setPatientia(res.payload.data /* .sort(sortByKey("count")) */); - }); - }; - - return ( -
- {/* 此处进行了loding的效果 */} - - {/* 页面上部分代码 */} -
- - - 今日新增填报 -

{datas.data ? datas.data.added : null}

- - - 今日已审填报 -

- {datas.data ? datas.data.checked : null} - /{datas.data ? datas.data.unChecked : null} -

- - - 隐患场所总数 -

{datas.data ? datas.data.danger_place : null}

- - - 历史填报 -

{datas.data ? datas.data.history : null}

- - -
- {/* 页面下部分代码 */} -
- {/* echarts柱状图 */} -
{datas ? : null}
- {/* 根据时间进行的排序 */} -
-

各区县合用场所填报数量

- - - -
- {Patientias - ? Patientias.map((item, index) => { - return ( -
  • - {index >= 3 ? ( -
    {index + 1}
    - ) : ( -
    {index + 1}
    - )} - {item.name} - {item.count} -
    • - ); - }) - : null} -
    -
    -
    -     -
    - ); -}; -function mapStateToProps(state) { - // console.log(state); - const { auth, depMessage, depUser, global, datas, Patientia } = state; - // 在reducer中进行数据处理 - const sortByKey = (key) => { - return function (a, b) { - var value1 = a[key]; - var value2 = b[key]; - return value2 - value1; - }; - }; - return { - user: auth.user, - clientHeight: global.clientHeight, - loading: datas.isRequesting && Patientia.isRequesting, - depMessage: depMessage.data || [], - depUser: depUser.data || [], - datas: datas || [], - Patientias: Patientia.data - ? Patientia.data.sort(sortByKey("count")) - : null || [], - }; -} - -export default connect(mapStateToProps)(UserManage); diff --git a/web/client/src/sections/middleground/containers/index.js b/web/client/src/sections/middleground/containers/index.js deleted file mode 100644 index fb6c0ef3..00000000 --- a/web/client/src/sections/middleground/containers/index.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -import UserManage from './data'; - -export { UserManage }; \ No newline at end of file diff --git a/web/client/src/sections/middleground/index.js b/web/client/src/sections/middleground/index.js deleted file mode 100644 index fe3e7793..00000000 --- a/web/client/src/sections/middleground/index.js +++ /dev/null @@ -1,15 +0,0 @@ -'use strict'; - -import reducers from './reducers'; -import routes from './routes'; -import actions from './actions'; -import { getNavItem } from './nav-item'; - -export default { - key: 'middleground', - name: '', - reducers: reducers, - routes: routes, - actions: actions, - getNavItem: getNavItem -}; \ No newline at end of file diff --git a/web/client/src/sections/middleground/nav-item.js b/web/client/src/sections/middleground/nav-item.js deleted file mode 100644 index 51ca9557..00000000 --- a/web/client/src/sections/middleground/nav-item.js +++ /dev/null @@ -1,18 +0,0 @@ -import React from 'react'; -import { Link } from 'react-router-dom'; -import { Menu } from 'antd'; -import { BarChartOutlined } from '@ant-design/icons'; -import { push } from 'react-router-redux'; - - -export function getNavItem(user, dispatch) { - if (user.type != 1) { - dispatch(push('/fillion/infor')); - return null - } - return ( - }> - 数据中心 - - ); -} \ No newline at end of file diff --git a/web/client/src/sections/middleground/reducers/index.js b/web/client/src/sections/middleground/reducers/index.js deleted file mode 100644 index 0203d01b..00000000 --- a/web/client/src/sections/middleground/reducers/index.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -export default { - -}; \ No newline at end of file diff --git a/web/client/src/sections/middleground/routes.js b/web/client/src/sections/middleground/routes.js deleted file mode 100644 index 0d75430b..00000000 --- a/web/client/src/sections/middleground/routes.js +++ /dev/null @@ -1,14 +0,0 @@ -'use strict'; -import { UserManage } from './containers'; - -export default [{ - type: 'inner', - route: { - path: '/middleground', - key: 'middleground', - breadcrumb: '数据中心', - menuSelectKeys: ['userManage'], - component: UserManage, - menuOpenKeys: ['middleground'], - } -}]; \ No newline at end of file diff --git a/web/client/src/sections/middleground/style.less b/web/client/src/sections/middleground/style.less deleted file mode 100644 index 659824ed..00000000 --- a/web/client/src/sections/middleground/style.less +++ /dev/null @@ -1,86 +0,0 @@ -.shuju-top{ - width: 100%; - min-Width: 1110px; - height: 20vh; - border: 1px solid #F2F2F2; - border-Right: 0; - margin-top: 5vh; - overflow: auto; - .wrap{ - min-Height: 100%; - span{ - color: #959595; - font-Size: 18px; - } - p{ - font-Size: 34px; - } - } -} -.shuju-floer{ - width: 100%; - height: 500px; - float: left; - margin-Top: 50px; - min-Width: 1110px; - .shuju-floer-left{ - height: 500px; - float: left; - #echarts{ - width: calc(75vw - 200px ); - min-Width: 810px; - height: 500px; - } - } - .shuju-floer-reght{ - width: calc(32vw - 200px ); - min-Width: 290px; - height: 100%; - float: left; - p{ - color: #464646; - font-Size: 18px; - font-Weight: 600; - } - .dataDisplay{ - width: 340px; - height: 75%; - overflow-y: auto; - .traverse{ - width: 300px; - height: 30px; - list-style: none; - .topThree{ - width: 20px; - height: 20px; - background-Color: #f0f2f5; - float: left; - color: rgba(0, 0, 0, 0.6470588235294118); - border-Radius: 50%; - text-align: center; - line-Height: 20px; - font-Size: 12px; - } - .untopThree{ - width: 20px; - height: 20px; - background-Color: #314559; - float: left; - color: #FFFFFF; - border-radius: 50%; - text-align: center; - line-height: 20px; - font-size: 12px; - } - .siteName{ - margin-left: 20px; - } - .sitePeople{ - float: right; - margin-right: 10px; - } - } - } - - } -} \ No newline at end of file diff --git a/web/client/src/sections/organization/containers/index.js b/web/client/src/sections/organization/containers/index.js index e1a69b05..fc0f4348 100644 --- a/web/client/src/sections/organization/containers/index.js +++ b/web/client/src/sections/organization/containers/index.js @@ -1,6 +1,7 @@ 'use strict'; -import Authority from './authority'; + import UserManage from './user'; -export { Authority, UserManage }; \ No newline at end of file + +export { UserManage}; \ No newline at end of file diff --git a/web/client/src/sections/organization/nav-item.js b/web/client/src/sections/organization/nav-item.js index 19a8d2c5..8970b8ee 100644 --- a/web/client/src/sections/organization/nav-item.js +++ b/web/client/src/sections/organization/nav-item.js @@ -18,14 +18,15 @@ export function getNavItem(user, dispatch) { return null } return ( - } title={'组织管理'}> + } title={'授权管理'}> + {Func.isAuthorized("ORG_MEMBER") && 用户管理 - } - {Func.isAuthorized("ORG_AUTH") && - 权限配置 - } + } + + + ); } \ No newline at end of file diff --git a/web/client/src/sections/organization/routes.js b/web/client/src/sections/organization/routes.js index 67d59793..2b4d1571 100644 --- a/web/client/src/sections/organization/routes.js +++ b/web/client/src/sections/organization/routes.js @@ -1,12 +1,12 @@ 'use strict'; -import { UserManage, Authority } from './containers'; +import { UserManage, Authority,AdminiSter } from './containers'; export default [{ type: 'inner', route: { path: '/organization', key: 'organization', - breadcrumb: '组织管理', + breadcrumb: '授权管理', menuSelectKeys: ['userManage'], menuOpenKeys: ['organization'], childRoutes: [{ @@ -15,12 +15,6 @@ export default [{ menuSelectKeys: ['userManage'], component: UserManage, breadcrumb: '用户管理', - }, { - path: '/authority', - key: 'authority', - component: Authority, - menuSelectKeys: ['authority'], - breadcrumb: '权限配置', }] } }]; \ No newline at end of file diff --git a/web/client/src/sections/report/actions/compile.js b/web/client/src/sections/report/actions/compile.js deleted file mode 100644 index 339bca22..00000000 --- a/web/client/src/sections/report/actions/compile.js +++ /dev/null @@ -1,37 +0,0 @@ -'use strict'; - -import { basicAction } from '@peace/utils' -import { ApiTable } from '$utils' - -export function reportRectify (timeRange) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - actionType: 'GET_REPORT_RECTIFY', - url: `${ApiTable.getReportRectify}?startTime=${timeRange ? timeRange[0] : ''}&endTime=${timeRange ? timeRange[1] : ''}`, - msg: {}, - reducer: { name: 'reportRectify' } - }); -} - -export function reportRectifyDetail (day, depId) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - actionType: 'GET_REPORT_RECTIFY_DETAIL', - url: `${ApiTable.getReportRectifyDetail}?day=${day}&depId=${depId}`, - msg: {}, - reducer: { name: 'reportRectifyDetail' } - }); -} - -export function compileReportRectifyDetail (data) { - return dispatch => basicAction({ - type: 'post', - dispatch: dispatch, - data, - actionType: 'COMPILE_REPORT_RECTIFY_DETAIL', - url: `${ApiTable.compileReportRectifyDetail}`, - msg: { option: '保存信息' }, - }); -} \ No newline at end of file diff --git a/web/client/src/sections/report/actions/config.js b/web/client/src/sections/report/actions/config.js deleted file mode 100644 index d8a66a79..00000000 --- a/web/client/src/sections/report/actions/config.js +++ /dev/null @@ -1,59 +0,0 @@ -'use strict'; - -import { basicAction } from '@peace/utils' -import { ApiTable } from '$utils' - -export function allAreas (orgId) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - actionType: 'GET_ALL_AREAS', - url: `${ApiTable.allAreas}`, - msg: {}, - reducer: { name: 'allAreas' } - }); -} - -export function addReportConfig (data) { - return dispatch => basicAction({ - type: 'post', - dispatch: dispatch, - data: data, - actionType: 'POST_REPORT_CONFIGS', - url: `${ApiTable.addReportConfig}`, - msg: { option: '添加报表配置' }, - }); -} - -export function getReportConfig () { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - actionType: 'GET_REPORT_CONFIGS', - url: `${ApiTable.getReportConfig}`, - msg: { error: '获取报表配置失败' }, - reducer: { name: 'reportConfig' } - }); -} - -export function editReportConfig (data, configId) { - return dispatch => basicAction({ - type: 'put', - dispatch: dispatch, - data: data, - actionType: 'EDIT_REPORT_CONFIGS', - url: `${ApiTable.editReportConfig.replace('{reportId}', configId)}`, - msg: { option: '编辑报表配置' }, - }); -} - -export function delReportConfig (configId) { - return dispatch => basicAction({ - type: 'del', - dispatch: dispatch, - actionType: 'DEL_REPORT_CONFIGS', - url: `${ApiTable.delReportConfig.replace('{reportId}', configId)}`, - msg: { option: '删除报表配置' }, - }); -} - diff --git a/web/client/src/sections/report/actions/download.js b/web/client/src/sections/report/actions/download.js deleted file mode 100644 index 3879fae4..00000000 --- a/web/client/src/sections/report/actions/download.js +++ /dev/null @@ -1,26 +0,0 @@ -import { basicAction } from '@peace/utils' -import { ApiTable } from '$utils' - -export function getReportList(query) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - query: query, - actionType: 'GET_REPORT_LIST', - url: ApiTable.getReportList, - msg: { error: '获取报表数据失败' }, - reducer: { name: 'reportList' } - }); -} - -export function getRegionList(query) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - query: query, - actionType: 'GET_REGION_LIST', - url: ApiTable.allAreas, - msg: { error: '获取区域数据失败' }, - reducer: { name: 'regionList' } - }); -} \ No newline at end of file diff --git a/web/client/src/sections/report/actions/index.js b/web/client/src/sections/report/actions/index.js deleted file mode 100644 index 01665ba2..00000000 --- a/web/client/src/sections/report/actions/index.js +++ /dev/null @@ -1,11 +0,0 @@ -'use strict'; - -import * as config from './config' -import * as download from './download' -import * as compile from './compile' - -export default { - ...config, - ...download, - ...compile, -} \ No newline at end of file diff --git a/web/client/src/sections/report/components/compileDrawer.js b/web/client/src/sections/report/components/compileDrawer.js deleted file mode 100644 index 2b2cb107..00000000 --- a/web/client/src/sections/report/components/compileDrawer.js +++ /dev/null @@ -1,118 +0,0 @@ -import React, { useEffect, useState } from 'react'; -import { connect } from 'react-redux'; -import { Spin, Drawer, Button } from 'antd'; -import '../style.less'; -import { EditableProTable } from '@ant-design/pro-table'; - -const CompileDrawer = (props) => { - const { dispatch, actions, user, loading, visible, checkRow, close, reportRectifyDetail, checkAction } = props - const [requesting, setRequesting] = useState(false) - const [dataSource, setDataSource] = useState([]) - const { report } = actions - const isCheck = checkAction == 'check' - - useEffect(() => { - if (checkRow.day) { - dispatch(report.reportRectifyDetail(checkRow.day, checkRow.depId)) - } - }, [checkRow]) - - useEffect(() => { - let data = reportRectifyDetail - let i = 1 - for (let d of data) { - d.index_ = i++ - } - setDataSource(data) - }, [reportRectifyDetail]) - - return ( - { - close() - }} - visible={visible} - width={'82%'} - > - - r.id) - }} - toolBarRender={() => [ - isCheck ? '' : - - ]} - > - - - - - ) -} - -function mapStateToProps (state) { - const { auth, global, members, reportRectifyDetail } = state; - return { - loading: reportRectifyDetail.isRequesting, - user: auth.user, - actions: global.actions, - members: members.data, - reportRectifyDetail: reportRectifyDetail.data || [] - }; -} - -export default connect(mapStateToProps)(CompileDrawer); diff --git a/web/client/src/sections/report/components/configModal.js b/web/client/src/sections/report/components/configModal.js deleted file mode 100644 index aa5d344f..00000000 --- a/web/client/src/sections/report/components/configModal.js +++ /dev/null @@ -1,124 +0,0 @@ -import React, { useEffect, useRef } from 'react'; -import { connect } from 'react-redux'; -import { Spin, Button, Modal, Form, Switch } from 'antd'; -import ProForm, { ProFormText, ProFormSelect } from '@ant-design/pro-form'; -import { useState } from 'react'; - -const ConfigModal = (props) => { - const { dispatch, actions, user, loading, visible, close, editData, allAreas, reportType } = props - const [excuteTimeOptions, setExcuteTimeOptions] = useState([]) - const formRef = useRef() - const { report } = actions - - useEffect(() => { - let excuteTimeOptions = [] - for (let i = 0; i < 24; i++) { - let curT = i - if (curT < 10) { - curT = '0' + curT - } - excuteTimeOptions.push({ - value: curT + ':00', - label: curT + ':00', - }) - excuteTimeOptions.push({ - value: curT + ':30', - label: curT + ':30', - }) - } - setExcuteTimeOptions(excuteTimeOptions); - }, []) - - return ( - { - formRef.current.validateFields().then(v => { - v.excuteTime = String(v.excuteTime) - console.log(v); - dispatch(editData ? report.editReportConfig(v, editData.id) : report.addReportConfig(v)).then(res => { - if (res.success) { - dispatch(report.getReportConfig()) - close() - } - }) - }) - }} - onCancel={() => { - close() - }} - > - - - - { - return { - value: a.id, - label: a.name, - } - })} - cacheForSwr - name="regionId" - label="区域" - required - rules={[{ required: true, message: '请选择区域' }]} - /> - - - - - - - ) -} - -function mapStateToProps (state) { - const { auth, global, allAreas } = state; - console.log(allAreas); - return { - user: auth.user, - actions: global.actions, - allAreas: allAreas.data || [] - }; -} - -export default connect(mapStateToProps)(ConfigModal); diff --git a/web/client/src/sections/report/containers/compile.js b/web/client/src/sections/report/containers/compile.js deleted file mode 100644 index def77e7b..00000000 --- a/web/client/src/sections/report/containers/compile.js +++ /dev/null @@ -1,111 +0,0 @@ -// 报表编辑 - -import React, { useEffect, useState } from 'react'; -import { connect } from 'react-redux'; -import moment from 'moment' -import CompileDrawer from '../components/compileDrawer' -import { Spin, Button, DatePicker, Space, Switch } from 'antd'; -import ProTable from '@ant-design/pro-table'; -import { Func } from '$utils'; - -const { RangePicker } = DatePicker; - -const Compile = (props) => { - const { dispatch, actions, user, loading, reportRectify } = props - const [searchTime, setSearchTime] = useState([moment(), moment()]) - const [compileDrawerVis, setCompileDrawerVis] = useState(false) - const [checkRow, setCheckRow] = useState({}) - const [checkAction, setCheckAction] = useState('') - const { report } = actions - - const getReportRectify = (searchTime) => { - dispatch(report.reportRectify([moment(searchTime[0]).format('YYYY-MM-DD'), moment(searchTime[1]).format('YYYY-MM-DD')])) - } - - useEffect(() => { - getReportRectify(searchTime) - }, []) - - const showCompileDrawerVis = (row, action) => { - setCompileDrawerVis(true) - setCheckRow(row) - setCheckAction(action) - } - - return ( - - { - return - } - }, { - title: '操作', - dataIndex: 'option', - render: (_, r) => { - return [ - - {/* {Func.isAuthorized("REPORT_EDIT") && - - } */} - - - ] - } - },]} - dataSource={reportRectify} - rowKey="index" - search={false} - options={false} - headerTitle="合用场所安全隐患排查整治汇总表" - toolBarRender={() => [ - { - setSearchTime(date) - getReportRectify(dateString) - }} - />, - ]} - > - - - { - setCompileDrawerVis(false) - setCheckRow({}) - setCheckAction('') - - getReportRectify(searchTime) - }} - checkRow={checkRow} - checkAction={checkAction} - /> - - ) -} - -function mapStateToProps(state) { - const { auth, global, reportRectify } = state; - console.log(reportRectify); - return { - user: auth.user, - actions: global.actions, - loading: reportRectify.isRequesting, - reportRectify: reportRectify.data || [] - }; -} - -export default connect(mapStateToProps)(Compile); diff --git a/web/client/src/sections/report/containers/config.js b/web/client/src/sections/report/containers/config.js deleted file mode 100644 index 40fa411b..00000000 --- a/web/client/src/sections/report/containers/config.js +++ /dev/null @@ -1,157 +0,0 @@ -import React, { useEffect, useState } from 'react'; -import { connect } from 'react-redux'; -import ConfigModal from '../components/configModal' -import { Spin, Button, Space, Popconfirm, Switch } from 'antd'; -import ProTable from '@ant-design/pro-table'; -import '../style.less'; -import Pinyin from '../../../utils/pinyin' -const reportType = [{ - value: 1, - label: '县区排查整治汇总表', -}, { - value: 2, - label: '各县区每日汇总表', -}, { - value: 3, - label: '隐患场所汇总表', -},] -var pinyin = null -var as = null -var bs = null -const Config = (props) => { - const { dispatch, actions, loading, reportConfig, allAreas } = props - const [configModalVis, setConfigModalVis] = useState(false) - const [editData, setEditData] = useState(null) - const { report } = actions - useEffect(() => { - dispatch(report.getReportConfig()) - dispatch(report.allAreas()) - - }, []) - useEffect(()=>{ - pinyin=new Pinyin() - }) - return ( - - { - let regionOne = allAreas.find(item => item.id == a.regionId) - let regionTwo = allAreas.find(item => item.id == b.regionId) - - if (regionOne) { - as = pinyin.getCamelChars(regionOne.name).toLowerCase() - - } if (regionTwo) { - bs = pinyin.getCamelChars(regionTwo.name).toLowerCase() - - } else { - return '' - } - let codeOne=as.substr(0,1).charCodeAt() - let codeTwo=bs.substr(0,1).charCodeAt() - return codeOne-codeTwo - }, - render: (_, row, index, action) => { - let curRegion = allAreas.find(a => a.id == row.regionId) - return curRegion ? curRegion.name : '' - }, - }, { - title: '类型', - dataIndex: 'reportType', - - render: (_, r) => { - let curType = reportType.find(t => t.value == r.reportTypeId) - return curType ? curType.label : '' - }, - - }, { - title: '生成时间', - dataIndex: 'index', - render: (_, row) => { - return `每日 ${row.excuteTime.indexOf(':') > -1 ? row.excuteTime : row.excuteTime + ':00'}` - } - }, { - title: '启用状态', - dataIndex: 'isEnable', - render: (_, row) => { - return - - } - }, { - title: '操作', - dataIndex: 'option', - render: (_, row) => { - return [ - - - { - dispatch(report.delReportConfig(row.id)).then(res => { - if (res.success) { - dispatch(report.getReportConfig()) - } - }) - }} - > - - - - ] - } - },]} - dataSource={reportConfig} - rowKey="id" - search={false} - options={false} - toolBarRender={() => [ - , - ]} - > - - - { - configModalVis ? - { - setConfigModalVis(false) - setEditData(null) - }} - reportType={reportType} - editData={editData} - /> : '' - } - - ) -} - -function mapStateToProps(state) { - const { auth, global, reportConfig, allAreas } = state; - return { - loading: reportConfig.isRequesting, - user: auth.user, - actions: global.actions, - reportConfig: reportConfig.data || [], - allAreas: allAreas.data || [] - }; -} - -export default connect(mapStateToProps)(Config); diff --git a/web/client/src/sections/report/containers/download.js b/web/client/src/sections/report/containers/download.js deleted file mode 100644 index ff379d21..00000000 --- a/web/client/src/sections/report/containers/download.js +++ /dev/null @@ -1,129 +0,0 @@ -import React, { useEffect } from 'react'; -import { connect } from 'react-redux'; -import { Spin, Button } from 'antd'; -import ProTable from '@ant-design/pro-table'; -import '../style.less'; -import moment from 'moment'; -import { Func } from '$utils'; - -const Download = (props) => { - const { dispatch, actions, reportList, regionList, user } = props - - useEffect(() => { - dispatch(actions.report.getRegionList()); - }, []); - - const columns = [{ - title: '报表名称', - dataIndex: 'reportName', - formItemProps: { - label: null, - }, - fieldProps: { - placeholder: '输入报表名称' - } - }, { - title: '区域名称', - dataIndex: 'regionName', - valueType: 'select', - initialValue: -1, - fieldProps: { - label: null, - options: [{ - label: '全部', - value: -1 - }].concat(regionList) - }, - order: 5, - render: (dom, record) => { - return record.department ? record.department.name : null - } - }, { - title: '类型', - dataIndex: 'reportType', - hideInSearch: true, - render: (dom, record) => { - return record.reportType ? record.reportType.name : null - } - }, { - title: '生成时间', - dataIndex: 'creatTime', - valueType: 'dateTimeRange', - order: 4, - render: (dom, record) => { - return moment(record.creatTime).format('YYYY-MM-DD HH:mm') - } - }] - if (Func.isAuthorized("REPORT_DOWN")) { - columns.push({ - title: '操作', - key: 'option', - hideInSearch: true, - render: (dom, record) => { - // const ApiRoot = localStorage.getItem('tyApiRoot'); - const filePathArr = record.filePath.split('/') - - const fileName = filePathArr.pop() - // console.log(fileName); - return [ - // 下载 - - 下载 - - ] - } - }) - } - - return ( - - { - const query = { - limit: params.pageSize, - offset: params.pageSize * (params.current - 1), - creatTime: params.creatTime, - reportName: params.reportName, - regionName: params.regionName - } - const res = await dispatch(actions.report.getReportList(query)); - return { - ...res, - total: res.payload.data ? res.payload.data.count : 0 - } - }} - > - - - ) -} - -function mapStateToProps (state) { - const { auth, global, reportList, regionList } = state; - const { count, rows } = reportList.data || {}; - let regions = []; - if (regionList.data && regionList.data.length > 0) { - regions = regionList.data.map(v => { - return { - label: v.name, - value: v.id, - } - }); - } - return { - user: auth.user, - actions: global.actions, - reportList: rows || [], - regionList: regions - }; -} - -export default connect(mapStateToProps)(Download); \ No newline at end of file diff --git a/web/client/src/sections/report/containers/index.js b/web/client/src/sections/report/containers/index.js deleted file mode 100644 index 0b3cead7..00000000 --- a/web/client/src/sections/report/containers/index.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict'; - -import Config from './config'; -import Download from './download'; -import Compile from './compile' - -export { Config, Download, Compile }; \ No newline at end of file diff --git a/web/client/src/sections/report/index.js b/web/client/src/sections/report/index.js deleted file mode 100644 index 68dac209..00000000 --- a/web/client/src/sections/report/index.js +++ /dev/null @@ -1,15 +0,0 @@ -'use strict'; - -import reducers from './reducers'; -import routes from './routes'; -import actions from './actions'; -import { getNavItem } from './nav-item'; - -export default { - key: 'report', - name: '报表管理', - reducers: reducers, - routes: routes, - actions: actions, - getNavItem: getNavItem -}; \ No newline at end of file diff --git a/web/client/src/sections/report/nav-item.js b/web/client/src/sections/report/nav-item.js deleted file mode 100644 index 29c57396..00000000 --- a/web/client/src/sections/report/nav-item.js +++ /dev/null @@ -1,35 +0,0 @@ -import React from 'react'; -import { Link } from 'react-router-dom'; -import { Menu } from 'antd'; -import { FileTextOutlined } from '@ant-design/icons'; -import { Func } from '$utils'; -import { push } from 'react-router-redux'; - - -const SubMenu = Menu.SubMenu; - -export function getNavItem(user, dispatch) { - if (user.type != 1 && user.type != 2) { - dispatch(push('/fillion/infor')); - return null - } - if (!Func.isAuthorized("REPORT_MANAGE")) { - return null - } - return ( - } title={'报表管理'}> - {Func.isAuthorized("REPROT_CONFIG") && - 报表配置 - } - {Func.isAuthorized("REPORT_DOWN") && - 报表下载 - } - {Func.isAuthorized("REPORT_LIST") && - - 整治汇总表 - - } - - - ); -} \ No newline at end of file diff --git a/web/client/src/sections/report/reducers/index.js b/web/client/src/sections/report/reducers/index.js deleted file mode 100644 index 7ed10886..00000000 --- a/web/client/src/sections/report/reducers/index.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -export default { - -} \ No newline at end of file diff --git a/web/client/src/sections/report/routes.js b/web/client/src/sections/report/routes.js deleted file mode 100644 index 1d55966d..00000000 --- a/web/client/src/sections/report/routes.js +++ /dev/null @@ -1,33 +0,0 @@ -'use strict'; -import { Config, Download, Compile } from './containers'; - -export default [{ - type: 'inner', - route: { - path: '/report', - key: 'report', - breadcrumb: '报表管理', - menuSelectKeys: ['config'], - menuOpenKeys: ['report'], - // 不设置 component 则面包屑禁止跳转 - childRoutes: [{ - path: '/config', - key: 'reportConfig', - component: Config, - menuSelectKeys:['reportConfig'], - breadcrumb: '报表配置', - }, { - path: '/download', - key: 'reportDownload', - menuSelectKeys:['reportDownload'], - component: Download, - breadcrumb: '报表下载', - }, { - path: '/compile', - key: 'reportCompile', - menuSelectKeys:['reportCompile'], - component: Compile, - breadcrumb: '整治汇总表', - }] - } -}]; \ No newline at end of file diff --git a/web/client/src/sections/report/style.less b/web/client/src/sections/report/style.less deleted file mode 100644 index 33234528..00000000 --- a/web/client/src/sections/report/style.less +++ /dev/null @@ -1,3 +0,0 @@ -#example:hover { - font-size: larger; -} \ No newline at end of file diff --git a/web/log/development.txt b/web/log/development.txt index b79ade1c..606a4d04 100644 --- a/web/log/development.txt +++ b/web/log/development.txt @@ -3415,5 +3415,5 @@ 2022-07-18 17:40:02.984 - info: [Router] Inject api: attachment/index 2022-07-19 09:38:20.086 - debug: [FS-LOGGER] Init. 2022-07-19 09:38:20.998 - info: [Router] Inject api: attachment/index -2022-07-20 19:49:25.720 - debug: [FS-LOGGER] Init. -2022-07-20 19:49:25.776 - info: [Router] Inject api: attachment/index +2022-07-20 19:15:55.678 - debug: [FS-LOGGER] Init. +2022-07-20 19:15:56.118 - info: [Router] Inject api: attachment/index diff --git a/web/package-lock.json b/web/package-lock.json index eb9cdd96..ee58156f 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -52,6 +52,272 @@ "rc-util": "^5.4.0" } }, + "@ant-design/pro-components": { + "version": "1.1.11", + "resolved": "http://npm.anxinyun.cn/@ant-design%2fpro-components/-/pro-components-1.1.11.tgz", + "integrity": "sha512-90ofw4/Fec/b6hvJdRc+n1UphAo6SPMcidCJv3mRcxkua8IAupGt61gzau8YRTkJ0LR0GvYzf+x6sjHviN59Aw==", + "requires": { + "@ant-design/pro-card": "1.20.13", + "@ant-design/pro-descriptions": "1.11.11", + "@ant-design/pro-field": "1.34.20", + "@ant-design/pro-form": "1.70.3", + "@ant-design/pro-layout": "6.38.13", + "@ant-design/pro-list": "1.21.73", + "@ant-design/pro-provider": "1.9.0", + "@ant-design/pro-skeleton": "1.0.10", + "@ant-design/pro-table": "2.77.3", + "@ant-design/pro-utils": "1.42.5", + "@babel/runtime": "^7.16.3", + "antd": ">=4.0" + }, + "dependencies": { + "@ant-design/pro-card": { + "version": "1.20.13", + "resolved": "http://npm.anxinyun.cn/@ant-design%2fpro-card/-/pro-card-1.20.13.tgz", + "integrity": "sha512-Av4QYSuxZPzUGyoR2Gmz5Dnl2+2UUnPrS/7JA7Y/5HqZBzXMYdd6T4Wk3KAMoX+NmOuBtDM28jWGcvPRVKoCMg==", + "requires": { + "@ant-design/icons": "^4.2.1", + "@ant-design/pro-utils": "1.42.5", + "@babel/runtime": "^7.18.0", + "classnames": "^2.2.6", + "omit.js": "^2.0.2", + "rc-util": "^5.4.0" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.18.9", + "resolved": "http://npm.anxinyun.cn/@babel%2fruntime/-/runtime-7.18.9.tgz", + "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + } + } + }, + "@ant-design/pro-field": { + "version": "1.34.20", + "resolved": "http://npm.anxinyun.cn/@ant-design%2fpro-field/-/pro-field-1.34.20.tgz", + "integrity": "sha512-/NqXLOwx2erx1HFMh1ydHlBCuhPLpvdm3tMacRxiH5h0QKhoDergGy4+ULLe7hT5FWdbjtI7es0xWUe2+HhMUg==", + "requires": { + "@ant-design/icons": "^4.2.1", + "@ant-design/pro-provider": "1.9.0", + "@ant-design/pro-utils": "1.42.5", + "@babel/runtime": "^7.18.0", + "@chenshuai2144/sketch-color": "^1.0.8", + "classnames": "^2.2.6", + "lodash.tonumber": "^4.0.3", + "moment": "^2.27.0", + "omit.js": "^2.0.2", + "rc-util": "^5.4.0", + "swr": "^1.2.0" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.18.9", + "resolved": "http://npm.anxinyun.cn/@babel%2fruntime/-/runtime-7.18.9.tgz", + "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + } + } + }, + "@ant-design/pro-form": { + "version": "1.70.3", + "resolved": "http://npm.anxinyun.cn/@ant-design%2fpro-form/-/pro-form-1.70.3.tgz", + "integrity": "sha512-uJ+GxYhM5oKX681KiEDE2soG/sJDU3JTo+dov3AFYOjwbKue+/CAfAZ1d1JnVS3sglTKJ98kSxg+/1Ft9UR/pQ==", + "requires": { + "@ant-design/icons": "^4.2.1", + "@ant-design/pro-field": "1.34.20", + "@ant-design/pro-provider": "1.9.0", + "@ant-design/pro-utils": "1.42.5", + "@babel/runtime": "^7.18.0", + "@umijs/use-params": "^1.0.9", + "classnames": "^2.2.6", + "lodash.merge": "^4.6.2", + "omit.js": "^2.0.2", + "rc-resize-observer": "^1.1.0", + "rc-util": "^5.0.6", + "use-json-comparison": "^1.0.5", + "use-media-antd-query": "^1.1.0" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.18.9", + "resolved": "http://npm.anxinyun.cn/@babel%2fruntime/-/runtime-7.18.9.tgz", + "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + } + } + }, + "@ant-design/pro-provider": { + "version": "1.9.0", + "resolved": "http://npm.anxinyun.cn/@ant-design%2fpro-provider/-/pro-provider-1.9.0.tgz", + "integrity": "sha512-2coPdBMVBapUkjm5vaRhavo9PnrxaADCHvn6PIbPaL/AUflgGBGNlxny0vIjXav8ZFrFaqP2XLa23tv/MLXcQQ==", + "requires": { + "@babel/runtime": "^7.18.0", + "rc-util": "^5.0.1", + "swr": "^1.2.0" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.18.9", + "resolved": "http://npm.anxinyun.cn/@babel%2fruntime/-/runtime-7.18.9.tgz", + "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + } + } + }, + "@ant-design/pro-table": { + "version": "2.77.3", + "resolved": "http://npm.anxinyun.cn/@ant-design%2fpro-table/-/pro-table-2.77.3.tgz", + "integrity": "sha512-HuPIvppKYL5+ImOPSdTqai+L+dwCXOBfcj6dIAL4OYGv7/znEF2/5aF7y2du2RZfRB7JGMgiStKrroPrVAhycQ==", + "requires": { + "@ant-design/icons": "^4.1.0", + "@ant-design/pro-card": "1.20.13", + "@ant-design/pro-field": "1.34.20", + "@ant-design/pro-form": "1.70.3", + "@ant-design/pro-provider": "1.9.0", + "@ant-design/pro-utils": "1.42.5", + "@babel/runtime": "^7.18.0", + "classnames": "^2.2.6", + "moment": "^2.24.0", + "omit.js": "^2.0.2", + "rc-util": "^5.0.1", + "react-sortable-hoc": "^2.0.0", + "unstated-next": "^1.1.0", + "use-json-comparison": "^1.0.5", + "use-media-antd-query": "^1.1.0" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.18.9", + "resolved": "http://npm.anxinyun.cn/@babel%2fruntime/-/runtime-7.18.9.tgz", + "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + } + } + }, + "@ant-design/pro-utils": { + "version": "1.42.5", + "resolved": "http://npm.anxinyun.cn/@ant-design%2fpro-utils/-/pro-utils-1.42.5.tgz", + "integrity": "sha512-0srMbvsKOfIGdWbJrSsdECHlu2DvinEl4WwlOe4z6fpQQ0kzXfXhYYwNfPw+q5Wb75Mq1KC7kHrYF6wPZclEdQ==", + "requires": { + "@ant-design/icons": "^4.3.0", + "@ant-design/pro-provider": "1.9.0", + "@babel/runtime": "^7.18.0", + "classnames": "^2.2.6", + "moment": "^2.27.0", + "rc-util": "^5.0.6", + "react-sortable-hoc": "^2.0.0", + "swr": "^1.2.0" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.18.9", + "resolved": "http://npm.anxinyun.cn/@babel%2fruntime/-/runtime-7.18.9.tgz", + "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + } + } + } + } + }, + "@ant-design/pro-descriptions": { + "version": "1.11.11", + "resolved": "http://npm.anxinyun.cn/@ant-design%2fpro-descriptions/-/pro-descriptions-1.11.11.tgz", + "integrity": "sha512-LU9GfLY9OHpZkgs3G4Xz9o+7U70Z9cUa3uCFYDzm2W3jkLwSxV2o7azW2d76Lw61Gr59IhAMsr9k48vFv1RshA==", + "requires": { + "@ant-design/pro-field": "1.34.20", + "@ant-design/pro-form": "1.70.3", + "@ant-design/pro-skeleton": "1.0.10", + "@ant-design/pro-utils": "1.42.5", + "@babel/runtime": "^7.18.0", + "rc-util": "^5.0.6", + "use-json-comparison": "^1.0.5" + }, + "dependencies": { + "@ant-design/pro-field": { + "version": "1.34.20", + "resolved": "http://npm.anxinyun.cn/@ant-design%2fpro-field/-/pro-field-1.34.20.tgz", + "integrity": "sha512-/NqXLOwx2erx1HFMh1ydHlBCuhPLpvdm3tMacRxiH5h0QKhoDergGy4+ULLe7hT5FWdbjtI7es0xWUe2+HhMUg==", + "requires": { + "@ant-design/icons": "^4.2.1", + "@ant-design/pro-provider": "1.9.0", + "@ant-design/pro-utils": "1.42.5", + "@babel/runtime": "^7.18.0", + "@chenshuai2144/sketch-color": "^1.0.8", + "classnames": "^2.2.6", + "lodash.tonumber": "^4.0.3", + "moment": "^2.27.0", + "omit.js": "^2.0.2", + "rc-util": "^5.4.0", + "swr": "^1.2.0" + } + }, + "@ant-design/pro-form": { + "version": "1.70.3", + "resolved": "http://npm.anxinyun.cn/@ant-design%2fpro-form/-/pro-form-1.70.3.tgz", + "integrity": "sha512-uJ+GxYhM5oKX681KiEDE2soG/sJDU3JTo+dov3AFYOjwbKue+/CAfAZ1d1JnVS3sglTKJ98kSxg+/1Ft9UR/pQ==", + "requires": { + "@ant-design/icons": "^4.2.1", + "@ant-design/pro-field": "1.34.20", + "@ant-design/pro-provider": "1.9.0", + "@ant-design/pro-utils": "1.42.5", + "@babel/runtime": "^7.18.0", + "@umijs/use-params": "^1.0.9", + "classnames": "^2.2.6", + "lodash.merge": "^4.6.2", + "omit.js": "^2.0.2", + "rc-resize-observer": "^1.1.0", + "rc-util": "^5.0.6", + "use-json-comparison": "^1.0.5", + "use-media-antd-query": "^1.1.0" + } + }, + "@ant-design/pro-provider": { + "version": "1.9.0", + "resolved": "http://npm.anxinyun.cn/@ant-design%2fpro-provider/-/pro-provider-1.9.0.tgz", + "integrity": "sha512-2coPdBMVBapUkjm5vaRhavo9PnrxaADCHvn6PIbPaL/AUflgGBGNlxny0vIjXav8ZFrFaqP2XLa23tv/MLXcQQ==", + "requires": { + "@babel/runtime": "^7.18.0", + "rc-util": "^5.0.1", + "swr": "^1.2.0" + } + }, + "@ant-design/pro-utils": { + "version": "1.42.5", + "resolved": "http://npm.anxinyun.cn/@ant-design%2fpro-utils/-/pro-utils-1.42.5.tgz", + "integrity": "sha512-0srMbvsKOfIGdWbJrSsdECHlu2DvinEl4WwlOe4z6fpQQ0kzXfXhYYwNfPw+q5Wb75Mq1KC7kHrYF6wPZclEdQ==", + "requires": { + "@ant-design/icons": "^4.3.0", + "@ant-design/pro-provider": "1.9.0", + "@babel/runtime": "^7.18.0", + "classnames": "^2.2.6", + "moment": "^2.27.0", + "rc-util": "^5.0.6", + "react-sortable-hoc": "^2.0.0", + "swr": "^1.2.0" + } + }, + "@babel/runtime": { + "version": "7.18.9", + "resolved": "http://npm.anxinyun.cn/@babel%2fruntime/-/runtime-7.18.9.tgz", + "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + } + } + }, "@ant-design/pro-field": { "version": "1.34.10", "resolved": "http://npm.anxinyun.cn/@ant-design%2fpro-field/-/pro-field-1.34.10.tgz", @@ -90,6 +356,276 @@ "use-media-antd-query": "^1.0.6" } }, + "@ant-design/pro-layout": { + "version": "6.38.13", + "resolved": "http://npm.anxinyun.cn/@ant-design%2fpro-layout/-/pro-layout-6.38.13.tgz", + "integrity": "sha512-ZNUUJow0pLxOqkuPIGDJJw9FqPYX5Pu/iz5kBRz9vxSakJUylrtg4GWVVuMqZlSbEpRdPdr4WCx0Jz78R4IPmQ==", + "requires": { + "@ant-design/icons": "^4.0.0", + "@ant-design/pro-provider": "1.9.0", + "@ant-design/pro-utils": "1.42.5", + "@babel/runtime": "^7.18.0", + "@umijs/route-utils": "^2.1.0", + "@umijs/ssr-darkreader": "^4.9.44", + "@umijs/use-params": "^1.0.9", + "classnames": "^2.2.6", + "lodash.merge": "^4.6.2", + "omit.js": "^2.0.2", + "path-to-regexp": "2.4.0", + "rc-resize-observer": "^1.1.0", + "rc-util": "^5.0.6", + "swr": "^1.2.0", + "unstated-next": "^1.1.0", + "use-json-comparison": "^1.0.3", + "use-media-antd-query": "^1.1.0", + "warning": "^4.0.3" + }, + "dependencies": { + "@ant-design/pro-provider": { + "version": "1.9.0", + "resolved": "http://npm.anxinyun.cn/@ant-design%2fpro-provider/-/pro-provider-1.9.0.tgz", + "integrity": "sha512-2coPdBMVBapUkjm5vaRhavo9PnrxaADCHvn6PIbPaL/AUflgGBGNlxny0vIjXav8ZFrFaqP2XLa23tv/MLXcQQ==", + "requires": { + "@babel/runtime": "^7.18.0", + "rc-util": "^5.0.1", + "swr": "^1.2.0" + } + }, + "@ant-design/pro-utils": { + "version": "1.42.5", + "resolved": "http://npm.anxinyun.cn/@ant-design%2fpro-utils/-/pro-utils-1.42.5.tgz", + "integrity": "sha512-0srMbvsKOfIGdWbJrSsdECHlu2DvinEl4WwlOe4z6fpQQ0kzXfXhYYwNfPw+q5Wb75Mq1KC7kHrYF6wPZclEdQ==", + "requires": { + "@ant-design/icons": "^4.3.0", + "@ant-design/pro-provider": "1.9.0", + "@babel/runtime": "^7.18.0", + "classnames": "^2.2.6", + "moment": "^2.27.0", + "rc-util": "^5.0.6", + "react-sortable-hoc": "^2.0.0", + "swr": "^1.2.0" + } + }, + "@babel/runtime": { + "version": "7.18.9", + "resolved": "http://npm.anxinyun.cn/@babel%2fruntime/-/runtime-7.18.9.tgz", + "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + } + } + }, + "@ant-design/pro-list": { + "version": "1.21.73", + "resolved": "http://npm.anxinyun.cn/@ant-design%2fpro-list/-/pro-list-1.21.73.tgz", + "integrity": "sha512-TifcYSH9MPmDOiiaUXCSyK4kEXQRZrYCQC0TUYP2xZ4nsHtO0SOrj4NR0NdjuPZYGA9aSkSY/tlJhEIlrZDw5A==", + "requires": { + "@ant-design/icons": "^4.0.0", + "@ant-design/pro-card": "1.20.13", + "@ant-design/pro-field": "1.34.20", + "@ant-design/pro-table": "2.77.3", + "@babel/runtime": "^7.18.0", + "classnames": "^2.2.6", + "moment": "^2.24.0", + "rc-resize-observer": "^1.0.0", + "rc-util": "^4.19.0", + "unstated-next": "^1.1.0", + "use-media-antd-query": "^1.1.0" + }, + "dependencies": { + "@ant-design/pro-card": { + "version": "1.20.13", + "resolved": "http://npm.anxinyun.cn/@ant-design%2fpro-card/-/pro-card-1.20.13.tgz", + "integrity": "sha512-Av4QYSuxZPzUGyoR2Gmz5Dnl2+2UUnPrS/7JA7Y/5HqZBzXMYdd6T4Wk3KAMoX+NmOuBtDM28jWGcvPRVKoCMg==", + "requires": { + "@ant-design/icons": "^4.2.1", + "@ant-design/pro-utils": "1.42.5", + "@babel/runtime": "^7.18.0", + "classnames": "^2.2.6", + "omit.js": "^2.0.2", + "rc-util": "^5.4.0" + }, + "dependencies": { + "rc-util": { + "version": "5.23.0", + "resolved": "http://npm.anxinyun.cn/rc-util/-/rc-util-5.23.0.tgz", + "integrity": "sha512-lgm6diJ/pLgyfoZY59Vz7sW4mSoQCgozqbBye9IJ7/mb5w5h4T7h+i2JpXAx/UBQxscBZe68q0sP7EW+qfkKUg==", + "requires": { + "@babel/runtime": "^7.18.3", + "react-is": "^16.12.0", + "shallowequal": "^1.1.0" + } + } + } + }, + "@ant-design/pro-field": { + "version": "1.34.20", + "resolved": "http://npm.anxinyun.cn/@ant-design%2fpro-field/-/pro-field-1.34.20.tgz", + "integrity": "sha512-/NqXLOwx2erx1HFMh1ydHlBCuhPLpvdm3tMacRxiH5h0QKhoDergGy4+ULLe7hT5FWdbjtI7es0xWUe2+HhMUg==", + "requires": { + "@ant-design/icons": "^4.2.1", + "@ant-design/pro-provider": "1.9.0", + "@ant-design/pro-utils": "1.42.5", + "@babel/runtime": "^7.18.0", + "@chenshuai2144/sketch-color": "^1.0.8", + "classnames": "^2.2.6", + "lodash.tonumber": "^4.0.3", + "moment": "^2.27.0", + "omit.js": "^2.0.2", + "rc-util": "^5.4.0", + "swr": "^1.2.0" + }, + "dependencies": { + "rc-util": { + "version": "5.23.0", + "resolved": "http://npm.anxinyun.cn/rc-util/-/rc-util-5.23.0.tgz", + "integrity": "sha512-lgm6diJ/pLgyfoZY59Vz7sW4mSoQCgozqbBye9IJ7/mb5w5h4T7h+i2JpXAx/UBQxscBZe68q0sP7EW+qfkKUg==", + "requires": { + "@babel/runtime": "^7.18.3", + "react-is": "^16.12.0", + "shallowequal": "^1.1.0" + } + } + } + }, + "@ant-design/pro-form": { + "version": "1.70.3", + "resolved": "http://npm.anxinyun.cn/@ant-design%2fpro-form/-/pro-form-1.70.3.tgz", + "integrity": "sha512-uJ+GxYhM5oKX681KiEDE2soG/sJDU3JTo+dov3AFYOjwbKue+/CAfAZ1d1JnVS3sglTKJ98kSxg+/1Ft9UR/pQ==", + "requires": { + "@ant-design/icons": "^4.2.1", + "@ant-design/pro-field": "1.34.20", + "@ant-design/pro-provider": "1.9.0", + "@ant-design/pro-utils": "1.42.5", + "@babel/runtime": "^7.18.0", + "@umijs/use-params": "^1.0.9", + "classnames": "^2.2.6", + "lodash.merge": "^4.6.2", + "omit.js": "^2.0.2", + "rc-resize-observer": "^1.1.0", + "rc-util": "^5.0.6", + "use-json-comparison": "^1.0.5", + "use-media-antd-query": "^1.1.0" + }, + "dependencies": { + "rc-util": { + "version": "5.23.0", + "resolved": "http://npm.anxinyun.cn/rc-util/-/rc-util-5.23.0.tgz", + "integrity": "sha512-lgm6diJ/pLgyfoZY59Vz7sW4mSoQCgozqbBye9IJ7/mb5w5h4T7h+i2JpXAx/UBQxscBZe68q0sP7EW+qfkKUg==", + "requires": { + "@babel/runtime": "^7.18.3", + "react-is": "^16.12.0", + "shallowequal": "^1.1.0" + } + } + } + }, + "@ant-design/pro-provider": { + "version": "1.9.0", + "resolved": "http://npm.anxinyun.cn/@ant-design%2fpro-provider/-/pro-provider-1.9.0.tgz", + "integrity": "sha512-2coPdBMVBapUkjm5vaRhavo9PnrxaADCHvn6PIbPaL/AUflgGBGNlxny0vIjXav8ZFrFaqP2XLa23tv/MLXcQQ==", + "requires": { + "@babel/runtime": "^7.18.0", + "rc-util": "^5.0.1", + "swr": "^1.2.0" + }, + "dependencies": { + "rc-util": { + "version": "5.23.0", + "resolved": "http://npm.anxinyun.cn/rc-util/-/rc-util-5.23.0.tgz", + "integrity": "sha512-lgm6diJ/pLgyfoZY59Vz7sW4mSoQCgozqbBye9IJ7/mb5w5h4T7h+i2JpXAx/UBQxscBZe68q0sP7EW+qfkKUg==", + "requires": { + "@babel/runtime": "^7.18.3", + "react-is": "^16.12.0", + "shallowequal": "^1.1.0" + } + } + } + }, + "@ant-design/pro-table": { + "version": "2.77.3", + "resolved": "http://npm.anxinyun.cn/@ant-design%2fpro-table/-/pro-table-2.77.3.tgz", + "integrity": "sha512-HuPIvppKYL5+ImOPSdTqai+L+dwCXOBfcj6dIAL4OYGv7/znEF2/5aF7y2du2RZfRB7JGMgiStKrroPrVAhycQ==", + "requires": { + "@ant-design/icons": "^4.1.0", + "@ant-design/pro-card": "1.20.13", + "@ant-design/pro-field": "1.34.20", + "@ant-design/pro-form": "1.70.3", + "@ant-design/pro-provider": "1.9.0", + "@ant-design/pro-utils": "1.42.5", + "@babel/runtime": "^7.18.0", + "classnames": "^2.2.6", + "moment": "^2.24.0", + "omit.js": "^2.0.2", + "rc-util": "^5.0.1", + "react-sortable-hoc": "^2.0.0", + "unstated-next": "^1.1.0", + "use-json-comparison": "^1.0.5", + "use-media-antd-query": "^1.1.0" + }, + "dependencies": { + "rc-util": { + "version": "5.23.0", + "resolved": "http://npm.anxinyun.cn/rc-util/-/rc-util-5.23.0.tgz", + "integrity": "sha512-lgm6diJ/pLgyfoZY59Vz7sW4mSoQCgozqbBye9IJ7/mb5w5h4T7h+i2JpXAx/UBQxscBZe68q0sP7EW+qfkKUg==", + "requires": { + "@babel/runtime": "^7.18.3", + "react-is": "^16.12.0", + "shallowequal": "^1.1.0" + } + } + } + }, + "@ant-design/pro-utils": { + "version": "1.42.5", + "resolved": "http://npm.anxinyun.cn/@ant-design%2fpro-utils/-/pro-utils-1.42.5.tgz", + "integrity": "sha512-0srMbvsKOfIGdWbJrSsdECHlu2DvinEl4WwlOe4z6fpQQ0kzXfXhYYwNfPw+q5Wb75Mq1KC7kHrYF6wPZclEdQ==", + "requires": { + "@ant-design/icons": "^4.3.0", + "@ant-design/pro-provider": "1.9.0", + "@babel/runtime": "^7.18.0", + "classnames": "^2.2.6", + "moment": "^2.27.0", + "rc-util": "^5.0.6", + "react-sortable-hoc": "^2.0.0", + "swr": "^1.2.0" + }, + "dependencies": { + "rc-util": { + "version": "5.23.0", + "resolved": "http://npm.anxinyun.cn/rc-util/-/rc-util-5.23.0.tgz", + "integrity": "sha512-lgm6diJ/pLgyfoZY59Vz7sW4mSoQCgozqbBye9IJ7/mb5w5h4T7h+i2JpXAx/UBQxscBZe68q0sP7EW+qfkKUg==", + "requires": { + "@babel/runtime": "^7.18.3", + "react-is": "^16.12.0", + "shallowequal": "^1.1.0" + } + } + } + }, + "@babel/runtime": { + "version": "7.18.9", + "resolved": "http://npm.anxinyun.cn/@babel%2fruntime/-/runtime-7.18.9.tgz", + "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, + "rc-util": { + "version": "4.21.1", + "resolved": "http://npm.anxinyun.cn/rc-util/-/rc-util-4.21.1.tgz", + "integrity": "sha1-iGAtDDGFAgqhBT2aHnDqwWG+ywU=", + "requires": { + "add-dom-event-listener": "^1.1.0", + "prop-types": "^15.5.10", + "react-is": "^16.12.0", + "react-lifecycles-compat": "^3.0.4", + "shallowequal": "^1.1.0" + } + } + } + }, "@ant-design/pro-provider": { "version": "1.6.5", "resolved": "http://npm.anxinyun.cn/@ant-design%2fpro-provider/-/pro-provider-1.6.5.tgz", @@ -100,6 +636,25 @@ "swr": "^1.2.0" } }, + "@ant-design/pro-skeleton": { + "version": "1.0.10", + "resolved": "http://npm.anxinyun.cn/@ant-design%2fpro-skeleton/-/pro-skeleton-1.0.10.tgz", + "integrity": "sha512-/CeGtV587kqq6efk2DBsfZD43C0WSGFlw2R9eyJepWcv/+mfgZJ7yPM5m9Zd56EsChG+iu3uLHp56GRhAuh/PQ==", + "requires": { + "@babel/runtime": "^7.18.0", + "use-media-antd-query": "^1.1.0" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.18.9", + "resolved": "http://npm.anxinyun.cn/@babel%2fruntime/-/runtime-7.18.9.tgz", + "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + } + } + }, "@ant-design/pro-table": { "version": "2.74.3", "resolved": "http://npm.anxinyun.cn/@ant-design%2fpro-table/-/pro-table-2.74.3.tgz", @@ -1757,6 +2312,11 @@ "@babel/runtime": "^7.0.0" } }, + "@qixian.cs/path-to-regexp": { + "version": "6.1.0", + "resolved": "http://npm.anxinyun.cn/@qixian.cs%2fpath-to-regexp/-/path-to-regexp-6.1.0.tgz", + "integrity": "sha1-a4StAVljMqupX6KdLnAQRpjNXEU=" + }, "@react-dnd/asap": { "version": "4.0.1", "resolved": "http://npm.anxinyun.cn/@react-dnd%2fasap/-/asap-4.0.1.tgz", @@ -1955,6 +2515,29 @@ } } }, + "@umijs/route-utils": { + "version": "2.1.5", + "resolved": "http://npm.anxinyun.cn/@umijs%2froute-utils/-/route-utils-2.1.5.tgz", + "integrity": "sha512-ByDXNljAMWeCyHOKkM3gc18TgvtAGV9Di/A0MGnzVrf8PY/MdwogGSOktf3Z4w1Iqha2Bt8vHZk3SnQF8C8P4w==", + "requires": { + "@qixian.cs/path-to-regexp": "^6.1.0", + "fast-deep-equal": "^3.1.3", + "lodash.isequal": "^4.5.0", + "memoize-one": "^5.1.1" + }, + "dependencies": { + "memoize-one": { + "version": "5.2.1", + "resolved": "http://npm.anxinyun.cn/memoize-one/-/memoize-one-5.2.1.tgz", + "integrity": "sha1-gzeqPEM1WBg57AHD1ZQJDOvo8A4=" + } + } + }, + "@umijs/ssr-darkreader": { + "version": "4.9.45", + "resolved": "http://npm.anxinyun.cn/@umijs%2fssr-darkreader/-/ssr-darkreader-4.9.45.tgz", + "integrity": "sha512-XlcwzSYQ/SRZpHdwIyMDS4FOGX5kP4U/2g2mykyn/iPQTK4xTiQAyBu6UnnDnn7d5P8s7Atzh1C7H0ETNOypJg==" + }, "@umijs/use-params": { "version": "1.0.9", "resolved": "http://npm.anxinyun.cn/@umijs%2fuse-params/-/use-params-1.0.9.tgz", @@ -2179,6 +2762,14 @@ "resolved": "http://npm.anxinyun.cn/acorn-walk/-/acorn-walk-8.2.0.tgz", "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==" }, + "add-dom-event-listener": { + "version": "1.1.0", + "resolved": "http://npm.anxinyun.cn/add-dom-event-listener/-/add-dom-event-listener-1.1.0.tgz", + "integrity": "sha1-apLbOg3Qq8JU4JXA8dwUrLuq4xA=", + "requires": { + "object-assign": "4.x" + } + }, "address": { "version": "1.2.0", "resolved": "http://npm.anxinyun.cn/address/-/address-1.2.0.tgz", @@ -6999,12 +7590,22 @@ "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", "dev": true }, + "lodash.isequal": { + "version": "4.5.0", + "resolved": "http://npm.anxinyun.cn/lodash.isequal/-/lodash.isequal-4.5.0.tgz", + "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=" + }, "lodash.isequalwith": { "version": "4.4.0", "resolved": "http://npm.anxinyun.cn/lodash.isequalwith/-/lodash.isequalwith-4.4.0.tgz", "integrity": "sha1-Jmcm3dUo+FTyH06pigZWBuD7xrA=", "dev": true }, + "lodash.merge": { + "version": "4.6.2", + "resolved": "http://npm.anxinyun.cn/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha1-VYqlO0O2YeGSWgr9+japoQhf5Xo=" + }, "lodash.sortby": { "version": "4.7.0", "resolved": "http://npm.anxinyun.cn/lodash.sortby/-/lodash.sortby-4.7.0.tgz", @@ -7950,8 +8551,7 @@ "path-to-regexp": { "version": "2.4.0", "resolved": "http://npm.anxinyun.cn/path-to-regexp/-/path-to-regexp-2.4.0.tgz", - "integrity": "sha1-Nc5/Mz1WFvHB4b/iZsOrouWy5wQ=", - "dev": true + "integrity": "sha1-Nc5/Mz1WFvHB4b/iZsOrouWy5wQ=" }, "pause-stream": { "version": "0.0.11", @@ -8940,8 +9540,7 @@ "react-lifecycles-compat": { "version": "3.0.4", "resolved": "http://npm.anxinyun.cn/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", - "integrity": "sha1-TxonOv38jzSIqMUWv9p4+HI1I2I=", - "dev": true + "integrity": "sha1-TxonOv38jzSIqMUWv9p4+HI1I2I=" }, "react-quill": { "version": "1.3.5", @@ -11047,6 +11646,14 @@ "acorn-walk": "^8.2.0" } }, + "warning": { + "version": "4.0.3", + "resolved": "http://npm.anxinyun.cn/warning/-/warning-4.0.3.tgz", + "integrity": "sha1-Fungd+uKhtavfWSqHgX9hbRnjKM=", + "requires": { + "loose-envify": "^1.0.0" + } + }, "watchpack": { "version": "2.3.1", "resolved": "http://npm.anxinyun.cn/watchpack/-/watchpack-2.3.1.tgz", diff --git a/web/package.json b/web/package.json index 8dfa034d..9378e1d4 100644 --- a/web/package.json +++ b/web/package.json @@ -62,6 +62,7 @@ }, "dependencies": { "@ant-design/icons": "^4.6.2", + "@ant-design/pro-components": "^1.1.11", "@ant-design/pro-form": "^1.34.0", "@ant-design/pro-table": "^2.48.0", "@antv/g6": "^4.2.5", From e992725320586bc75cee3a9e24dc948da11f65e2 Mon Sep 17 00:00:00 2001 From: xingyongchun Date: Thu, 21 Jul 2022 09:56:47 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 5 +- .../sections/fillion/components/videoTable.js | 215 ++++++++++++++++++ .../sections/fillion/containers/videois.js | 42 ++++ 3 files changed, 261 insertions(+), 1 deletion(-) create mode 100644 web/client/src/sections/fillion/components/videoTable.js create mode 100644 web/client/src/sections/fillion/containers/videois.js diff --git a/.gitignore b/.gitignore index ee1c29fc..cee3e9c9 100644 --- a/.gitignore +++ b/.gitignore @@ -138,4 +138,7 @@ dist *yarn.lock *package-lock.json *log/ -*downloadFiles/ \ No newline at end of file +*downloadFiles/ +web/client/assets/color.less +package-lock.json +development.text \ No newline at end of file diff --git a/web/client/src/sections/fillion/components/videoTable.js b/web/client/src/sections/fillion/components/videoTable.js new file mode 100644 index 00000000..7f064c6c --- /dev/null +++ b/web/client/src/sections/fillion/components/videoTable.js @@ -0,0 +1,215 @@ + +import { connect } from 'react-redux'; +import './protable.less' +import { Card, Button, Popconfirm, Badge,Col, Row } from 'antd'; +import ProTable from '@ant-design/pro-table'; +// import { Badge, Button } from 'antd'; +import React, { useEffect, useState } from 'react'; +// @ts-ignore +import styles from './protable.less'; +const DetailList = (props) => { + const { ip } = props; + const [tableListDataSource, setTableListDataSource] = useState([]); + + const columns= [ + { + title: '视频', + key: 'createdAt', + dataIndex: 'createdAt', + valueType: 'dateTime', + render: (dom, record) => { + return + + col-8 + col-8 + + }, + }, + ]; + useEffect(() => { + const source = []; + for (let i = 0; i < 15; i += 1) { + source.push({ + createdAt: Date.now() - Math.floor(Math.random() * 10000), + code: `const getData = async params => { + const data = await getData(params); + return { list: data.data, ...data }; + };`, + key: i, + }); + } + setTableListDataSource(source); + }, [ip]); + return ( + + ); + }; + + + + + + + + const ipListDataSource= []; + + for (let i = 0; i < 10; i += 1) { + ipListDataSource.push({ + ip: `106.14.98.1${i}4`, + cpu: 10, + mem: 20, + status: [Math.floor(Math.random() * 10) % 4], + disk: 30, + }); + } + + + + const IPList = (props) => { + const { onChange, ip } = props; + + const columns= [ + { + title: '路段名称', + key: 'ip', + dataIndex: 'ip', + render: (_, item) => { + console.log(item.ip) + return ; + }, + }, + + ]; + return ( +
    + { + // 表单搜索项会从 params 传入，传递给后端接口。 + console.log(params, sorter, filter); + return Promise.resolve({ + data: ipListDataSource, + success: true, + }); + }} + rowKey="ip" + rowClassName={(record) => { + return record.ip === ip ? styles['split-row-select-active'] : ''; + }} + toolbar={{ + search: { + onSearch: (value) => { + alert(value); + }, + }, + }} + options={false} + pagination={false} + search={false} + onRow={(record) => { + return { + onClick: () => { + if (record.ip) { + onChange(record.ip); + } + }, + }; + }} + />
    + + ); + }; + + + + const videoTable = () => { + const [ip, setIp] = useState('0.0.0.0'); + const tabList = [ + { + key: 'tab1', + tab: '公交', + }, + { + key: 'tab2', + tab: '路段', + }, + ]; + const contentList= { + tab1: [
    + + setIp(cIp)} ip={ip} /> + + + + +
    ], + tab2: [
    + + setIp(cIp)} ip={ip} /> + + + + + +
    ] + }; + const [activeTabKey1, setActiveTabKey1] = useState('tab1'); + const [activeTabKey2, setActiveTabKey2] = useState('app'); + const onTab1Change = (key) => { + setActiveTabKey1(key); + }; + + const onTab2Change = (key) => { + setActiveTabKey2(key); + }; + return ( + <> + { + onTab1Change(key); + }} + > + {contentList[activeTabKey1]} + + + + + ); + }; + +function mapStateToProps(state) { + const { auth, depMessage } = state; + const pakData = (dep) => { + return dep.map((d) => { + return { + title: d.name, + value: d.id, + // children: d.type >= 2 ? [] : pakData(d.subordinate) + children: pakData(d.subordinate) + } + }) + } + let depData = pakData(depMessage.data || []) + return { + user: auth.user, + depMessage: depMessage.data || [], + depLoading: depMessage.isRequesting, + depData, + }; +} +export default connect(mapStateToProps)(videoTable); \ No newline at end of file diff --git a/web/client/src/sections/fillion/containers/videois.js b/web/client/src/sections/fillion/containers/videois.js new file mode 100644 index 00000000..61411e51 --- /dev/null +++ b/web/client/src/sections/fillion/containers/videois.js @@ -0,0 +1,42 @@ +import React, { useEffect, useState } from 'react'; +import { connect } from 'react-redux'; +import '../style.less'; +import { getDepMessage, getReportStatistic } from "../actions/infor" +import VideoTable from '../components/videoTable'; +const superagent = require('superagent'); +const Videois = (props) => { + const { dispatch, user } = props + const [data, setData] = useState() + useEffect(() => { + // dispatch(getDepMessage()) + dispatch(getReportStatistic()) + setData(props) + }, []); + //批量导出 + const exports = (ids, counts) => { + // console.log(user); + let reportIds = []; + if (ids.length) + reportIds = ids + else + reportIds = (counts || {}).ids || []; + superagent.post('/_report/http') + .send({ id: reportIds.map(i => Number(i)) }).end((err, res) => { + const resTextIs = res.text.split('/').pop() + window.open( + '/_api/' + + `attachments?src=files/${resTextIs}&filename=${encodeURIComponent(resTextIs)}&token=${user.token}`) + }) + } + return ( + <> + + ) +} +function mapStateToProps(state) { + const { auth } = state + return { + user: auth.user, + } +} +export default connect(mapStateToProps)(Videois); \ No newline at end of file From 3dafc5de6ab5dc02683beb25292ff362f41bb52e Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Thu, 21 Jul 2022 09:58:34 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/app/lib/controllers/data/road.js | 3 +- api/log/development.log | 9 ++ .../工具脚本（无需执行）/dataIn.js | 107 ++++++++++++++++++ .../工具脚本（无需执行）/index.js | 16 ++- .../道路_数据库表对应.json | 50 ++++++++ 5 files changed, 178 insertions(+), 7 deletions(-) create mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/dataIn.js create mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/道路_数据库表对应.json diff --git a/api/app/lib/controllers/data/road.js b/api/app/lib/controllers/data/road.js index a59d7c99..a64f58aa 100644 --- a/api/app/lib/controllers/data/road.js +++ b/api/app/lib/controllers/data/road.js @@ -32,5 +32,6 @@ async function importIn (ctx) { } module.exports = { - importIn + importIn, + }; \ No newline at end of file diff --git a/api/log/development.log b/api/log/development.log index 81f96b21..be5ef807 100644 --- a/api/log/development.log +++ b/api/log/development.log @@ -6954,3 +6954,12 @@ 2022-07-20 21:00:55.063 - debug: [FS-LOGGER] Init. 2022-07-20 21:00:55.128 - info: [FS-ATTACHMENT] Inject attachment mw into router. 2022-07-20 21:00:55.129 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-21 09:15:39.313 - debug: [FS-LOGGER] Init. +2022-07-21 09:15:39.402 - info: [FS-ATTACHMENT] Inject attachment mw into router. +2022-07-21 09:15:39.402 - info: [FS-AUTH] Inject auth and api mv into router. +2022-07-21 09:27:02.043 - error: path: /department/user, error: SequelizeValidationError: notNull Violation: user.username cannot be null +2022-07-21 09:33:35.924 - error: path: /department/user/1, error: SequelizeValidationError: notNull Violation: user.username cannot be null +2022-07-21 09:33:37.379 - error: path: /department/user/1, error: SequelizeValidationError: notNull Violation: user.username cannot be null +2022-07-21 09:33:38.086 - error: path: /department/user/1, error: SequelizeValidationError: notNull Violation: user.username cannot be null +2022-07-21 09:38:23.005 - error: path: /department/user, error: SequelizeValidationError: notNull Violation: user.username cannot be null +2022-07-21 09:42:39.489 - error: path: /department/user, error: SequelizeValidationError: notNull Violation: user.username cannot be null diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/dataIn.js b/scripts/0.0.1/data/工具脚本（无需执行）/dataIn.js new file mode 100644 index 00000000..06c9ef98 --- /dev/null +++ b/scripts/0.0.1/data/工具脚本（无需执行）/dataIn.js @@ -0,0 +1,107 @@ +try { + const { Pool, Client } = require('pg') + const request = require('superagent'); + const Hex = require('crypto-js/enc-hex'); + const MD5 = require('crypto-js/md5'); + const XLSX = require('xlsx') + const path = require('path') + const fs = require("fs"); + + // 连接数据库 + const pool = new Pool({ + user: 'FashionAdmin', + host: '10.8.30.156', + database: 'SmartEmergency', + password: '123456', + port: 5432, + }) + + let appid = '20200917000567738'; + let key = 'xXm4jsuuD38JIkkhEcK6'; + const getAnswer = async (query) => { + let start = (new Date()).getTime(); + let salt = start; + let str1 = appid + query + salt + key; + let sign = Hex.stringify(MD5(str1)); + console.log(`翻译：${query}`); + let answer = await request.get('http://api.fanyi.baidu.com/api/trans/vip/translate').timeout(1000 * 30).query({ + q: query, + appid: appid, + salt: salt, + from: 'zh', + to: 'en', + sign: sign + }); + if (answer.body.error_code) { + console.warn(answer.body); + throw '百度不给力，快快debug' + } + let rslt = answer.body.trans_result; + // let upperCaseRslt = rslt[0].dst.toLowerCase().replace(/( |^)[a-z]/g, (L) => L.toUpperCase()).replace(/ /g, ''); + // let upperCaseRslt = rslt[0].dst.toUpperCase().replace(/ /g, '_'); + // let upperCaseRslt = rslt[0].dst.toLowerCase().replace(/ /g, '_'); + let upperCaseRslt = rslt[0].dst.replace(/\//g, ' ').replace(/'/g, '').replace(/\s{2,}/g, ''); + console.log(`翻译结果：${upperCaseRslt}`); + while (((new Date()).getTime() - start) < (1000 / 8)) {//每s只能调用10次 + continue; + } + return upperCaseRslt + } + + const fun = async () => { + // note: we don't try/catch this because if connecting throws an exception + // we don't need to dispose of the client (it will be undefined) + const client = await pool.connect() + try { + await client.query('BEGIN') + + const fileList = [ + { + path: './data/道路/乡道第三方.xls', + n: '道路', + tableName: 'road' + }, + ] + + for (let f of fileList) { + console.log(`读取 ${f.path}`); + // 读取数据文件 + let workbook = XLSX.readFile(path.join(__dirname, f.path)) + let firstSheetName = workbook.SheetNames[0]; + let worksheet = workbook.Sheets[firstSheetName]; + let res = XLSX.utils.sheet_to_json(worksheet); + console.log(res[0]); + const keyMap = require(`./${f.n}_字段对应.json`); + console.log(keyMap); + for (let d of res) { + let data = {}; + for (let k in keyMap) { + let v = d[keyMap[k]]; + if (v) { + if (k == 'name') { + v = await getAnswer(v); + } + data[k] = v; + } + } + console.log(data); + await client.query(`INSERT INTO ${f.tableName} SET ?`, data); + } + } + + // await client.query('ROLLBACK') + await client.query('COMMIT') + console.log('执行完毕~') + } catch (e) { + await client.query('ROLLBACK') + console.log('执行错误~') + throw e + } finally { + client.release(); + } + } + + fun() +} catch (error) { + console.error(error) +} diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/index.js b/scripts/0.0.1/data/工具脚本（无需执行）/index.js index fe631f25..972cee97 100644 --- a/scripts/0.0.1/data/工具脚本（无需执行）/index.js +++ b/scripts/0.0.1/data/工具脚本（无需执行）/index.js @@ -56,11 +56,11 @@ try { await client.query('BEGIN') const fileList = [ - // { - // path: './data/道路/乡道第三方.xls', - // n: '道路', - // tableName: 'road' - // }, + { + path: './data/道路/乡道第三方.xls', + n: '道路', + tableName: 'road' + }, ] for (let f of fileList) { @@ -73,6 +73,7 @@ try { console.log(res[0]); let dataEx = res[0]; transResult = '' + sqlResult = '' sql = ` -- ${f.n} create table if not exists "${f.tableName}" @@ -99,13 +100,16 @@ try { .replace(/( |^)[A-Z]/g, (L) => L.toLowerCase()) }", \n ` + sqlResult += `"${t}" : "${engT.trim().replace(/ /g, '_').replace(/( |^)[A-Z]/g, (L) => L.toLowerCase())}", \n + ` sql += ` alter table ${f.tableName} add ${upperEngT} varchar(1024); comment on column ${f.tableName}.${upperEngT} is '${t}'; ` } - fs.writeFileSync(`${f.n}_字段对应.json`, `{${transResult}}`, 'utf-8'); + // fs.writeFileSync(`${f.n}_字段对应.json`, `{${transResult}}`, 'utf-8'); // fs.writeFileSync(`${f.n}_数据脚本对应.sql`, sql, 'utf-8'); + fs.writeFileSync(`${f.n}_数据库表对应.json`, `{${sqlResult}}`, 'utf-8'); } // await client.query('ROLLBACK') diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/道路_数据库表对应.json b/scripts/0.0.1/data/工具脚本（无需执行）/道路_数据库表对应.json new file mode 100644 index 00000000..8ee22df0 --- /dev/null +++ b/scripts/0.0.1/data/工具脚本（无需执行）/道路_数据库表对应.json @@ -0,0 +1,50 @@ +{ + "路线名称": "route_name", + "路线代码": "route_code", + "路段序号": "section_No", + "乡镇编码": "township_Code", + "起点地名": "starting_place_name", + "起点桩号": "start_station", + "起点分界点类别": "category_of_starting_point_and_dividing_point", + "止点地名": "stop_place_name", + "止点分界点类别": "category_of_dead_center_and_dividing_point", + "止点桩号": "stop_station", + "路段类型": "section_type", + "路段性质": "nature_of_road_section", + "建成时间": "completion_time", + "GBM及文明样板路": "gBM_and_civilized_model_road", + "地貌": "landforms", + "收费性质": "nature_of_charges", + "涵洞数量": "number_of_culverts", + "技术等级": "technical_level", + "路面类型": "pavement_type", + "路面宽度": "pavement_width", + "路基宽度": "subgrade_width", + "车道特征": "lane_characteristics", + "是否晴雨通车": "whether_it_is_open_to_traffic_in_sunny_or_rainy_days", + "设计时速": "design_speed_per_hour", + "是否城管路段": "urban_management_section_or_not", + "管养单位": "management_and_maintenance_unit", + "路政管理单位": "road_administration_unit", + "列养情况": "alimentation", + "列养资金来源": "source_of_listed_maintenance_funds", + "养护时间": "curing_time", + "可绿化里程": "greening_mileage", + "已绿化里程": "greening_mileaged", + "重复道路路段类型": "type_of_repeated_road_section", + "重复路段序号": "serial_number_of_repeated_section", + "重复路段路线编码": "repeated_section_route_code", + "填报单位": "reporting_unit", + "变更原因": "reason_for_change", + "变更时间": "change_time", + "是否按干线公路管理接养": "whether_maintenance_managed_highway", + "备注": "remarks", + "上年路线编码": "route_code_of_last_year", + "上年路线名称": "route_name_of_last_year", + "上年起点桩号": "starting_station_of_last_year", + "上年止点桩号": "last_years_ending_point_stake_number", + "图形里程": "graphic_mileage", + "桩号里程": "chainage_mileage", + "所在区县": "districtcounty", + "所在地市": "location_city" +} \ No newline at end of file From 272132bc43ee056448675e9062ae0adbbaa1ea3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98lijianhao=E2=80=99?= Date: Thu, 21 Jul 2022 10:28:10 +0800 Subject: [PATCH 4/5] =?UTF-8?q?'=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86UI'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/sections/organization/actions/user.js | 8 ++--- .../sections/organization/containers/user.js | 34 ++++++++++++++++--- .../src/sections/organization/nav-item.js | 18 +++++----- web/client/src/utils/webapi.js | 20 +++++++---- 4 files changed, 56 insertions(+), 24 deletions(-) diff --git a/web/client/src/sections/organization/actions/user.js b/web/client/src/sections/organization/actions/user.js index e24913a4..b9eed02b 100644 --- a/web/client/src/sections/organization/actions/user.js +++ b/web/client/src/sections/organization/actions/user.js @@ -36,23 +36,23 @@ export function createUser(data) { }); } -export function updateUser(id, data) { +export function updateUser(userId, data) { return dispatch => basicAction({ type: 'put', data, dispatch: dispatch, actionType: 'UPDATE_DEPARTMENT_USER', - url: ApiTable.updateUser.replace('{id}', id), + url: ApiTable.updateUser.replace('{userId}', userId), msg: { option: '修改用户' }, }); } -export function delUser(ids) { +export function delUser(userIds) { return dispatch => basicAction({ type: 'del', dispatch: dispatch, actionType: 'DEL_DEPARTMENT_USER', - url: ApiTable.delUser.replace('{ids}', ids), + url: ApiTable.delUser.replace('{userIds}', userIds), msg: { option: '删除用户' }, }); } diff --git a/web/client/src/sections/organization/containers/user.js b/web/client/src/sections/organization/containers/user.js index ea4e9993..da407ee2 100644 --- a/web/client/src/sections/organization/containers/user.js +++ b/web/client/src/sections/organization/containers/user.js @@ -54,7 +54,25 @@ const UserManage = (props) => { dataIndex: 'action', render: (dom, record) => { - return record.username == 'SuperAdmin' ? '' : [ + // return record.username == 'SuperAdmin' ? '' : [ + // , + // { + // delUsers([record.id]) + // }} + // > + // + // , + // + // ] + return [ , { - + + + { depMessage.length ? { key: 'id', children: 'subordinate' }} + style={{ paddingTop: 20 }} /> : '' } - + { style={{ marginRight: 10 }} onClick={() => openModal('create')} >新建用户 - + {/* */} { delUsers(rowSelected, 'batch') }}> diff --git a/web/client/src/sections/organization/nav-item.js b/web/client/src/sections/organization/nav-item.js index 8970b8ee..25c094d5 100644 --- a/web/client/src/sections/organization/nav-item.js +++ b/web/client/src/sections/organization/nav-item.js @@ -9,18 +9,18 @@ import { push } from 'react-router-redux'; const SubMenu = Menu.SubMenu; export function getNavItem(user, dispatch) { - if (!Func.isAuthorized("ORG_MANAGE")) { - return null - } - // console.log(!Func.isAuthorized("ORG_MANAGE")); - if (user.type != 1 && user.type != 2 && user.type != 3) { - dispatch(push('/fillion/infor')); - return null - } + // if (!Func.isAuthorized("ORG_MANAGE")) { + // return null + // } + // // console.log(!Func.isAuthorized("ORG_MANAGE")); + // if (user.type != 1 && user.type != 2 && user.type != 3) { + // dispatch(push('/fillion/infor')); + // return null + // } return ( } title={'授权管理'}> - {Func.isAuthorized("ORG_MEMBER") && + { 用户管理 } diff --git a/web/client/src/utils/webapi.js b/web/client/src/utils/webapi.js index 25e9f3b4..1f6a90bf 100644 --- a/web/client/src/utils/webapi.js +++ b/web/client/src/utils/webapi.js @@ -7,13 +7,19 @@ export const ApiTable = { getEnterprisesMembers: 'enterprises/{enterpriseId}/members', - //组织管理-用户管理 - getDepMessage: 'organization/department', - getDepUser: 'organization/department/{depId}/user', - createUser: 'organization/department/user', - updateUser: 'organization/department/user/{id}', - delUser: 'organization/department/user/{ids}', - resetPwd: '/organization/department/user/resetPwd/{id}', + //组织管理-用户管理-部门 +    getDepMessage: 'department', +    createMessage: 'department', +    updateDepMessage: 'department', +    delDepMessage: 'department/{depId}', +    //组织管理-用户管理-用户 +    getDepUser: 'department/{depId}/user', +    createUser: 'department/user', +    updateUser: 'department/user/{userId}', +    delUser: 'department/user/{userIds}', + +    resetPwd: '/organization/department/user/resetPwd/{id}', + //用户权限 getResource: 'resource', From 575c6f0ce61b6fc3c08cecf4911d81c03bf94f45 Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Thu, 21 Jul 2022 10:29:19 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=81=93=E8=B7=AF=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BD=95=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/道路/quanju/actions/example.js | 15 ----- .../data/道路/quanju/actions/index.js | 7 --- .../data/道路/quanju/containers/example.js | 53 ---------------- .../quanju/containers/footer/build/index.js | 8 --- .../quanju/containers/footer/build/left.js | 0 .../quanju/containers/footer/build/right.js | 0 .../containers/footer/conserve/index.js | 8 --- .../quanju/containers/footer/guanli/index.js | 8 --- .../道路/quanju/containers/footer/index.js | 29 --------- .../footer/leadership/centerLeft.js | 17 ------ .../footer/leadership/centerRight.js | 19 ------ .../centerRight/center-right-bottom.js | 14 ----- .../centerRight/center-right-center.js | 14 ----- .../centerRight/center-right-centertop.js | 14 ----- .../centerRight/center-right-top.js | 15 ----- .../centerleft/center-left-bottom.js | 14 ----- .../centerleft/center-left-center.js | 16 ----- .../centerleft/center-left-centertop.js | 14 ----- .../leadership/centerleft/center-left-top.js | 15 ----- .../containers/footer/leadership/index.js | 18 ------ .../containers/footer/leadership/left.js | 17 ------ .../footer/leadership/left/left-bottom.js | 14 ----- .../footer/leadership/left/left-center.js | 14 ----- .../footer/leadership/left/left-top.js | 14 ----- .../containers/footer/leadership/right.js | 16 ----- .../footer/leadership/right/right-bottom.js | 14 ----- .../footer/leadership/right/right-center.js | 9 --- .../footer/leadership/right/right-top.js | 13 ---- .../containers/footer/operation/index.js | 8 --- .../道路/quanju/containers/heand/index.js | 40 ------------ .../道路/quanju/containers/heand/style.less | 23 ------- .../data/道路/quanju/containers/index.js | 6 -- .../道路/quanju/containers/public/font.css | 4 -- .../道路/quanju/containers/public/module.js | 22 ------- .../data/道路/quanju/index.js | 15 ----- .../data/道路/quanju/nav-item.js | 16 ----- .../data/道路/quanju/reducers/index.js | 5 -- .../data/道路/quanju/routes.js | 21 ------- .../data/道路/quanju/style.less | 3 - .../工具脚本（无需执行）/dataIn.js | 61 +++++++++++++------ .../工具脚本（无需执行）/index.js | 8 +-- .../道路_数据脚本对应.sql | 4 +- 42 files changed, 47 insertions(+), 598 deletions(-) delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/actions/example.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/actions/index.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/example.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/build/index.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/build/left.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/build/right.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/conserve/index.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/guanli/index.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/index.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerLeft.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerRight.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerRight/center-right-bottom.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerRight/center-right-center.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerRight/center-right-centertop.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerRight/center-right-top.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerleft/center-left-bottom.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerleft/center-left-center.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerleft/center-left-centertop.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerleft/center-left-top.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/index.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/left.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/left/left-bottom.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/left/left-center.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/left/left-top.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/right.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/right/right-bottom.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/right/right-center.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/right/right-top.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/operation/index.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/heand/index.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/heand/style.less delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/index.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/public/font.css delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/public/module.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/index.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/nav-item.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/reducers/index.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/routes.js delete mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/style.less diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/actions/example.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/actions/example.js deleted file mode 100644 index b9b2ffbd..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/actions/example.js +++ /dev/null @@ -1,15 +0,0 @@ -'use strict'; - -import { basicAction } from '@peace/utils' -import { ApiTable } from '$utils' - -export function getMembers(orgId) { - return dispatch => basicAction({ - type: 'get', - dispatch: dispatch, - actionType: 'GET_MEMBERS', - url: `${ApiTable.getEnterprisesMembers.replace('{enterpriseId}', orgId)}`, - msg: { error: '获取用户列表失败' }, - reducer: { name: 'members' } - }); -} diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/actions/index.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/actions/index.js deleted file mode 100644 index 090c73f2..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/actions/index.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict'; - -import * as example from './example' - -export default { - ...example -} \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/example.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/example.js deleted file mode 100644 index d38abe45..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/example.js +++ /dev/null @@ -1,53 +0,0 @@ -import React, { useEffect, useState } from 'react'; -import { connect } from 'react-redux'; -import { Spin, Card } from 'antd'; -import Build from './footer/build' -import '../style.less'; -import Header from './heand'; -import Footer from './footer'; -import ProTable, { TableDropdown } from '@ant-design/pro-table'; - -const Example = (props) => { - const { dispatch, actions, user, loading } = props - const [tabKey, setTabKey] = useState('leadership') - - useEffect(() => { - dispatch(actions.example.getMembers(user.orgId)) - }, []) - const tabChange = (tab) => { - //leader 领导驾驶舱 site 工地 toilet 公厕 light 照明 water水质 encomic经济 environment 生态环境 security 智慧安监 - // setCurrentTab(tab); - setTabKey(tab) - // dispatch({ type: 'TAB-CHANGE', data: tab }) - } - - return ( - -
    -
    -
    -
    -
    -
    -
    -
    -     - ) -} - -function mapStateToProps(state) { - const { auth, global, members } = state; - return { - loading: members.isRequesting, - user: auth.user, - actions: global.actions, - members: members.data - }; -} - -export default connect(mapStateToProps)(Example); diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/build/index.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/build/index.js deleted file mode 100644 index 1b0f3f0f..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/build/index.js +++ /dev/null @@ -1,8 +0,0 @@ -import React from 'react' - -const Build = () => { - return ( - <>Build - ) -} -export default Build diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/build/left.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/build/left.js deleted file mode 100644 index e69de29b..00000000 diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/build/right.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/build/right.js deleted file mode 100644 index e69de29b..00000000 diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/conserve/index.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/conserve/index.js deleted file mode 100644 index e48f40cb..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/conserve/index.js +++ /dev/null @@ -1,8 +0,0 @@ -import React from 'react' - -const Conserve = () => { - return ( - <>1212121 - ) -} -export default Conserve \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/guanli/index.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/guanli/index.js deleted file mode 100644 index d20e2d29..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/guanli/index.js +++ /dev/null @@ -1,8 +0,0 @@ -import React from 'react' - -const Guanli = () => { - return ( - <>管理 - ) -} -export default Guanli \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/index.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/index.js deleted file mode 100644 index 485c6839..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/index.js +++ /dev/null @@ -1,29 +0,0 @@ -import React from 'react' -import Build from './build' -import Conserve from './conserve' -import Guanli from './guanli' -import Leadership from './leadership' -import Operation from './operation' -const Footer = ({ tabKey }) => { - return ( - <> - { - (() => { - switch (tabKey) { - case 'build': - return - case 'conserve': - return - case "leadership": - return - case "guanli": - return - case "operation": - return - } - })() - } - - ) -} -export default Footer diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerLeft.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerLeft.js deleted file mode 100644 index f5745538..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerLeft.js +++ /dev/null @@ -1,17 +0,0 @@ -import React from 'react' -import Centerlefttop from "./centerleft/center-left-top" -import Centerleftcenter from "./centerleft/center-left-center" -import Centerleftcentertop from "./centerleft/center-left-centertop" -import Centerleftbottom from "./centerleft/center-left-bottom" - -const CenterLeft = () => { - return ( - <> -
    - - -
    - - ) -} -export default CenterLeft \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerRight.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerRight.js deleted file mode 100644 index 4fb8cce5..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerRight.js +++ /dev/null @@ -1,19 +0,0 @@ -import React from 'react' -import Centerrighttop from "./centerRight/center-right-top" -import Centerrightcenter from "./centerRight/center-right-center" -import CenterRightcentertop from "./centerRight/center-right-centertop" -import Centerrightbottom from "./centerRight/center-right-bottom" - -const CenterLeft = () => { - return ( - <> -
    - - - - -
    - - ) -} -export default CenterLeft \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerRight/center-right-bottom.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerRight/center-right-bottom.js deleted file mode 100644 index 5a75b55b..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerRight/center-right-bottom.js +++ /dev/null @@ -1,14 +0,0 @@ -import React from 'react' -import Module from '../../../public/module' - -const Rightbottom = () => { - const style = { height: "33%" } - return ( - <> - -
    -     - - ) -} -export default Rightbottom \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerRight/center-right-center.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerRight/center-right-center.js deleted file mode 100644 index 604b5330..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerRight/center-right-center.js +++ /dev/null @@ -1,14 +0,0 @@ -import React from 'react' -import Module from '../../../public/module' - -const Rightcenter = () => { - const style = { height: "17%" } - return ( - <> - -
    -     - - ) -} -export default Rightcenter \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerRight/center-right-centertop.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerRight/center-right-centertop.js deleted file mode 100644 index 71e56878..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerRight/center-right-centertop.js +++ /dev/null @@ -1,14 +0,0 @@ -import React from 'react' -import Module from '../../../public/module' - -const Rightcentertop = () => { - const style = { height: "23%" } - return ( - <> - -
    -     - - ) -} -export default Rightcentertop \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerRight/center-right-top.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerRight/center-right-top.js deleted file mode 100644 index 722a855d..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerRight/center-right-top.js +++ /dev/null @@ -1,15 +0,0 @@ -import React from 'react' -import Module from '../../../public/module' - -const Righttop = (props) => { - const { } = props - const style = { height: "17%" } - return ( - <> - -
    -     - - ) -} -export default Righttop \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerleft/center-left-bottom.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerleft/center-left-bottom.js deleted file mode 100644 index cd33b97d..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerleft/center-left-bottom.js +++ /dev/null @@ -1,14 +0,0 @@ -import React from 'react' -import Module from '../../../public/module' - -const Leftbottom = () => { - const style = { height: "23%", marginTop: "5%" } - return ( - <> - -
    -     - - ) -} -export default Leftbottom \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerleft/center-left-center.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerleft/center-left-center.js deleted file mode 100644 index 08ff5043..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerleft/center-left-center.js +++ /dev/null @@ -1,16 +0,0 @@ -import React from 'react' -import Module from '../../../public/module' - -const Leftcenter = () => { - const style = { - height: "23%" - } - return ( - <> - -
    -     - - ) -} -export default Leftcenter \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerleft/center-left-centertop.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerleft/center-left-centertop.js deleted file mode 100644 index 393e3164..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerleft/center-left-centertop.js +++ /dev/null @@ -1,14 +0,0 @@ -import React from 'react' -import Module from '../../../public/module' - -const Leftcentertop = () => { - const style = { height: "23%" } - return ( - <> - -
    -     - - ) -} -export default Leftcentertop \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerleft/center-left-top.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerleft/center-left-top.js deleted file mode 100644 index 9c7e922c..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/centerleft/center-left-top.js +++ /dev/null @@ -1,15 +0,0 @@ -import React from 'react' -import Module from '../../../public/module' - -const Lefttop = (props) => { - const { } = props - const style = { height: "23%" } - return ( - <> - -
    -     - - ) -} -export default Lefttop \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/index.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/index.js deleted file mode 100644 index cbd1980a..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/index.js +++ /dev/null @@ -1,18 +0,0 @@ -import React from 'react' -import Left from './left' -import Right from './right' -import CenterLeft from "./centerLeft" -import Centerright from "./centerRight" - -const Leadership = () => { - return ( - <> - - - - {/* */} - - - ) -} -export default Leadership \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/left.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/left.js deleted file mode 100644 index 5461c2fc..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/left.js +++ /dev/null @@ -1,17 +0,0 @@ -import React from 'react' -import Lefttop from './left/left-top' -import Leftcenter from "./left/left-center" -import Leftbottom from './left/left-bottom' - -const Left = () => { - return ( - <> -
    - - - -
    - - ) -} -export default Left \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/left/left-bottom.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/left/left-bottom.js deleted file mode 100644 index bd992c86..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/left/left-bottom.js +++ /dev/null @@ -1,14 +0,0 @@ -import React from 'react' -import Module from '../../../public/module' - -const Leftbottom = () => { - const style = { height: "25%", marginTop: "5%" } - return ( - <> - - - - - ) -} -export default Leftbottom \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/left/left-center.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/left/left-center.js deleted file mode 100644 index 767e2d38..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/left/left-center.js +++ /dev/null @@ -1,14 +0,0 @@ -import React from 'react' -import Module from '../../../public/module' - -const Leftcenter = () => { - const style = { height: "30%", marginTop: "5%" } - return ( - <> - -
    -     - - ) -} -export default Leftcenter \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/left/left-top.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/left/left-top.js deleted file mode 100644 index 14af9db5..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/left/left-top.js +++ /dev/null @@ -1,14 +0,0 @@ -import React from 'react' -import Module from '../../../public/module' - -const Lefttop = () => { - const style = { height: "25%" } - return ( - <> - - {/*
    */} -     - - ) -} -export default Lefttop \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/right.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/right.js deleted file mode 100644 index d690515f..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/right.js +++ /dev/null @@ -1,16 +0,0 @@ -import React from 'react' -import Righttop from './right/right-top' -import Rightcenter from './right/right-center' -import Rightbottom from './right/right-bottom' - -const Right = () => { - return ( - <> -
    - - -
    - - ) -} -export default Right \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/right/right-bottom.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/right/right-bottom.js deleted file mode 100644 index f6a8aa24..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/right/right-bottom.js +++ /dev/null @@ -1,14 +0,0 @@ -import React from 'react' -import Module from '../../../public/module' - -const Rightbottom = () => { - const style = { height: "45%", marginTop: "5%" } - return ( - <> - -
    -     - - ) -} -export default Rightbottom \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/right/right-center.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/right/right-center.js deleted file mode 100644 index 609facf8..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/right/right-center.js +++ /dev/null @@ -1,9 +0,0 @@ -import React from 'react' - -const Rightcenter = () => { - return ( - <>
    -
    - ) -} -export default Rightcenter \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/right/right-top.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/right/right-top.js deleted file mode 100644 index d1955b88..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/leadership/right/right-top.js +++ /dev/null @@ -1,13 +0,0 @@ -import React from 'react' -import Module from '../../../public/module' - -const Righttop = () => { - const style = { height: "45%" } - return ( - <> - - - - ) -} -export default Righttop \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/operation/index.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/operation/index.js deleted file mode 100644 index c8b81208..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/footer/operation/index.js +++ /dev/null @@ -1,8 +0,0 @@ -import React from 'react' - -const Operation = () => { - return ( - <>运营 - ) -} -export default Operation \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/heand/index.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/heand/index.js deleted file mode 100644 index 339ff20a..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/heand/index.js +++ /dev/null @@ -1,40 +0,0 @@ -import React, { useState, uesEffect } from 'react' -import { push } from 'react-router-redux'; -import "./style.less" -import { Tabs } from 'antd'; - - -const { TabPane } = Tabs; -const Header = (props) => { - const { dispatch, tabChange, tabKey } = props - // const [tab, setTad] = useState("base") - const onClick = (tab) => { - // setTad({ tab }) - tabChange(tab) - } - const dianji = () => { - dispatch(push('/fillion/infor')) - } - return ( -
    - -
    { - onClick("build") - }}>建设
    -
    { - onClick("conserve") - }}>养护
    -
    { - onClick("leadership") - }}>领导驾驶舱
    -
    { - onClick("guanli") - }}>管理
    -
    { - onClick("operation") - }}>运营
    -
    dianji()}>南昌县运输交通总局
    -
    - ) -} -export default Header diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/heand/style.less b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/heand/style.less deleted file mode 100644 index 7beaadfe..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/heand/style.less +++ /dev/null @@ -1,23 +0,0 @@ -.tabKey-map{ - width: 12%; - height: 45px; - text-align: center; - position: absolute; - top: 30px; - a{ - color: #c3d4f5; - line-height: 45px; - } -} -.notabKey{ - width:12%; - height: 45px; - position: absolute; - top: 30px; - text-align: center; - a{ - color: #6593c6; - line-height: 45px; - } - -} \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/index.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/index.js deleted file mode 100644 index a4321ad0..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/index.js +++ /dev/null @@ -1,6 +0,0 @@ -'use strict'; - -import Example from './example'; -import Build from './footer/build' - -export { Example, Build }; \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/public/font.css b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/public/font.css deleted file mode 100644 index 5a30fb99..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/public/font.css +++ /dev/null @@ -1,4 +0,0 @@ -@font-face { - font-family: "YouSheBiaoTiHei"; - src: url("/assets/fontziti/YouSheBiaoTiHei-2.ttf") format("truetype"); - } \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/public/module.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/public/module.js deleted file mode 100644 index 29682c4e..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/containers/public/module.js +++ /dev/null @@ -1,22 +0,0 @@ -import React from 'react' -import "./font.css" - -const Module = (props) => { - const { style, children, title } = props - return ( - <> -
    -
    - {/*

    {title || []}

    */} - - {title || []} - -
    -
    - {children} -
    -
    - - ) -} -export default Module \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/index.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/index.js deleted file mode 100644 index c7296b0c..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/index.js +++ /dev/null @@ -1,15 +0,0 @@ -'use strict'; - -import reducers from './reducers'; -import routes from './routes'; -import actions from './actions'; -import { getNavItem } from './nav-item'; - -export default { - key: 'example2', - name: '书写示例', - reducers: reducers, - routes: routes, - actions: actions, - getNavItem: getNavItem -}; \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/nav-item.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/nav-item.js deleted file mode 100644 index 74bdd2a2..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/nav-item.js +++ /dev/null @@ -1,16 +0,0 @@ -import React from 'react'; -import { Link } from 'react-router-dom'; -import { Menu } from 'antd'; -import { SettingOutlined } from '@ant-design/icons'; - -const SubMenu = Menu.SubMenu; - -export function getNavItem(user, dispatch) { - return ( - } title={'举个栗子'}> - - 举个棒子2 - - - ); -} \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/reducers/index.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/reducers/index.js deleted file mode 100644 index 7ed10886..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/reducers/index.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -export default { - -} \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/routes.js b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/routes.js deleted file mode 100644 index cb7dd73a..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/routes.js +++ /dev/null @@ -1,21 +0,0 @@ -'use strict'; -import { Example, Build } from './containers'; - -export default [{ - type: 'outer', - route: { - path: '/quanju', - key: 'quanju', - breadcrumb: '栗子222', - exact: false, - component: Example, - // 不设置 component 则面包屑禁止跳转 - // childRoutes: [{ - // path: '/e2', - // key: 'e2', - // exact: false, - // component: Build, - // breadcrumb: '棒子', - // }] - } -}]; \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/style.less b/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/style.less deleted file mode 100644 index 33234528..00000000 --- a/scripts/0.0.1/data/工具脚本（无需执行）/data/道路/quanju/style.less +++ /dev/null @@ -1,3 +0,0 @@ -#example:hover { - font-size: larger; -} \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/dataIn.js b/scripts/0.0.1/data/工具脚本（无需执行）/dataIn.js index 06c9ef98..0c29e2b2 100644 --- a/scripts/0.0.1/data/工具脚本（无需执行）/dataIn.js +++ b/scripts/0.0.1/data/工具脚本（无需执行）/dataIn.js @@ -9,10 +9,10 @@ try { // 连接数据库 const pool = new Pool({ - user: 'FashionAdmin', - host: '10.8.30.156', - database: 'SmartEmergency', - password: '123456', + user: 'postgres', + host: '10.8.30.32', + database: 'highways4good', + password: '123', port: 5432, }) @@ -56,11 +56,27 @@ try { await client.query('BEGIN') const fileList = [ - { - path: './data/道路/乡道第三方.xls', - n: '道路', - tableName: 'road' - }, + // { + // path: './data/道路/村道第三方.xls', + // n: '道路', + // tableName: 'road', + // defaultKey: ['level'], + // defaultValue: ['村'], + // }, + // { + // path: './data/道路/县道第三方.xls', + // n: '道路', + // tableName: 'road', + // defaultKey: ['level'], + // defaultValue: ['县'], + // }, + // { + // path: './data/道路/乡道第三方.xls', + // n: '道路', + // tableName: 'road', + // defaultKey: ['level'], + // defaultValue: ['乡'], + // }, ] for (let f of fileList) { @@ -70,23 +86,28 @@ try { let firstSheetName = workbook.SheetNames[0]; let worksheet = workbook.Sheets[firstSheetName]; let res = XLSX.utils.sheet_to_json(worksheet); - console.log(res[0]); - const keyMap = require(`./${f.n}_字段对应.json`); - console.log(keyMap); + const keyMap = require(`./${f.n}_数据库表对应.json`); + // console.log(keyMap); for (let d of res) { - let data = {}; + let insertStr = `INSERT INTO "${f.tableName}" (`; + let insertKeys = (f.defaultKey || []).concat([]); + let insertValues = (f.defaultValue || []).concat([]); for (let k in keyMap) { - let v = d[keyMap[k]]; + // 没做判重 + let v = d[k]; if (v) { - if (k == 'name') { - v = await getAnswer(v); - } - data[k] = v; + insertKeys.push(keyMap[k]); + insertValues.push(v); } } - console.log(data); - await client.query(`INSERT INTO ${f.tableName} SET ?`, data); + insertStr += insertKeys.join(',') + ') VALUES ('; + insertStr += insertKeys.map((k, i) => `$${i + 1}`).join(',') + ')'; + // console.log(insertStr, insertValues); + console.log(`插入 ${f.tableName}：${insertStr}`); + await client.query(insertStr, insertValues); + // break; } + // break; } // await client.query('ROLLBACK') diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/index.js b/scripts/0.0.1/data/工具脚本（无需执行）/index.js index 972cee97..ac407ae1 100644 --- a/scripts/0.0.1/data/工具脚本（无需执行）/index.js +++ b/scripts/0.0.1/data/工具脚本（无需执行）/index.js @@ -9,10 +9,10 @@ try { // 连接数据库 const pool = new Pool({ - user: 'FashionAdmin', - host: '10.8.30.156', - database: 'SmartEmergency', - password: '123456', + user: 'postgres', + host: '10.8.30.32', + database: 'highways4good', + password: '123', port: 5432, }) diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/道路_数据脚本对应.sql b/scripts/0.0.1/data/工具脚本（无需执行）/道路_数据脚本对应.sql index 5b8392bb..c903d9f1 100644 --- a/scripts/0.0.1/data/工具脚本（无需执行）/道路_数据脚本对应.sql +++ b/scripts/0.0.1/data/工具脚本（无需执行）/道路_数据脚本对应.sql @@ -32,8 +32,8 @@ ON column road.Urban_Management_Section_Or_Not is '是否城管路段'; alter TA ON column road.Management_And_Maintenance_Unit is '管养单位'; alter TABLE road add Road_Administration_Unit varchar(1024); comment ON column road.Road_Administration_Unit is '路政管理单位'; alter TABLE road add Alimentation varchar(1024); comment ON column road.Alimentation is '列养情况'; alter TABLE road add Source_Of_Listed_Maintenance_Funds varchar(1024); comment -ON column road.Source_Of_Listed_Maintenance_Funds is '列养资金来源'; alter TABLE road add Curing_Time_ varchar(1024); comment -ON column road.Curing_Time_ is '养护时间'; alter TABLE road add Greening_Mileage varchar(1024); comment +ON column road.Source_Of_Listed_Maintenance_Funds is '列养资金来源'; alter TABLE road add Curing_Time varchar(1024); comment +ON column road.Curing_Time is '养护时间'; alter TABLE road add Greening_Mileage varchar(1024); comment ON column road.Greening_Mileage is '可绿化里程'; alter TABLE road add Greening_Mileaged varchar(1024); comment ON column road.Greening_Mileaged is '已绿化里程'; alter TABLE road add Type_Of_Repeated_Road_Section varchar(1024); comment ON column road.Type_Of_Repeated_Road_Section is '重复道路路段类型'; alter TABLE road add Serial_Number_Of_Repeated_Section varchar(1024); comment