From dac86147b438f95df9f86bf850b630f9cd8c6978 Mon Sep 17 00:00:00 2001 From: zhouxin Date: Wed, 23 Nov 2022 16:09:29 +0800 Subject: [PATCH] =?UTF-8?q?=EF=BC=88*=EF=BC=89=E5=82=A8=E5=A4=87=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=91=A8=E6=9C=9F=E7=BB=9F=E8=AE=A1=E8=A1=A8debug?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/launch.json | 20 ++++++----- .../sections/business/actions/reserve-item.js | 2 +- .../reserveItemsPeriodicStatistics.jsx | 36 +++++-------------- web/client/src/utils/webapi.js | 2 +- 4 files changed, 22 insertions(+), 38 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index a1edc07..21c6934 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -15,31 +15,33 @@ "args": [ "-p 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", - "--redisPort 6378", - // "--apiEmisUrl http://10.8.30.112:14000", + "--redisPort 6379", + "--apiEmisUrl http://localhost:14000", + // 镇江研发结束 // 测试 - "--apiEmisUrl http://localhost:4000", "--qnak XuDgkao6cL0HidoMAPnA5OB10Mc_Ew08mpIfRJK5", "--qnsk yewcieZLzKZuDfig0wLZ9if9jKp2P_1jd3CMJPSa", "--qnbkt dev-hr", // "--qndmn http://resources.anxinyun.cn", "--qndmn http://rjkwed13l.hn-bkt.clouddn.com", - // 似乎不能传空 先注释 * 2 // "--clickHouseUser ", // "--clickHousePassword ", - "--clickHousePort 30123", - // 开发 // "--clickHouseUrl http://10.8.30.71", // "--clickHousePepEmis pepca_dev", // "--clickHouseCamworkflow camworkflow", // "--clickHouseHr hr_dev", - // 测试 "--clickHouseUrl http://10.8.16.221", "--clickHousePepEmis pg_pepca", diff --git a/web/client/src/sections/business/actions/reserve-item.js b/web/client/src/sections/business/actions/reserve-item.js index 33e1828..a2b14aa 100644 --- a/web/client/src/sections/business/actions/reserve-item.js +++ b/web/client/src/sections/business/actions/reserve-item.js @@ -6,7 +6,7 @@ export function getReserveItemReport(type) { type: 'get', dispatch: dispatch, actionType: 'GET_RESERVEITEM_REPORT', - url: `${ApiTable.getReserveItemReport.replace('{:type}', type)}`, + url: `${ApiTable.getReserveItemReport.replace('{type}', type)}`, msg: { error: '获取储备项目统计信息失败' }, reducer: { name: 'reserveItemReport' } }); diff --git a/web/client/src/sections/business/containers/reserveItemsPeriodicStatistics.jsx b/web/client/src/sections/business/containers/reserveItemsPeriodicStatistics.jsx index 0d70d7d..ed27c82 100644 --- a/web/client/src/sections/business/containers/reserveItemsPeriodicStatistics.jsx +++ b/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 { RESERVEITEM_TYPE } from '../constants' import '../style.less' -import moment from 'moment' const ReserveItemsPeriodicStatistics = (props) => { - const { dispatch, actions, isResquesting, reserveItemReport } = props; + const { dispatch, actions, isRequesting, reserveItemReport } = props; useEffect(() => { - dispatch(actions.businessManagement.getReserveItemReport(RESERVEITEM_TYPE["periodicStatistics"])); + dispatch(actions.businessManagement.getReserveItemReport(RESERVEITEM_TYPE.periodicStatistics)); }, []) const columns = [ { @@ -19,11 +18,11 @@ const ReserveItemsPeriodicStatistics = (props) => { }, { title: '时间', - dataIndex: 'updateTime', + dataIndex: 'year', }, { title: '名称', - dataIndex: 'name', + dataIndex: 'path', }, { title: '操作', @@ -31,24 +30,6 @@ const ReserveItemsPeriodicStatistics = (props) => { render: (text, record, indexe) => () }, ]; - // 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 ( <> @@ -70,12 +51,13 @@ const ReserveItemsPeriodicStatistics = (props) => {
-
- +
+ @@ -92,7 +74,7 @@ function mapStateToProps(state) { user: auth.user, actions: global.actions, reserveItemReport: reserveItemReport.data || [], - isResquesting: reserveItemReport.isResquesting + isRequesting: reserveItemReport.isRequesting }; } diff --git a/web/client/src/utils/webapi.js b/web/client/src/utils/webapi.js index 11dd619..2521a9b 100644 --- a/web/client/src/utils/webapi.js +++ b/web/client/src/utils/webapi.js @@ -17,7 +17,7 @@ export const ApiTable = { logout: "logout", //项目报表 - getReserveItemReport: "/reserveItem/report/:type" + getReserveItemReport: "/reserveItem/report/{type}" }; export const RouteTable = {