From ad002c136571fd4bbee48bb8fc2aaaf0ff63f294 Mon Sep 17 00:00:00 2001 From: yixian Date: Tue, 14 Jul 2020 01:16:39 +1000 Subject: [PATCH 1/3] homepage link --- src/main/ui/manage.html | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html index aa3022d5c..7ae019c08 100644 --- a/src/main/ui/manage.html +++ b/src/main/ui/manage.html @@ -553,7 +553,8 @@ margin-bottom: 10%;"/> 交易对账|Order Validation -
  • +
  • 清算日管理 @@ -563,13 +564,20 @@ margin-bottom: 10%;"/> 清算统计|Settlement Logs
    • - -
  • +
  • + + 清算任务|Settle Tasks + +
    • +
  • 清算预估|Estimate
    • -
  • +
  • 清算月报 From 83dc0c61bdb8f035328fe5c2faeddca8d0dae785 Mon Sep 17 00:00:00 2001 From: yixian Date: Tue, 14 Jul 2020 01:18:36 +1000 Subject: [PATCH 2/3] ui update --- .../analysis/templates/settlement_detail.html | 2 +- .../ui/static/menu/templates/main_menu.html | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/main/ui/static/analysis/templates/settlement_detail.html b/src/main/ui/static/analysis/templates/settlement_detail.html index 578944cbb..91aeb1787 100644 --- a/src/main/ui/static/analysis/templates/settlement_detail.html +++ b/src/main/ui/static/analysis/templates/settlement_detail.html @@ -43,7 +43,7 @@ - Settle Tasks + Settle Tasks diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html index d694d7dca..dc944c6dc 100644 --- a/src/main/ui/static/menu/templates/main_menu.html +++ b/src/main/ui/static/menu/templates/main_menu.html @@ -950,7 +950,7 @@ - +
    @@ -960,7 +960,19 @@
    -
    +
    + +
    + +
    + 清算任务 +
    +
    +     +
    +
    @@ -968,7 +980,8 @@ 清算预估
    -
    + +
    From 1d62c2cad3eed8a3f7b345441bdd0aa493c7c707 Mon Sep 17 00:00:00 2001 From: yixian Date: Tue, 14 Jul 2020 01:18:55 +1000 Subject: [PATCH 3/3] ui update --- src/main/ui/static/analysis/settle_tasks.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/ui/static/analysis/settle_tasks.js b/src/main/ui/static/analysis/settle_tasks.js index 2f60f29ce..b001c5501 100644 --- a/src/main/ui/static/analysis/settle_tasks.js +++ b/src/main/ui/static/analysis/settle_tasks.js @@ -30,7 +30,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) { } $scope.checkProgressStatus = function () { let defer = $q.defer(); - $http.get('/sys/settle_tasks/curent_progress').then(function (res) { + $http.get('/sys/settle_tasks/current_progress').then(function (res) { $scope.progress = res.data; defer.resolve(); if (!$scope.progress.processing) {