From ac10a564db63c7f9060a2e99c9cb7cc17f9832b7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 11 Nov 2020 16:07:13 +0800
Subject: [PATCH] modify

---
 src/main/resources/templates/febs/views/modules/dataMonitoring/dataMonitoringList.html |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/dataMonitoring/dataMonitoringList.html b/src/main/resources/templates/febs/views/modules/dataMonitoring/dataMonitoringList.html
index 31f42cc..db7ae56 100644
--- a/src/main/resources/templates/febs/views/modules/dataMonitoring/dataMonitoringList.html
+++ b/src/main/resources/templates/febs/views/modules/dataMonitoring/dataMonitoringList.html
@@ -12,6 +12,16 @@
                                             <input type="text" placeholder="手机号/邮箱/邀请码" name="account" autocomplete="off" class="layui-input">
                                         </div>
                                     </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label layui-form-label-sm">账号类型</label>
+                                        <div class="layui-input-inline">
+                                            <select name="isTest">
+                                                <option value=""></option>
+                                                <option value="1">正常账号</option>
+                     							<option value="2">测试账号</option>
+                                            </select>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                             <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
@@ -125,22 +135,31 @@
                 cols: [[
                     {field: 'phone', title: '电话', minWidth: 80,align:'left'},
                     {field: 'email', title: '邮箱', minWidth: 80,align:'left'},
+                    {field: 'realName', title: '姓名', minWidth: 100,align:'left'},
                     {field: 'reward', title: '总盈亏', minWidth: 80,align:'left'},
                     {field: 'count', title: '当天订单总数', minWidth: 80,align:'left'},
                     {field: 'countOut', title: '不符合条件的订单数量', minWidth: 100,align:'left'},
-                    {field: 'createTime', title: '更新时间', minWidth: 100,align:'left'},
+                    {field: 'accountType', title: '账号类型',
+                    	templet: function (d) {
+                            if (d.accountType === 2) {
+                                return '<span style="color:red;">测试账号</span>'
+                            } else if (d.accountType === 1) {
+                                return '<span style="color:green;">正常账号</span>'
+                            }
+                        },minWidth: 100,align:'center'},
                     {field: 'type', title: '类别',
                     	templet: function (d) {
                             if (d.type === 1) {
                                 return '<span style="color:green;">每日开仓数超过30</span>'
                             } else if (d.type === 2) {
-                                return '<span style="color:red;">三分钟平仓操作订单超过每日总订单数的50%</span>'
+                                return '<span style="color:blue;">三分钟平仓操作订单超过每日总订单数的50%</span>'
                             }else if (d.type === 3) {
                                 return '<span style="color:red;">订单总盈亏超过500</span>'
                             }else{
                                 return ''
                             }
                         }, minWidth: 200,align:'center'},
+                    {field: 'createTime', title: '更新时间', minWidth: 100,align:'left'},
                 ]]
             });
         }
@@ -149,6 +168,7 @@
         function getQueryParams() {
             return {
                 account: $searchForm.find('input[name="account"]').val().trim(),
+                isTest: $searchForm.find("select[name='isTest']").val(),
             };
         }
 

--
Gitblit v1.9.1