From b806737cd27e047d4dfcdaf7cd064b8f20b1e51d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 23 Apr 2021 14:45:54 +0800
Subject: [PATCH] modify enhance bug
---
src/main/resources/templates/febs/views/modules/contract/hold-list.html | 122 +++++++++++++++++++++++++---------------
1 files changed, 75 insertions(+), 47 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/contract/hold-list.html b/src/main/resources/templates/febs/views/modules/contract/hold-list.html
index 0072890..c880cc7 100644
--- a/src/main/resources/templates/febs/views/modules/contract/hold-list.html
+++ b/src/main/resources/templates/febs/views/modules/contract/hold-list.html
@@ -14,42 +14,36 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">创建时间</label>
+ <label class="layui-form-label layui-form-label-sm">合约类型</label>
<div class="layui-input-inline">
- <input type="text" name="createTime" id="user-createTime"
- 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="accountType">
+ <select name="symbol">
<option value=""></option>
- <option value="1">测试账号</option>
- <option value="2">正常账号</option>
+ <option value="BTC/USDT">BTC/USDT</option>
+ <option value="BCH/USDT">BCH/USDT</option>
+ <option value="ETC/USDT">ETC/USDT</option>
+ <option value="ETH/USDT">ETH/USDT</option>
+ <option value="EOS/USDT">EOS/USDT</option>
+ <option value="XRP/USDT">XRP/USDT</option>
+ <option value="LTC/USDT">LTC/USDT</option>
</select>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">账号状态</label>
+ <label class="layui-form-label layui-form-label-sm">开仓类型</label>
<div class="layui-input-inline">
- <select name="accountStatus">
+ <select name="openType">
<option value=""></option>
- <option value="0">禁用</option>
- <option value="1">正常</option>
+ <option value="1">开多</option>
+ <option value="2">开空</option>
</select>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">实名状态</label>
- <div class="layui-input-inline">
- <select name="certifyStatus">
- <option value=""></option>
- <option value="0">未通过</option>
- <option value="1">审核中</option>
- <option value="2">审核通过</option>
- <option value="2">未实名</option>
- </select>
+ <div class="layui-input-block">
+ <input type="radio" name="timeType" value="1" title="今日">
+ <input type="radio" name="timeType" value="2" title="昨日">
+ <input type="radio" name="timeType" value="3" title="本周">
+ <input type="radio" name="timeType" value="4" title="本月">
</div>
</div>
</div>
@@ -82,11 +76,25 @@
}}
<span class="layui-badge febs-bg-{{openType.color}}">{{ openType.title }}</span>
</script>
+<script type="text/html" id="loseOrProfit">
+ {{# if(d.loseOrProfit >= 0){ }}
+ <span style="color: green">{{ d.loseOrProfit }}</span>
+ {{# } else { }}
+ <span style="color: red">{{ d.loseOrProfit }}</span>
+ {{# } }}
+</script>
+<script type="text/html" id="returnRatio">
+ {{# if(d.returnRatio >= 0){ }}
+ <span style="color: green">{{ d.returnRatio }}</span>
+ {{# } else { }}
+ <span style="color: red">{{ d.returnRatio }}</span>
+ {{# } }}
+</script>
<!-- 表格字段状态格式化 start -->
<script data-th-inline="none" type="text/javascript">
// 引入组件并初始化
- layui.use(['dropdown', 'jquery', 'laydate', 'form', 'table', 'febs', 'treeSelect'], function () {
+ layui.use(['dropdown', 'jquery', 'laydate', 'form', 'table', 'febs', 'treeSelect', 'enhance'], function () {
var $ = layui.jquery,
laydate = layui.laydate,
febs = layui.febs,
@@ -98,20 +106,13 @@
$searchForm = $view.find('form'),
sortObject = {field: 'createTime', type: null},
tableIns,
- createTimeFrom,
- createTimeTo;
+ timeType,
+ openingType;
form.render();
// 表格初始化
initTable();
-
- // 时间组件
- laydate.render({
- elem: '#user-createTime',
- range: true,
- trigger: 'click'
- });
// 查询按钮
$query.on('click', function () {
@@ -123,8 +124,8 @@
$reset.on('click', function () {
$searchForm[0].reset();
sortObject.type = 'null';
- createTimeTo = null;
- createTimeFrom = null;
+ timeType = null;
+ openingType = null;
tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
});
@@ -148,28 +149,55 @@
{field: 'forceClosingPrice', title: '预估强平价', minWidth: 130, align: 'center'},
{field: 'bondAmount', title: '保证金', minWidth: 130, align: 'center'},
{field: 'createTime', title: '开仓时间', minWidth: 160, align: 'center'},
- {field: 'loseOrProfit', title: '盈亏', minWidth: 140, align: 'center', fixed : "right"},
- {field: 'returnRatio', title: '回报率', minWidth: 140, align: 'center', fixed : "right"},
+ {field: 'loseOrProfit',templet: '#loseOrProfit', title: '盈亏', minWidth: 140, align: 'center', fixed: 'right'},
+ {field: 'returnRatio',templet: '#returnRatio', title: '回报率', minWidth: 140, align: 'center', fixed: 'right'},
]]
});
}
// 获取查询参数
function getQueryParams() {
- var createTime = $searchForm.find('input[name="createTime"]').val();
- if (createTime) {
- createTimeFrom = createTime.split(' - ')[0];
- createTimeTo = createTime.split(' - ')[1];
+ var type = $searchForm.find('input[name="timeType"]:checked').val();
+ if (type) {
+ timeType = type;
+ }
+ var openType = $searchForm.find("select[name='openType']").val();
+ if (openType) {
+ openingType = openType;
}
return {
- startTime: createTimeFrom,
- endTime: createTimeTo,
+ timeType: timeType,
account: $searchForm.find('input[name="account"]').val().trim(),
- accountStatus: $searchForm.find("select[name='accountStatus']").val(),
- accountType: $searchForm.find("select[name='accountType']").val(),
- certifyStatus: $searchForm.find("select[name='certifyStatus']").val(),
+ openType: openingType,
+ symbol: $searchForm.find("select[name='symbol']").val(),
invalidate_ie_cache: new Date()
};
}
+
+ setTimeout(function() {
+ var flag = true;
+ while(flag) {
+ if (table.cache['userTable']) {
+ setInterval(function () {
+ $.ajax({
+ url : ctx + 'order/getHoldList',
+ type : 'get',
+ data : getQueryParams(),
+ async : false,
+ success : function(data) {
+ if (data.data.rows.length > 0) {
+ for(var i = 0, length = data.data.rows.length; i < length; i++) {
+ table.renderSpecRow('userTable', i, data.data.rows[i]);
+ }
+ }
+ }
+ });
+ }, 2000)
+
+ flag = false;
+ }
+ }
+ }, 2000)
+
})
</script>
\ No newline at end of file
--
Gitblit v1.9.1