From 7fa03d7a4117260670a8203e829504b6e9dcc861 Mon Sep 17 00:00:00 2001
From: duLingLing <dll19920503@qq.com>
Date: Wed, 4 Sep 2019 10:09:20 +0800
Subject: [PATCH] =?UTF-8?q?UPD:=E9=A3=8E=E6=8E=A7=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=B8=8A=E4=B8=80=E5=B1=82=E4=B8=8D=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/manage.html                       | 92 +++++++++----------
 src/main/ui/static/analysis/risk_business.js  | 34 ++++---
 .../analysis/templates/audit_material.html    |  4 +-
 .../analysis/templates/riskEvent_detail.html  | 32 +++----
 .../analysis/templates/risk_business.html     | 88 +++++++++---------
 5 files changed, 127 insertions(+), 123 deletions(-)

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index 7d24f0daa..80fd87ec4 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -121,12 +121,12 @@ margin-bottom: 10%;"/>
      ng-class="currentUser.org?(currentUser.org.banner_class||'fxplus'):'royalpay'">
 
     <header class="main-header">
-         <!--Logo-->
+        <!--Logo-->
         <a href="#" class="logo logo-yedian shine" ng-if="!currentUser.org">
             <!--mini logo for sidebar mini 50x50 pixels -->
             <span class="logo-mini"><img src="static/images/r_white_logo.svg"
                                          style="max-height: 35px;margin-left: 15%;"></span>
-             <!--logo for regular state and mobile devices -->
+            <!--logo for regular state and mobile devices -->
             <span class="logo-lg"><img src="static/images/rp_white_logo.svg"
                                        style="max-height: 35px;">
                 <!--<b>RoyalPay</b>-->
@@ -141,7 +141,7 @@ margin-bottom: 10%;"/>
                                        style="max-height: 35px;margin-bottom: 8px;margin-right: 5px;"><b
                     ng-bind="currentUser.org.name"></b></span>
         </a>
-         <!--Header Navbar: style can be found in header.less -->
+        <!--Header Navbar: style can be found in header.less -->
         <!--顶部导航栏-->
 
         <nav class="navbar navbar-static-top navbar-static-top-yedian" role="navigation">
@@ -180,32 +180,32 @@ margin-bottom: 10%;"/>
                             <span class="label label-warning" ng-if="notifyCounts">{{notifyCounts}}</span>
                         </a>
                         <ul class="dropdown-menu">
-<!--
-                           <li class="header">System notifications,please resolve it!</li>
--->
+                            <!--
+                                                       <li class="header">System notifications,please resolve it!</li>
+                            -->
                             <li>
                                 <!--inner menu: contains the actual data-->
                                 <div class="slimScrollDiv" style="position: relative; overflow: hidden; width: auto; max-height: 200px;"><ul class="menu" style="overflow: hidden; width: 100%;">
                                     <li>
-                                    <a ng-if="partner_application_new" ui-sref="partner_apply">
-                                        <i class="fa fa-commenting"></i>
-                                        新的自主申请商户<span style="font-size:smaller;float:right;right: 0"></span>
-                                    </a>
+                                        <a ng-if="partner_application_new" ui-sref="partner_apply">
+                                            <i class="fa fa-commenting"></i>
+                                            新的自主申请商户<span style="font-size:smaller;float:right;right: 0"></span>
+                                        </a>
                                     </li>
                                     <li>
-                                    <a ng-if="refundReviews && ('10000000000'|withRole)" ui-sref="refundReview">
-                                        <i class="fa fa-commenting"></i>
-                                        新的退款申请<span style="font-size:smaller;float:right;right: 0"></span>
-                                    </a>
+                                        <a ng-if="refundReviews && ('10000000000'|withRole)" ui-sref="refundReview">
+                                            <i class="fa fa-commenting"></i>
+                                            新的退款申请<span style="font-size:smaller;float:right;right: 0"></span>
+                                        </a>
                                     </li>
                                 </ul><div class="slimScrollBar" style="background: rgb(0, 0, 0); width: 3px; position: absolute; top: 0px; opacity: 0.4; display: none; border-radius: 7px; z-index: 99; right: 1px; height: 195.122px;"></div><div class="slimScrollRail" style="width: 3px; height: 100%; position: absolute; top: 0px; display: none; border-radius: 7px; background: rgb(51, 51, 51); opacity: 0.2; z-index: 90; right: 1px;"></div></div>
                             </li>
                         </ul>
                     </li>
 
-<!--
-                     User Account: style can be found in dropdown.less
--->
+                    <!--
+                                         User Account: style can be found in dropdown.less
+                    -->
                     <li class="dropdown user user-menu" uib-dropdown>
                         <a href class="dropdown-toggle" uib-dropdown-toggle>
                             <img ng-src="{{currentUser.org.logo||'static/images/r_white_logo.svg'}}"
@@ -214,7 +214,7 @@ margin-bottom: 10%;"/>
                             <span class="hidden-xs" ng-bind="currentUser.display_name"></span>
                         </a>
                         <ul class="dropdown-menu user-dropdown-menu" ng-cloak>
-                             <!--User image-->
+                            <!--User image-->
                             <li class="user-header user-header-yedian">
                                 <img ng-src="{{currentUser.org.logo||'static/images/r_white_logo.svg'}}" class="img-circle"
                                      alt="User Image">
@@ -233,7 +233,7 @@ margin-bottom: 10%;"/>
                                         <i class="fa fa-tty" title="Service"
                                            ng-class="{'text-orange':!('10000'|withRole),'text-gray':('10000'|withRole)}"></i>
                                         <!--<i class="fa fa-university" title="Account Manager"-->
-                                           <!--ng-class="{'text-orange':!('100000'|withRole),'text-gray':('100000'|withRole)}"></i>-->
+                                        <!--ng-class="{'text-orange':!('100000'|withRole),'text-gray':('100000'|withRole)}"></i>-->
                                         <i class="fa fa-line-chart" title="Director"
                                            ng-class="{'text-orange':!('1000000'|withRole),'text-gray':('1000000'|withRole)}"></i>
                                         <i class="fa fa-map-o" title="Markting"
@@ -247,16 +247,16 @@ margin-bottom: 10%;"/>
                                         <i class="fa fa-user-plus" title="Org Manager"
                                            ng-class="{'text-orange':!('1000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>
                                         <i class="fa fa-ticket" title="Sales Manager"
-                                            ng-class="{'text-orange':!('10000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>
+                                           ng-class="{'text-orange':!('10000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>
                                         <!--<i class="fa fa-save" title="Data content"-->
-                                           <!--ng-class="{'text-orange':!('100000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>-->
-
-                                     </small>
-                                 </p>
-                             </li>
- <!--
-                              Menu Footer
- -->
+                                        <!--ng-class="{'text-orange':!('100000000000000'|withRole),'text-gray':('1000000000000'|withRole)}"></i>-->
+
+                                    </small>
+                                </p>
+                            </li>
+                            <!--
+                                                         Menu Footer
+                            -->
                             <li class="user-footer">
                                 <div class="pull-left">
                                     <a href class="btn btn-default btn-flat" ng-click="changePwd()">Change Password</a>
@@ -267,7 +267,7 @@ margin-bottom: 10%;"/>
                             </li>
                         </ul>
                     </li>
-                     <!--Control Sidebar Toggle Button -->
+                    <!--Control Sidebar Toggle Button -->
                 </ul>
             </div>
         </nav>
@@ -451,7 +451,7 @@ margin-bottom: 10%;"/>
                     </p>
                     <ul class="sidebar-menu" ng-class="{'active':Risk}">
                         <li ui-sref-active="active">
-                            <a ui-sref="analysis_monitoring.risk_business.risk_business_bd" ng-if="('100' | withRole)" ui-sref-opts="{reload:true}">
+                            <a ui-sref="analysis_monitoring.risk_business_bd" ng-if="('100' | withRole)" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-list-alt"></i> <span>风控业务|Risk Business</span>
                             </a>
                         </li>
@@ -664,11 +664,11 @@ margin-bottom: 10%;"/>
                 </li>
 
 
-               <!-- <li ui-sref-active="active" ng-if="'citypartner'|withModule">
-                    <a ui-sref="citypartner_reg" ui-sref-opts="{reload:true}">
-                        <i class="fa fa-users"></i> <span>City Partners</span>
-                    </a>
-                </li>-->
+                <!-- <li ui-sref-active="active" ng-if="'citypartner'|withModule">
+                     <a ui-sref="citypartner_reg" ui-sref-opts="{reload:true}">
+                         <i class="fa fa-users"></i> <span>City Partners</span>
+                     </a>
+                 </li>-->
                 <!--
                <li ui-sref-active="active" ng-if="('activities'|withModule) && (currentUser.org_id==1 || currentUser.org_id==null)">
                <a ui-sref="activity.detail({act_id:'3'})" ui-sref-opts="{reload:true}">
@@ -690,21 +690,21 @@ margin-bottom: 10%;"/>
                         <i class="fa fa-gift"></i> <span>红包返现</span>
                     </a>
                 </li>-->
-               <!-- <li ui-sref-active="active" ng-if="('funds'|withModule)">
-                    <a ui-sref="funds">
-                        <i class="fa fa-money"></i> <span>增值计划</span>
-                    </a>
-                </li>-->
+                <!-- <li ui-sref-active="active" ng-if="('funds'|withModule)">
+                     <a ui-sref="funds">
+                         <i class="fa fa-money"></i> <span>增值计划</span>
+                     </a>
+                 </li>-->
                 <!--<li class="header nav-header" ng-if="('1000000000000'|withRole)">机构|Agent</li>-->
                 <!--<li ui-sref-active="active" ng-if="('1000000000000'|withRole)">-->
-                    <!--<a ui-sref="analysis_agent" ui-sref-opts="{reload:true}">-->
-                        <!--<i class="fa fa-hand-peace-o"></i> <span>机构数据分析|Agent Analysis</span>-->
-                    <!--</a>-->
+                <!--<a ui-sref="analysis_agent" ui-sref-opts="{reload:true}">-->
+                <!--<i class="fa fa-hand-peace-o"></i> <span>机构数据分析|Agent Analysis</span>-->
+                <!--</a>-->
                 <!--</li>-->
                 <!--<li ui-sref-active="active" ng-if="('clearing_org'|withModule) && currentUser.org_id>1">-->
-                    <!--<a ui-sref="clearingLogsForOrg" ui-sref-opts="{reload:true}">-->
-                        <!--<i class="fa fa-line-chart"></i> <span>清算记录|Settlement Logs</span>-->
-                    <!--</a>-->
+                <!--<a ui-sref="clearingLogsForOrg" ui-sref-opts="{reload:true}">-->
+                <!--<i class="fa fa-line-chart"></i> <span>清算记录|Settlement Logs</span>-->
+                <!--</a>-->
                 <!--</li>-->
                 <li class="menu-group" ng-if="roleNow=='sitemanager'">
                     <p role="button" ng-class="{'active': Content,'is-hide':hideSideBar}" ng-click="Content = !Content">
diff --git a/src/main/ui/static/analysis/risk_business.js b/src/main/ui/static/analysis/risk_business.js
index 6dc31d671..34e7532e2 100644
--- a/src/main/ui/static/analysis/risk_business.js
+++ b/src/main/ui/static/analysis/risk_business.js
@@ -116,7 +116,11 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                         return $http.get('/risk/business/events/' + $stateParams.risk_id);
                     }]
                 }
-            }).state('analysis_monitoring.risk_business.riskEvent_detail_bd', {
+            }).state('analysis_monitoring.risk_business.riskEvent_detail.audit_material', {
+                url: '/audit_material',
+                templateUrl: '/static/analysis/templates/audit_material.html',
+                controller: 'auditMaterialCtrl'
+            }).state('analysis_monitoring.riskEvent_detail_bd', {
                 url: '/{risk_id}/bd/detail',
                 templateUrl: '/static/analysis/templates/riskEvent_detail_bd.html',
                 controller: 'riskEventDetailCtrl',
@@ -125,14 +129,10 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                         return $http.get('/risk/business/events/' + $stateParams.risk_id);
                     }]
                 }
-            }).state('analysis_monitoring.risk_business.risk_business.new_riskEvent', {
+            }).state('analysis_monitoring.risk_business.new_riskEvent', {
                 url: '/new_riskEvent',
                 templateUrl: '/static/analysis/templates/new_riskEvent.html',
                 controller: 'newRiskEventCtrl'
-            }).state('analysis_monitoring.risk_business.riskEvent_detail.audit_material', {
-                url: '/audit_material',
-                templateUrl: '/static/analysis/templates/audit_material.html',
-                controller: 'auditMaterialCtrl'
             });
 
         }]);
@@ -153,6 +153,10 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                     industries.push(industry.label);
                 });
                 industries.push('未知行业');
+                $scope.$watch('params',function (newVal) {
+                    console.log('params changed--->',newVal)
+                });
+                console.log('riskBusinessCtrl loaded')
                 // console.log(industries);
                 // 加载风险注册事件
                 $scope.loadRiskEvents = function (page) {
@@ -738,20 +742,20 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
 
                 $scope.increase = function ($index) {
                     $scope.materials.splice($index + 1, 0,
-                             {key: new Date().getTime(), value: ""});   // 用时间戳作为每个item的key
-                        // 增加新的input后允许删除
+                        {key: new Date().getTime(), value: ""});   // 用时间戳作为每个item的key
+                    // 增加新的input后允许删除
                     $scope.canMinus = true;
                 };
 
                 $scope.decrease = function($index) {
                     // 如果input大于1，删除
-                   if ($scope.materials.length > 1) {
-                       $scope.materials.splice($index, 1);
-                   }
-                   // 如果回复数为1，不允许删除
-                   if ($scope.materials.length == 1) {
-                       $scope.canMinus = false;
-                   }
+                    if ($scope.materials.length > 1) {
+                        $scope.materials.splice($index, 1);
+                    }
+                    // 如果回复数为1，不允许删除
+                    if ($scope.materials.length == 1) {
+                        $scope.canMinus = false;
+                    }
                 };
                 var array=new Array();
                 var validIndex = 0;
diff --git a/src/main/ui/static/analysis/templates/audit_material.html b/src/main/ui/static/analysis/templates/audit_material.html
index 2215d25dd..f070b8f28 100644
--- a/src/main/ui/static/analysis/templates/audit_material.html
+++ b/src/main/ui/static/analysis/templates/audit_material.html
@@ -83,8 +83,8 @@
         </form>
     </div>
     <div class="panel-footer">
-        <a role="button"
-           ui-sref="analysis_monitoring.risk_business"
+        <a role="button" id="test-btn"
+           ui-sref="^.^"
            class="btn btn-info">返回
         </a>
 
diff --git a/src/main/ui/static/analysis/templates/riskEvent_detail.html b/src/main/ui/static/analysis/templates/riskEvent_detail.html
index d9fac8c42..56cc960e9 100644
--- a/src/main/ui/static/analysis/templates/riskEvent_detail.html
+++ b/src/main/ui/static/analysis/templates/riskEvent_detail.html
@@ -21,7 +21,7 @@
                         <a ui-sref="analysis_monitoring.risk_business.riskEvent_detail" ui-sref-opts="{reload:true}">Risk Detail</a>
                     </li>
                     <li ui-sref-active="active">
-                        <a ui-sref="analysis_monitoring.risk_business.riskEvent_detail.audit_material" ui-sref-opts="{reload:true}">Audit material</a>
+                        <a ui-sref=".audit_material">Audit material</a>
                     </li>
                     <li>
                         <div class="btn-group pull-right" role="group" aria-label="..." ng-if="('10000000000'|withRole) && (riskEvent.result_type==1 || riskEvent.result_type==4)">
@@ -40,7 +40,7 @@
                                             <a role="button"
                                                class="pull-right"
                                                ng-click="changeEditFlag(editFlag)"
-                                            ng-if="('10000000000'|withRole)">
+                                               ng-if="('10000000000'|withRole)">
                                                 <i class="fa fa-edit"></i> Edit
                                             </a>
                                         </div>
@@ -465,11 +465,11 @@
                                                 </label>
                                                 <div class="col-sm-8">
                                                     <textarea class="form-control"
-                                                           ng-model="riskEventEdit.order_ids"
-                                                           type="text"
-                                                           name="order_ids"
-                                                           id="order-ids-input"
-                                                           required>
+                                                              ng-model="riskEventEdit.order_ids"
+                                                              type="text"
+                                                              name="order_ids"
+                                                              id="order-ids-input"
+                                                              required>
                                                     </textarea>
                                                     <div ng-messages="riskEventForm.order_ids.$error"
                                                          ng-if="riskEventForm.order_ids.$dirty">
@@ -608,17 +608,17 @@
                                                 <div class="col-sm-8">
 
                                                     <textarea class="form-control"
-                                                           ng-model="riskEventEdit.channel_result"
-                                                           type="text"
-                                                           name="channel_result"
-                                                           id="channel-result-input"/>
+                                                              ng-model="riskEventEdit.channel_result"
+                                                              type="text"
+                                                              name="channel_result"
+                                                              id="channel-result-input"/>
 
                                                     <!--<select class="form-control"-->
-                                                            <!--name="channel_result"-->
-                                                            <!--ng-model="riskEventEdit.channel_result"-->
-                                                            <!--id="channel-result-input"-->
-                                                            <!--ng-options="item for item in channelResults">-->
-                                                        <!--<option value="">Please Choose</option>-->
+                                                    <!--name="channel_result"-->
+                                                    <!--ng-model="riskEventEdit.channel_result"-->
+                                                    <!--id="channel-result-input"-->
+                                                    <!--ng-options="item for item in channelResults">-->
+                                                    <!--<option value="">Please Choose</option>-->
                                                     <!--</select>-->
                                                 </div>
                                             </div>
diff --git a/src/main/ui/static/analysis/templates/risk_business.html b/src/main/ui/static/analysis/templates/risk_business.html
index 4ed530dc9..4c920a572 100644
--- a/src/main/ui/static/analysis/templates/risk_business.html
+++ b/src/main/ui/static/analysis/templates/risk_business.html
@@ -203,7 +203,7 @@
                                 </button>
                                 <a role="button"
                                    class="btn btn-info"
-                                   ui-sref="analysis_monitoring.risk_business.new_riskEvent"
+                                   ui-sref=".new_riskEvent"
                                    title="New Event" ng-if="'10000000000'|withRole">
                                     <i class="fa fa-plus"></i> New Event
                                 </a>
@@ -224,52 +224,52 @@
                     <div class="box-body no-padding table-responsive">
                         <table class="table table-striped">
                             <thead>
-                                <tr>
-                                    <th>Partner</th>
-                                    <th>Order Type</th>
-                                    <th>Result Type</th>
-                                    <th>Sub Merchant ID</th>
-                                    <th>Email Status</th>
-                                    <th>Description</th>
-                                    <th>Channel Result</th>
-                                    <th>Risk Manager</th>
-                                    <th>Create Time</th>
-                                    <th>Operation</th>
-                                </tr>
+                            <tr>
+                                <th>Partner</th>
+                                <th>Order Type</th>
+                                <th>Result Type</th>
+                                <th>Sub Merchant ID</th>
+                                <th>Email Status</th>
+                                <th>Description</th>
+                                <th>Channel Result</th>
+                                <th>Risk Manager</th>
+                                <th>Create Time</th>
+                                <th>Operation</th>
+                            </tr>
                             </thead>
                             <tbody>
-                                <tr ng-repeat="riskEvent in riskEvents">
-                                    <td>
-                                        <a role="button"
-                                           ng-if="riskEvent.client_moniker != null"
-                                           ui-sref="partners.detail({clientMoniker: riskEvent.client_moniker})">
-                                            {{riskEvent.short_name}}({{riskEvent.client_moniker}})
-                                        </a>
-                                    </td>
-                                    <td ng-bind="riskEvent.order_type | orderType"></td>
-                                    <td ng-class="{'bg-red': riskEvent.result_type == 2, 'pass_timeout': riskEvent.pass_timeout}">
-                                        <span ng-if="riskEvent.order_type == 5">-</span>
-                                        <span ng-if="riskEvent.order_type != 5">{{riskEvent.result_type | resultType:resultSearchTypes}}</span>
-                                    </td>
-                                    <td ng-bind="riskEvent.sub_merchant_id"></td>
-                                    <td>
-                                        <span ng-if="riskEvent.order_type != 5">{{riskEvent.email_status | emailStatus}}</span>
-                                        <span ng-if="riskEvent.order_type == 5">-</span>
-                                    </td>
+                            <tr ng-repeat="riskEvent in riskEvents">
+                                <td>
+                                    <a role="button"
+                                       ng-if="riskEvent.client_moniker != null"
+                                       ui-sref="partners.detail({clientMoniker: riskEvent.client_moniker})">
+                                        {{riskEvent.short_name}}({{riskEvent.client_moniker}})
+                                    </a>
+                                </td>
+                                <td ng-bind="riskEvent.order_type | orderType"></td>
+                                <td ng-class="{'bg-red': riskEvent.result_type == 2, 'pass_timeout': riskEvent.pass_timeout}">
+                                    <span ng-if="riskEvent.order_type == 5">-</span>
+                                    <span ng-if="riskEvent.order_type != 5">{{riskEvent.result_type | resultType:resultSearchTypes}}</span>
+                                </td>
+                                <td ng-bind="riskEvent.sub_merchant_id"></td>
+                                <td>
+                                    <span ng-if="riskEvent.order_type != 5">{{riskEvent.email_status | emailStatus}}</span>
+                                    <span ng-if="riskEvent.order_type == 5">-</span>
+                                </td>
 
-                                    <td ng-bind="riskEvent.description | limitTo:20"></td>
-                                    <td ng-bind="riskEvent.channel_result"></td>
-                                    <td ng-bind="riskEvent.fillin_person"></td>
-                                    <td ng-bind="riskEvent.create_time"></td>
-                                    <td>
-                                        <a class="text-primary"
-                                           role="button"
-                                           title="Detail"
-                                           ui-sref="analysis_monitoring.risk_business.riskEvent_detail({risk_id:riskEvent.risk_id})">
-                                            <i class="fa fa-search"></i> Detail
-                                        </a>
-                                    </td>
-                                </tr>
+                                <td ng-bind="riskEvent.description | limitTo:20"></td>
+                                <td ng-bind="riskEvent.channel_result"></td>
+                                <td ng-bind="riskEvent.fillin_person"></td>
+                                <td ng-bind="riskEvent.create_time"></td>
+                                <td>
+                                    <a class="text-primary"
+                                       role="button"
+                                       title="Detail"
+                                       ui-sref="analysis_monitoring.risk_business.riskEvent_detail({risk_id:riskEvent.risk_id})">
+                                        <i class="fa fa-search"></i> Detail
+                                    </a>
+                                </td>
+                            </tr>
                             </tbody>
                         </table>
                     </div>