区域：
-
-
暂无数据
- } - 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/containers/index.js b/web/client/src/sections/fillion/containers/index.js
index 3cfa6ecf..98920698 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';
-export { infor };
\ No newline at end of file
+export { Infor,transportation,BridgeTable,HigHways,OperaTional,Enforce,Public };
\ 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 (
- <>
- 填报信息
+ 治超管理
+
+
+ 道路管理
+
+ 桥梁管理
+
+
+ 路政管理
+
+
+ 运政管理
+
+
+ 执法管理
+
+
+ 公交管理
);
diff --git a/web/client/src/sections/fillion/routes.js b/web/client/src/sections/fillion/routes.js
index 693ca601..e81b4f1d 100644
--- a/web/client/src/sections/fillion/routes.js
+++ b/web/client/src/sections/fillion/routes.js
@@ -1,19 +1,64 @@
'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';
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: '公交管理',
+ }
+ ]
}
}];
\ 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 ( -
用户管理
- }
- {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/quanju/actions/example.js b/web/client/src/sections/quanju/actions/example.js
deleted file mode 100644
index b9b2ffbd..00000000
--- a/web/client/src/sections/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/web/client/src/sections/quanju/actions/index.js b/web/client/src/sections/quanju/actions/index.js
deleted file mode 100644
index 090c73f2..00000000
--- a/web/client/src/sections/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/web/client/src/sections/quanju/containers/example.js b/web/client/src/sections/quanju/containers/example.js
deleted file mode 100644
index d38abe45..00000000
--- a/web/client/src/sections/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/web/client/src/sections/quanju/containers/footer/build/index.js b/web/client/src/sections/quanju/containers/footer/build/index.js
deleted file mode 100644
index 1b0f3f0f..00000000
--- a/web/client/src/sections/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/web/client/src/sections/quanju/containers/footer/build/left.js b/web/client/src/sections/quanju/containers/footer/build/left.js
deleted file mode 100644
index e69de29b..00000000
diff --git a/web/client/src/sections/quanju/containers/footer/build/right.js b/web/client/src/sections/quanju/containers/footer/build/right.js
deleted file mode 100644
index e69de29b..00000000
diff --git a/web/client/src/sections/quanju/containers/footer/conserve/index.js b/web/client/src/sections/quanju/containers/footer/conserve/index.js
deleted file mode 100644
index e48f40cb..00000000
--- a/web/client/src/sections/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/web/client/src/sections/quanju/containers/footer/guanli/index.js b/web/client/src/sections/quanju/containers/footer/guanli/index.js
deleted file mode 100644
index d20e2d29..00000000
--- a/web/client/src/sections/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/web/client/src/sections/quanju/containers/footer/index.js b/web/client/src/sections/quanju/containers/footer/index.js
deleted file mode 100644
index 485c6839..00000000
--- a/web/client/src/sections/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
${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的效果 */}
-
- {/* 页面上部分代码 */}
-
-
- );
-};
-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 (
-
-
-
-
- {/* 页面下部分代码 */}
- {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 ?
- {/* 根据时间进行的排序 */}
-
-
-
-
- 各区县合用场所填报数量
-
- {Patientias
- ? Patientias.map((item, index) => {
- return (
-
- {index >= 3 ? (
-
- );
- })
- : null}
-
- {index + 1}
- ) : (
- {index + 1}
- )}
- {item.name}
- {item.count}
-
-
-
-
-
-
-
-
+
-
-
-
- )
-}
-export default Rightbottom
\ No newline at end of file
diff --git a/web/client/src/sections/quanju/containers/footer/leadership/centerRight/center-right-center.js b/web/client/src/sections/quanju/containers/footer/leadership/centerRight/center-right-center.js
deleted file mode 100644
index 604b5330..00000000
--- a/web/client/src/sections/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/web/client/src/sections/quanju/containers/footer/leadership/centerRight/center-right-centertop.js b/web/client/src/sections/quanju/containers/footer/leadership/centerRight/center-right-centertop.js
deleted file mode 100644
index 71e56878..00000000
--- a/web/client/src/sections/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/web/client/src/sections/quanju/containers/footer/leadership/centerRight/center-right-top.js b/web/client/src/sections/quanju/containers/footer/leadership/centerRight/center-right-top.js
deleted file mode 100644
index 722a855d..00000000
--- a/web/client/src/sections/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/web/client/src/sections/quanju/containers/footer/leadership/centerleft/center-left-bottom.js b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/center-left-bottom.js
deleted file mode 100644
index cd33b97d..00000000
--- a/web/client/src/sections/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/web/client/src/sections/quanju/containers/footer/leadership/centerleft/center-left-center.js b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/center-left-center.js
deleted file mode 100644
index 08ff5043..00000000
--- a/web/client/src/sections/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/web/client/src/sections/quanju/containers/footer/leadership/centerleft/center-left-centertop.js b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/center-left-centertop.js
deleted file mode 100644
index 393e3164..00000000
--- a/web/client/src/sections/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/web/client/src/sections/quanju/containers/footer/leadership/centerleft/center-left-top.js b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/center-left-top.js
deleted file mode 100644
index 9c7e922c..00000000
--- a/web/client/src/sections/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/web/client/src/sections/quanju/containers/footer/leadership/index.js b/web/client/src/sections/quanju/containers/footer/leadership/index.js
deleted file mode 100644
index cbd1980a..00000000
--- a/web/client/src/sections/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 CenterLeft
\ No newline at end of file
diff --git a/web/client/src/sections/quanju/containers/footer/leadership/centerRight/center-right-bottom.js b/web/client/src/sections/quanju/containers/footer/leadership/centerRight/center-right-bottom.js
deleted file mode 100644
index 5a75b55b..00000000
--- a/web/client/src/sections/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 (
- <>
-
+
+
diff --git a/web/client/src/sections/quanju/containers/footer/leadership/left/left-center.js b/web/client/src/sections/quanju/containers/footer/leadership/left/left-center.js
index 767e2d38..70b2d6da 100644
--- a/web/client/src/sections/quanju/containers/footer/leadership/left/left-center.js
+++ b/web/client/src/sections/quanju/containers/footer/leadership/left/left-center.js
@@ -5,7 +5,7 @@ const Leftcenter = () => {
const style = { height: "30%", marginTop: "5%" }
return (
<>
-
+
diff --git a/web/client/src/sections/quanju/containers/footer/leadership/left/left-top.js b/web/client/src/sections/quanju/containers/footer/leadership/left/left-top.js
deleted file mode 100644
index 14af9db5..00000000
--- a/web/client/src/sections/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/web/client/src/sections/quanju/containers/footer/leadership/right.js b/web/client/src/sections/quanju/containers/footer/leadership/right.js
index d690515f..58172bba 100644
--- a/web/client/src/sections/quanju/containers/footer/leadership/right.js
+++ b/web/client/src/sections/quanju/containers/footer/leadership/right.js
@@ -6,7 +6,7 @@ import Rightbottom from './right/right-bottom'
const Right = () => {
return (
<>
-
+
-
-
-
- )
-}
-export default Rightbottom
\ No newline at end of file
diff --git a/web/client/src/sections/quanju/containers/footer/leadership/right/right-center.js b/web/client/src/sections/quanju/containers/footer/leadership/right/right-center.js
deleted file mode 100644
index 609facf8..00000000
--- a/web/client/src/sections/quanju/containers/footer/leadership/right/right-center.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import React from 'react'
-
-const Rightcenter = () => {
- return (
- <>
-
-
- )
-}
-export default Righttop
\ No newline at end of file
diff --git a/web/client/src/sections/quanju/containers/footer/operation/index.js b/web/client/src/sections/quanju/containers/footer/operation/index.js
deleted file mode 100644
index c8b81208..00000000
--- a/web/client/src/sections/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/web/client/src/sections/quanju/containers/heand/index.js b/web/client/src/sections/quanju/containers/heand/index.js
index 339ff20a..8d944a85 100644
--- a/web/client/src/sections/quanju/containers/heand/index.js
+++ b/web/client/src/sections/quanju/containers/heand/index.js
@@ -27,13 +27,14 @@ const Header = (props) => {
)
}
diff --git a/web/client/src/sections/quanju/containers/heand/style.less b/web/client/src/sections/quanju/containers/heand/style.less
index 7beaadfe..931b4d46 100644
--- a/web/client/src/sections/quanju/containers/heand/style.less
+++ b/web/client/src/sections/quanju/containers/heand/style.less
@@ -1,23 +1,23 @@
.tabKey-map{
width: 12%;
- height: 45px;
+ height: 4.7vh;
text-align: center;
position: absolute;
- top: 30px;
+ top: 3vh;
a{
color: #c3d4f5;
- line-height: 45px;
+ line-height: 4.7vh;
}
}
.notabKey{
width:12%;
- height: 45px;
+ height: 4.7vh;
position: absolute;
- top: 30px;
+ top: 3vh;
text-align: center;
a{
color: #6593c6;
- line-height: 45px;
+ line-height: 4.7vh;
}
}
\ No newline at end of file
diff --git a/web/client/src/sections/quanju/containers/index.js b/web/client/src/sections/quanju/containers/index.js
deleted file mode 100644
index a4321ad0..00000000
--- a/web/client/src/sections/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/web/client/src/sections/quanju/containers/public/font.css b/web/client/src/sections/quanju/containers/public/font.css
deleted file mode 100644
index 5a30fb99..00000000
--- a/web/client/src/sections/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/web/client/src/sections/quanju/containers/public/module.js b/web/client/src/sections/quanju/containers/public/module.js
index 29682c4e..53c833f1 100644
--- a/web/client/src/sections/quanju/containers/public/module.js
+++ b/web/client/src/sections/quanju/containers/public/module.js
@@ -5,11 +5,11 @@ const Module = (props) => {
const { style, children, title } = props
return (
<>
-
-
- )
-}
-export default Rightcenter
\ No newline at end of file
diff --git a/web/client/src/sections/quanju/containers/footer/leadership/right/right-top.js b/web/client/src/sections/quanju/containers/footer/leadership/right/right-top.js
deleted file mode 100644
index d1955b88..00000000
--- a/web/client/src/sections/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 (
- <>
- {
onClick("leadership")
}}>领导驾驶舱
+ 南昌县智慧交通监管系统
{
onClick("guanli")
}}>管理
{
onClick("operation")
}}>运营
- dianji()}>南昌县运输交通总局
+ dianji()}>南昌县运输交通总局
+
{/* 
- {title || []}
+
+ {title || []}
{title || []}
*/} -
- {title || []}
+
+ {title || []}
diff --git a/web/client/src/sections/quanju/index.js b/web/client/src/sections/quanju/index.js
deleted file mode 100644
index c7296b0c..00000000
--- a/web/client/src/sections/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/web/client/src/sections/quanju/nav-item.js b/web/client/src/sections/quanju/nav-item.js
deleted file mode 100644
index 74bdd2a2..00000000
--- a/web/client/src/sections/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 (
-
- 举个棒子2
-
-
- );
-}
\ No newline at end of file
diff --git a/web/client/src/sections/quanju/reducers/index.js b/web/client/src/sections/quanju/reducers/index.js
deleted file mode 100644
index 7ed10886..00000000
--- a/web/client/src/sections/quanju/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/quanju/routes.js b/web/client/src/sections/quanju/routes.js
deleted file mode 100644
index cb7dd73a..00000000
--- a/web/client/src/sections/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/web/client/src/sections/quanju/style.less b/web/client/src/sections/quanju/style.less
deleted file mode 100644
index 33234528..00000000
--- a/web/client/src/sections/quanju/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/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
- {/* {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
-
- {
- 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 (
-
- 报表配置
- }
- {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