diff --git a/et --hard 8e0cf37 b/et --hard 8e0cf37 new file mode 100644 index 000000000..95a171a18 --- /dev/null +++ b/et --hard 8e0cf37 @@ -0,0 +1,274 @@ +commit 8e0cf3730ba50f5fb95773d7ed3bfeab51cff640 (HEAD -> forge) +Author: dingyongkang <837816638@qq.com> +Date: Tue Feb 25 17:14:50 2020 +0800 + + 合并请求模块 + +commit b0d10c14dd86c0db5bfa37da24587687e7570b60 +Merge: ba41688b4 8a3afcbf0 +Author: dingyongkang <837816638@qq.com> +Date: Wed Feb 19 20:02:46 2020 +0800 + + 工单模块 + +commit ba41688b4b6116d677585a826e53ee0a7c3c3f7d +Author: dingyongkang <837816638@qq.com> +Date: Wed Feb 19 19:33:48 2020 +0800 + + 工单部分 + +commit 8a3afcbf00835d67725ea9464b9abac16eb2a89c +Merge: 57415df2a 30ef541d4 +Author: sylor_huang@126.com +Date: Wed Feb 19 19:12:18 2020 +0800 + + Merge branch 'forge' of https://bdgit.educoder.net/Hjqreturn/educoder into forge + +commit 57415df2aa48aebc0b29a3d4725a06dcdb63d742 +Author: sylor_huang@126.com +Date: Wed Feb 19 19:11:50 2020 +0800 + + issue的问题修复及pull_request的问题修复 + +commit 30ef541d40a1c7063a20423e3b95c73da8e9bf8c +Merge: 21ce82e9c ded428147 +Author: caicai8 <1149225589@qq.com> +Date: Wed Feb 19 17:38:45 2020 +0800 + + Merge branch 'forge' of https://bdgit.educoder.net/Hjqreturn/educoder into forge + +commit 21ce82e9c15724fc3b10c02ab3d0b5ed6670e86e +Author: caicai8 <1149225589@qq.com> +Date: Wed Feb 19 17:38:41 2020 +0800 + + 动态列表 + +commit ded4281470613992a416be8b383e863136e2cd81 +Author: sylor_huang@126.com +Date: Wed Feb 19 17:30:53 2020 +0800 + + 修改csv的乱码问题 + +commit a5a5add7d662377ebd0a8b3796b761f043232f4a +Merge: d4132a802 b435933a5 +Author: sylor_huang@126.com +Date: Wed Feb 19 15:12:01 2020 +0800 + + Merge branch 'forge' of https://bdgit.educoder.net/Hjqreturn/educoder into forge + +commit d4132a802e5afa2d5f79d4540827348b8395edb1 +Author: sylor_huang@126.com +Date: Wed Feb 19 15:10:56 2020 +0800 + + 分支切换添加loading + +commit b435933a54709da3ab4e167d1657348cea359de1 +Author: caicai8 <1149225589@qq.com> +Date: Wed Feb 19 15:04:46 2020 +0800 + + 动态-分页 + +commit b10091130e3bea8ff989ccd018505d19eb4dec29 +Merge: 92fea708c 0d060af2f +Author: caicai8 <1149225589@qq.com> +Date: Wed Feb 19 11:59:48 2020 +0800 + + Merge branch 'forge' of https://bdgit.educoder.net/Hjqreturn/educoder into forge + +commit 92fea708c48a27cd2fddb7ebb096dddc248129ca +Author: caicai8 <1149225589@qq.com> +Date: Wed Feb 19 11:59:45 2020 +0800 + + 文件 + +commit a93837a062dacec33a277d50f504de9bf037f687 +Author: caicai8 <1149225589@qq.com> +Date: Wed Feb 19 11:59:35 2020 +0800 + + 动态 + +commit 0d060af2f926dc92482a76346abfc94d09cd32d1 +Author: sylor_huang@126.com +Date: Tue Feb 18 18:43:56 2020 +0800 + + 前端bug修复和后端问题 + +commit 42e8a78477525c32d98d2299c3826f0dc4f6e38f +Merge: 64d920039 d9e89e6fb +Author: sylor_huang@126.com +Date: Tue Feb 18 16:16:49 2020 +0800 + + Merge branch 'forge' of https://bdgit.educoder.net/Hjqreturn/educoder into forge + +commit 64d920039a51196fff20b813938969e3c326e1c6 +Author: sylor_huang@126.com +Date: Tue Feb 18 16:16:24 2020 +0800 + + 一些bug修改 + +commit d9e89e6fb7934d9e215dc1e7c7d1f61093154b9a +Author: caicai8 <1149225589@qq.com> +Date: Tue Feb 18 16:12:18 2020 +0800 + + branch + +commit 43e9c90439890056c94a2265296bda2626aef447 +Author: caicai8 <1149225589@qq.com> +Date: Tue Feb 18 14:56:09 2020 +0800 + + 从分支页面跳转到分支提交页面 + +commit 2e42ad82cafa3c3a96813e517253d825dddf8e27 +Merge: 9a2dd0456 d3a9af7bb +Author: caicai8 <1149225589@qq.com> +Date: Tue Feb 18 13:34:48 2020 +0800 + + Merge branch 'forge' of https://bdgit.educoder.net/Hjqreturn/educoder into forge + +commit 9a2dd0456eb2e25490d697ad539ac0ccf7a047cf +Author: caicai8 <1149225589@qq.com> +Date: Tue Feb 18 13:34:43 2020 +0800 + + package + +commit d3a9af7bb3b4e0600f5bb7a26a349fe87eb49bc5 +Author: sylor_huang@126.com +Date: Tue Feb 18 10:54:38 2020 +0800 + + 前端样式修改 + +commit 5feb1f6e53b325822d305bbfcd4a6c644d9039dd +Author: caicai8 <1149225589@qq.com> +Date: Mon Feb 17 16:38:53 2020 +0800 + + clone_url + +commit 2eefb0ed381211ec250470202e686c2465807c7d +Author: sylor_huang@126.com +Date: Fri Feb 14 19:03:58 2020 +0800 + + 前端部分修改 + +commit 9990e3b5c50aa0c9a2c1e9f7442fa85208fa6211 +Merge: 0f97b2edd 6a41049e1 +Author: sylor_huang@126.com +Date: Fri Feb 14 14:46:52 2020 +0800 + + Merge branch 'forge' of https://bdgit.educoder.net/Hjqreturn/educoder into forge + +commit 0f97b2eddae2551be9c155adf318d800f5dd8e58 +Author: sylor_huang@126.com +Date: Fri Feb 14 14:46:17 2020 +0800 + + 前端样式修复 + +commit 6a41049e1de36eda58d728e7eba2285db2ac68fa +Author: Jasder <2053003901@@qq.com> +Date: Thu Feb 13 22:48:40 2020 +0800 + + ADD some count + +commit 36860fe5c2995331e87d6437c48cacd9155f3a16 +Merge: 1f2a0c0e6 00cb5c061 +Author: Jasder <2053003901@@qq.com> +Date: Thu Feb 13 22:44:17 2020 +0800 + + Merge branch 'forge' of http://bdgit.educoder.net/Hjqreturn/educoder into forge + +commit 00cb5c0610f63eae6d4139a9cf1c536f5e048833 +Author: sylor_huang@126.com +Date: Thu Feb 13 18:53:01 2020 +0800 + + 修改entry的错误 + +commit 1f2a0c0e61ad320d6c54de0721c46c02677c43b6 +Merge: a72b4f682 5a8fcf994 +Author: Jasder <2053003901@@qq.com> +Date: Thu Feb 13 18:51:14 2020 +0800 + + fic bug + +commit 5a8fcf994fcce0829e620cb5dd507de93606ee33 +Author: sylor_huang@126.com +Date: Thu Feb 13 18:09:10 2020 +0800 + + 修改 + +commit a72b4f68276babbf6c65ea877266af4251ba3410 +Merge: 9a2ff48de 36ccf249b +Author: Jasder <2053003901@@qq.com> +Date: Thu Feb 13 18:01:51 2020 +0800 + + FIC merge bug + +commit 9a2ff48de8c3a3f9f9958489bbe235b1f72319f7 +Author: Jasder <2053003901@@qq.com> +Date: Thu Feb 13 17:59:20 2020 +0800 + + FIX 404 page bug + +commit 36ccf249bf68542b4b9324d89c478789db12887b +Author: sylor_huang@126.com +Date: Thu Feb 13 17:53:16 2020 +0800 + + 注释current_laboratory + +commit adc7da1a3c541ed263daf8793bdb9af1e736900c +Author: sylor_huang@126.com +Date: Thu Feb 13 17:47:49 2020 +0800 + + 修改appconfig.js + +commit 6e6649aa096921a994bed0119eafc288d5ac5a29 +Author: sylor_huang@126.com +Date: Thu Feb 13 17:40:39 2020 +0800 + + 注释get_user_info里的current_laboratory + +commit a447a0d10229275ad6c51903762c2175b2afb743 +Author: sylor_huang@126.com +Date: Thu Feb 13 17:23:57 2020 +0800 + + change current_laboratory is nill error + +commit 567d20caea58782d1e99058cb76fb1e1307f7b09 +Merge: d66c0c2f3 0408f89cb +Author: sylor_huang@126.com +Date: Thu Feb 13 17:15:29 2020 +0800 + + Merge branch 'forge' of https://bdgit.educoder.net/Hjqreturn/educoder into forge + +commit d66c0c2f31b717ed3fed6bcff74318a682768635 +Author: sylor_huang@126.com +Date: Thu Feb 13 17:14:59 2020 +0800 + + 修改settings/show.json + +commit 0408f89cb37041a92deea969619873849198d99c +Merge: ef807c8ec 8933a1a91 +Author: Jasder <2053003901@@qq.com> +Date: Thu Feb 13 17:12:02 2020 +0800 + + Merge branch 'forge' of http://bdgit.educoder.net/Hjqreturn/educoder into forge + +commit ef807c8ecfc5fd5f1129d6ab4d2f1a6c16333dbd +Author: Jasder <2053003901@@qq.com> +Date: Thu Feb 13 17:10:23 2020 +0800 + + ADD 工单，pull_requests 数据统计 + +commit 8933a1a916baa4805ac45c1970542d25a447f703 +Author: sylor_huang@126.com +Date: Thu Feb 13 16:45:27 2020 +0800 + + build + +commit 05266a3c3ff2e03573337965c4580d7cc771e4fb +Author: sylor_huang@126.com +Date: Thu Feb 13 16:33:23 2020 +0800 + + issue标签和里程碑 + +commit e2550b9d741835e1e59eed25a17e004d62dd0919 +Author: dingyongkang <837816638@qq.com> +Date: T \ No newline at end of file diff --git a/public/react/src/modules/paths/statics/index.js b/public/react/src/modules/paths/statics/index.js index 6b14f118c..aa5592cd4 100644 --- a/public/react/src/modules/paths/statics/index.js +++ b/public/react/src/modules/paths/statics/index.js @@ -249,6 +249,7 @@ const App = (props) => { // 恢复初始值 changeParams(params); initTotal(); + console.log(staticList) pathId && staticList(pathId); } diff --git a/public/react/src/redux/actions/static.js b/public/react/src/redux/actions/static.js index 3159d35c2..bc689c868 100644 --- a/public/react/src/redux/actions/static.js +++ b/public/react/src/redux/actions/static.js @@ -12,8 +12,7 @@ import { fetchStaticList } from "../../services/staticService"; export const staticList = (id) => { return (dispatch, getState) => { const { params, total_count, other_info } = getState().staticReducer; - - if (total_count !== 0 && total_count === other_info.length) return; + if (other_info.length===20||total_count !== 0 && total_count === other_info.length) return; fetchStaticList(id, params).then(res => { // console.log('统计数据=====>>>>>', res); const {data} = res;