Browse Source

(*)储备项目周期统计表debug调整

master
周沫沫历险记 2 years ago
parent
commit
dac86147b4
  1. 20
      .vscode/launch.json
  2. 2
      web/client/src/sections/business/actions/reserve-item.js
  3. 34
      web/client/src/sections/business/containers/reserveItemsPeriodicStatistics.jsx
  4. 2
      web/client/src/utils/webapi.js

20
.vscode/launch.json

@ -15,31 +15,33 @@
"args": [ "args": [
"-p 4700", "-p 4700",
// "-f http://localhost:4700", // "-f http://localhost:4700",
// //
"-g postgres://postgres:123456@10.8.16.184:5432/ReportCenter", // "-g postgres://postgres:123456@10.8.16.184:5432/ReportCenter",
// "--redisHost localhost",
// "--redisPort 6378",
// "--apiEmisUrl http://localhost:4000",
//
//
"-g postgres://FashionAdmin:123456@10.8.30.36:5432/data_center",
"--redisHost localhost", "--redisHost localhost",
"--redisPort 6378", "--redisPort 6379",
// "--apiEmisUrl http://10.8.30.112:14000", "--apiEmisUrl http://localhost:14000",
//
// //
"--apiEmisUrl http://localhost:4000",
"--qnak XuDgkao6cL0HidoMAPnA5OB10Mc_Ew08mpIfRJK5", "--qnak XuDgkao6cL0HidoMAPnA5OB10Mc_Ew08mpIfRJK5",
"--qnsk yewcieZLzKZuDfig0wLZ9if9jKp2P_1jd3CMJPSa", "--qnsk yewcieZLzKZuDfig0wLZ9if9jKp2P_1jd3CMJPSa",
"--qnbkt dev-hr", "--qnbkt dev-hr",
// "--qndmn http://resources.anxinyun.cn", // "--qndmn http://resources.anxinyun.cn",
"--qndmn http://rjkwed13l.hn-bkt.clouddn.com", "--qndmn http://rjkwed13l.hn-bkt.clouddn.com",
// * 2 // * 2
// "--clickHouseUser ", // "--clickHouseUser ",
// "--clickHousePassword ", // "--clickHousePassword ",
"--clickHousePort 30123", "--clickHousePort 30123",
// //
// "--clickHouseUrl http://10.8.30.71", // "--clickHouseUrl http://10.8.30.71",
// "--clickHousePepEmis pepca_dev", // "--clickHousePepEmis pepca_dev",
// "--clickHouseCamworkflow camworkflow", // "--clickHouseCamworkflow camworkflow",
// "--clickHouseHr hr_dev", // "--clickHouseHr hr_dev",
// //
"--clickHouseUrl http://10.8.16.221", "--clickHouseUrl http://10.8.16.221",
"--clickHousePepEmis pg_pepca", "--clickHousePepEmis pg_pepca",

2
web/client/src/sections/business/actions/reserve-item.js

@ -6,7 +6,7 @@ export function getReserveItemReport(type) {
type: 'get', type: 'get',
dispatch: dispatch, dispatch: dispatch,
actionType: 'GET_RESERVEITEM_REPORT', actionType: 'GET_RESERVEITEM_REPORT',
url: `${ApiTable.getReserveItemReport.replace('{:type}', type)}`, url: `${ApiTable.getReserveItemReport.replace('{type}', type)}`,
msg: { error: '获取储备项目统计信息失败' }, msg: { error: '获取储备项目统计信息失败' },
reducer: { name: 'reserveItemReport' } reducer: { name: 'reserveItemReport' }
}); });

34
web/client/src/sections/business/containers/reserveItemsPeriodicStatistics.jsx

@ -4,12 +4,11 @@ import { Select, Input, Spin, Button, RadioGroup, Radio, Table } from '@douyinfe
import { IconSearch } from '@douyinfe/semi-icons'; import { IconSearch } from '@douyinfe/semi-icons';
import { RESERVEITEM_TYPE } from '../constants' import { RESERVEITEM_TYPE } from '../constants'
import '../style.less' import '../style.less'
import moment from 'moment'
const ReserveItemsPeriodicStatistics = (props) => { const ReserveItemsPeriodicStatistics = (props) => {
const { dispatch, actions, isResquesting, reserveItemReport } = props; const { dispatch, actions, isRequesting, reserveItemReport } = props;
useEffect(() => { useEffect(() => {
dispatch(actions.businessManagement.getReserveItemReport(RESERVEITEM_TYPE["periodicStatistics"])); dispatch(actions.businessManagement.getReserveItemReport(RESERVEITEM_TYPE.periodicStatistics));
}, []) }, [])
const columns = [ const columns = [
{ {
@ -19,11 +18,11 @@ const ReserveItemsPeriodicStatistics = (props) => {
}, },
{ {
title: '时间', title: '时间',
dataIndex: 'updateTime', dataIndex: 'year',
}, },
{ {
title: '名称', title: '名称',
dataIndex: 'name', dataIndex: 'path',
}, },
{ {
title: '操作', title: '操作',
@ -31,24 +30,6 @@ const ReserveItemsPeriodicStatistics = (props) => {
render: (text, record, indexe) => (<Button theme='solid' type='secondary'>导出</Button>) render: (text, record, indexe) => (<Button theme='solid' type='secondary'>导出</Button>)
}, },
]; ];
// const data = [
// {
// key: '1',
// name: 'Semi Design 稿.fig',
// updateTime: '2020-02-02 05:13',
// avatarBg: 'grey',
// },
// {
// key: '2',
// name: 'Semi Design 稿',
// updateTime: '2020-01-17 05:31',
// },
// {
// key: '3',
// name: '',
// updateTime: '2020-01-26 11:01',
// },
// ];
return ( return (
<> <>
@ -70,9 +51,10 @@ const ReserveItemsPeriodicStatistics = (props) => {
</div> </div>
<div style={{ borderBottom: '1px solid #F2F3F5', marginLeft: '-20px', marginBottom: 16 }}></div> <div style={{ borderBottom: '1px solid #F2F3F5', marginLeft: '-20px', marginBottom: 16 }}></div>
<div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: 22 }}> <div style={{ marginBottom: 22 }}>
<Spin spinning={isResquesting}> <Spin spinning={isRequesting}>
<Table <Table
rowKey={"id"}
columns={columns} columns={columns}
dataSource={reserveItemReport} dataSource={reserveItemReport}
// pagination={false} // pagination={false}
@ -92,7 +74,7 @@ function mapStateToProps(state) {
user: auth.user, user: auth.user,
actions: global.actions, actions: global.actions,
reserveItemReport: reserveItemReport.data || [], reserveItemReport: reserveItemReport.data || [],
isResquesting: reserveItemReport.isResquesting isRequesting: reserveItemReport.isRequesting
}; };
} }

2
web/client/src/utils/webapi.js

@ -17,7 +17,7 @@ export const ApiTable = {
logout: "logout", logout: "logout",
//项目报表 //项目报表
getReserveItemReport: "/reserveItem/report/:type" getReserveItemReport: "/reserveItem/report/{type}"
}; };
export const RouteTable = { export const RouteTable = {

Loading…
Cancel
Save