From 4d054b561bbc06facf7cd02bf9702a9722784c3f Mon Sep 17 00:00:00 2001 From: hujiabin <519660157@qq.com> Date: Tue, 26 Sep 2023 18:30:38 +0800 Subject: [PATCH] 1 --- doc/_common.py | 1 + webapp/controller/ComputingPowerController.class.php | 2 ++ 2 files changed, 3 insertions(+) diff --git a/doc/_common.py b/doc/_common.py index bf5b26fc..32a27f28 100644 --- a/doc/_common.py +++ b/doc/_common.py @@ -1348,6 +1348,7 @@ class ComputingPowerCurr(object): ['period_end', '', '本期结束时间(0 不显示)'], ['await_time', '', '结算等待时间'], ['assignable_cec', '', '可分配的总cec奖励'], + ['cec_pool', '', '总cec奖励池'], # ['total_target', '', '全服算力总目标'], # ['refresh_remain_time', '', '刷新剩余时间'], diff --git a/webapp/controller/ComputingPowerController.class.php b/webapp/controller/ComputingPowerController.class.php index 4b2aa1e0..64ec6d4b 100644 --- a/webapp/controller/ComputingPowerController.class.php +++ b/webapp/controller/ComputingPowerController.class.php @@ -29,6 +29,7 @@ class ComputingPowerController extends BaseAuthedController "period_end" => 0, "await_time" => 0, "assignable_cec" => 0, + "cec_pool" => 0, "total_exchange_hash_rate" => 0, "total_hash_rate" => 0, @@ -72,6 +73,7 @@ class ComputingPowerController extends BaseAuthedController $curr_period['period_begin'] = strtotime($currentMeta['start_time']); $curr_period['period_end'] = strtotime($currentMeta['end_time']); $curr_period['assignable_cec'] = min($currentMeta['cec_pool'],$totalNum); + $curr_period['cec_pool'] = $currentMeta['cec_pool']; $curr_period['total_exchange_hash_rate'] = $ownerNum; $curr_period['total_hash_rate'] = $totalNum; $curr_period['await_time'] = strtotime($currentMeta['end_time']) - myself()->_getNowTime();