bug 修复

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<SwapAsset>(msg);

YLErpWeb/Views/risk/quotaMonitor.cshtml

@@ -209,20 +209,6 @@
         </li>
     </ul>
     <div id="riskContent" class="yc-panel my-0 p-0">
-        <div class="search-group" style="display:none;">
-            <div class="search-group">
-                <span class="search-label" for="BusinessTotalScale">业务合约总规模<i class="fa fa-question" title="该指标满足公司对业务的净资本等风控指标额度授权" aria-hidden="true"></i></span>
-                <input class="search-input" setting id="BusinessTotalScale" name="BusinessTotalScale" type="text" value="" readonly autocomplete="off">
-            </div>
-            <div class="search-group">
-                <span class="search-label" for="BusinessAvailableFunds">业务投入资金</span>
-                <input class="search-input" setting id="BusinessAvailableFunds" name="BusinessAvailableFunds" type="text" value="" readonly autocomplete="off">
-            </div>
-            <div class="search-group">
-                <span class="search-label" for="SingleUnderlyingRate">单标的品种合约总规模占业务合约总规模比例上限</span>
-                <input class="search-input" setting id="SingleUnderlyingRate" name="SingleUnderlyingRate" type="text" value="" readonly autocomplete="off">
-            </div>
-        </div>
         <table id='listGrid' class='scroll' cellpadding='0' cellspacing='0'></table>
         <div id='pagerGrid'></div>
         <div class="search-group" style="display:none;"><i global asset variety underlying trade client>红色高亮表示超出限额;黄色高亮表示超出预警.</i></div>

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);