From 56092011ef33df2882474abd6745bc2098137cc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=96=B9=E6=B5=B7?= Date: Wed, 23 Apr 2025 15:03:29 +0800 Subject: [PATCH] =?UTF-8?q?bug=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../App_Docs/结算单/非DMA结算单.xlsx | Bin 10337 -> 10398 bytes .../Modules/SwapModule/SwapConsumerService.cs | 6 +----- YLErpWeb/Views/risk/quotaMonitor.cshtml | 14 -------------- .../wwwroot/Scripts/app/risk/quotaMonitor.js | 8 ++++---- 4 files changed, 5 insertions(+), 23 deletions(-) diff --git a/Plugins/YLErp.Plugins.ZheShang/App_Docs/结算单/非DMA结算单.xlsx b/Plugins/YLErp.Plugins.ZheShang/App_Docs/结算单/非DMA结算单.xlsx index 38aea405ee3d623bc307271951ab49fecd920d4f..33ff999d8e03d184c2e94a13f0459a065d253e1d 100644 GIT binary patch delta 3450 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 delta 3333 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 AegFUf diff --git a/YLErpDAL/Modules/SwapModule/SwapConsumerService.cs b/YLErpDAL/Modules/SwapModule/SwapConsumerService.cs index 7abd70fb..24a8e6fd 100644 --- a/YLErpDAL/Modules/SwapModule/SwapConsumerService.cs +++ b/YLErpDAL/Modules/SwapModule/SwapConsumerService.cs @@ -37,11 +37,7 @@ namespace YLErp.Modules.SwapModule { _kafkaConsumer.Subscribe(msg => { - var hedgingSource = OtcAppConfigHelper.HedgingSource==1|| OtcAppConfigHelper.HedgingSource==0; - if (hedgingSource) - { - return; - } + LogFactory.GetLogger("SwapConsumerService").Info("TRS对冲交易回执接口:"+ msg); if (!string.IsNullOrEmpty(msg)) { var result = JsonHelper.Deserialize(msg); diff --git a/YLErpWeb/Views/risk/quotaMonitor.cshtml b/YLErpWeb/Views/risk/quotaMonitor.cshtml index 52496164..cf0e805b 100644 --- a/YLErpWeb/Views/risk/quotaMonitor.cshtml +++ b/YLErpWeb/Views/risk/quotaMonitor.cshtml @@ -209,20 +209,6 @@
-
diff --git a/YLErpWeb/wwwroot/Scripts/app/risk/quotaMonitor.js b/YLErpWeb/wwwroot/Scripts/app/risk/quotaMonitor.js index 3beb5396..94259ded 100644 --- a/YLErpWeb/wwwroot/Scripts/app/risk/quotaMonitor.js +++ b/YLErpWeb/wwwroot/Scripts/app/risk/quotaMonitor.js @@ -274,10 +274,10 @@ function gridComplete(obj) { $("#SingleUnderlyingRate").val(obj.Sum.SingleUnderlyingRate); } $(window).off('resize.jqGrid'); - $(window).on('resize.jqGrid', function () { - $("#listGrid").jqGrid('setGridWidth', $('#riskContent').width() - 2); - }); - $("#listGrid").jqGrid('setGridWidth', $('#riskContent').width() - 2); + //$(window).on('resize.jqGrid', function () { + // $("#listGrid").jqGrid('setGridWidth', $('#riskContent').width() - 2); + //}); + //$("#listGrid").jqGrid('setGridWidth', $('#riskContent').width() - 2); var jgrid = jQuery('#listGrid'); var tag = $("#myTab .active a").attr("tag"); main.setcolumnChooser(jgrid, key + tag);