fix(dashboard): 修复波色筛选无效 — 用colorMap原始值而非hex颜色
getColorByNum返回的是hex颜色值(如#e74c3c),用indexOf检查hex字符串无法匹配中文波色。 改为直接从colorMap获取原始中文波色(如"红波")再提取标签。
This commit is contained in:
@@ -830,12 +830,18 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
|
||||
* 渲染筛号器号码网格
|
||||
*/
|
||||
renderNumberFilterGrid: function (layero) {
|
||||
var colorMap = Controller.api.colorMap;
|
||||
var html = '';
|
||||
for (var num = 1; num <= 49; num++) {
|
||||
var color = Controller.api.getColorByNum(num);
|
||||
var colorHex = Controller.api.getColorByNum(num);
|
||||
var colorRaw = colorMap[num] || '';
|
||||
var animal = Controller.api.getAnimalByNum(num);
|
||||
html += '<div class="nf-number" data-num="' + num + '" data-color="' + (color.indexOf('红') !== -1 ? '红' : color.indexOf('蓝') !== -1 ? '蓝' : '绿') + '" data-animal="' + animal + '" data-tail="' + (num % 10) + '" style="text-align:center;background:#f9f9f9;padding:6px 4px;border-radius:6px;min-width:60px;transition:opacity 0.2s;">' +
|
||||
'<span style="display:inline-block;width:36px;height:36px;line-height:36px;text-align:center;border-radius:50%;color:#fff;background-color:' + color + ';font-weight:bold;">' + num + '</span>' +
|
||||
var colorLabel = '';
|
||||
if (colorRaw.indexOf('红') !== -1) colorLabel = '红';
|
||||
else if (colorRaw.indexOf('蓝') !== -1) colorLabel = '蓝';
|
||||
else if (colorRaw.indexOf('绿') !== -1) colorLabel = '绿';
|
||||
html += '<div class="nf-number" data-num="' + num + '" data-color="' + colorLabel + '" data-animal="' + animal + '" data-tail="' + (num % 10) + '" style="text-align:center;background:#f9f9f9;padding:6px 4px;border-radius:6px;min-width:60px;transition:opacity 0.2s;">' +
|
||||
'<span style="display:inline-block;width:36px;height:36px;line-height:36px;text-align:center;border-radius:50%;color:#fff;background-color:' + colorHex + ';font-weight:bold;">' + num + '</span>' +
|
||||
'<div style="font-size:10px;color:#666;line-height:1.2;">' + animal + '</div>' +
|
||||
'</div>';
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user