yinmeng/yinmeng-admin-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

家族和公会新增字段

Browse Source
This commit is contained in:
liaozetao
2023-12-18 14:33:31 +08:00
parent bc10184afd
commit dfe921ac18
5 changed files with 62 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/hall/ClanAdminView.vue
View File

@@ -21,6 +21,11 @@
<select id="queryClanLevel" name="queryClanLevel" class="input-sm">
</select>
</div>
<label for="clanName" class="col-sm-2 control-label">家族名称:</label>
<div class="col-sm-4">
<input type="text" class="form-control" name="clanName" id="clanName"
placeholder="请输入家族名称，填多个用,隔开">
</div>
</div>
<div class="col-sm-12">
<button id="btnSearch" class="btn btn-default">
@@ -300,6 +305,8 @@ export default {
{ field: 'clanId', title: '家族id', align: 'center', width: '5%' },
{ field: 'clanElderUid', title: '族长uid', align: 'center', width: '5%' },
{ field: 'clanElderErbanNo', title: '族长音萌号', align: 'center', width: '5%' },
{ field: 'clanElderNick', title: '族长昵称', align: 'center', width: '5%' },
{ field: 'clanName', title: '家族名称', align: 'center', width: '5%' },
{
field: 'avatar', title: '家族封面', align: 'center', valign: 'middle', width: '10%',
formatter: function (val, row, index) {
@@ -348,7 +355,8 @@ export default {
pageSize: params.pageSize,
erbanNo: $('#erbanNo').val(),
clanId: $('#clanId').val(),
level: $("#queryClanLevel").val()
level: $("#queryClanLevel").val(),
clanName: $('#clanName').val(),
};
currParams = param;
return param;

1
src/views/hall/ClanFlowStatisAdminView.vue
View File

@@ -202,6 +202,7 @@ export default {
columns: [
{ field: 'clanName', title: '家族名称', align: 'center', width: '5%' },
{ field: 'clanErbanNo', title: '族长音萌号', align: 'center', width: '5%' },
{ field: 'clanElderNick', title: '族长昵称', align: 'center', width: '5%' },
{ field: 'clanId', title: '家族id', align: 'center', width: '10%' },
{ field: 'roomIncome', title: '房间总流水', align: 'center', width: '10%' },
{ field: 'bagIncome', title: '背包礼物总流水', align: 'center', width: '10%' },

28
src/views/hall/HallAdminView.vue
View File

@@ -26,8 +26,10 @@
<button id="btnSearch" class="btn btn-default">
<i class="glyphicon glyphicon-search"></i>查询
</button>
<button id="btnExport" class="btn btn-default">
<i class="glyphicon glyphicon-export"></i>导出
</button>
</div>
</div>
</div>
@@ -85,6 +87,9 @@ export default {
}
}
},
{ field: 'clanElderNick', title: '家族昵称', align: 'center', width: '5%' },
{ field: 'clanName', title: '家族名称', align: 'center', width: '5%' },
{ field: 'hallNick', title: '会长昵称', align: 'center', width: '5%' },
{ field: 'hallId', title: '公会id', align: 'center', width: '5%' },
{ field: 'ownerUid', title: '会长uid', align: 'center', width: '5%' },
{ field: 'ownerErbanNo', title: '会长音萌号', align: 'center', width: '5%' },
@@ -126,6 +131,27 @@ export default {
$('#btnSearch').on('click', function () {
TableHelper.doRefresh('#table');
});
// 导出
$('#btnExport').on('click', function () {
console.log("导出")
window.location.href = `/admin/hall/exportHallMemberStatistic?${param(getQueryParams())}`
})
function param(json) {
if (!json) return ''
return cleanArray(Object.keys(json).map(key => {
if (json[key] === undefined) return ''
return encodeURIComponent(key) + '=' +
encodeURIComponent(json[key])
})).join('&')
}
function getQueryParams() {
var param = {
ownerErbanNo: $('#ownerErbanNo').val(),
hallIdStr: $('#hallIdStr').val(),
clanElderErbanNoStr: $('#clanElderErbanNoStr').val(),
};
return param;
}
});
}
}

1
src/views/hall/HallMemberView.vue
View File

@@ -143,6 +143,7 @@ export default {
}
}
},
{ field: 'clanElderNick', title: '族长昵称', align: 'center', width: '5%' },
{
field: 'hallId', title: '公会id', align: 'center', width: '5%',
formatter: function (val, row, index) {

27
src/views/statistic/PermitRoomTimeRecordView.vue
View File

@@ -12,15 +12,14 @@
<input type="hidden" name="erbanNo" id="exportErbanNo">
</form>
<div id="toolbar">
<div class="col-sm-12">
厅号：<input type="text" class="input-sm" name="erbanNo" id="qErbanNo">
日期：<input type="text" class="input-sm date" name="startDate" id="qStartDate">
- <input type="text" class="input-sm date" name="endDate" id="qEndDate">
<button id="btnSearch" class="btn btn-sm btn-primary">查询</button>
<button id="btnExport" class="btn btn-sm btn-primary">导出</button>
<button id="btnToday" class="btn btn-sm btn-default">今日</button>
<button id="btnWeek" class="btn btn-sm btn-default">本周</button>
</div>
<div class="summary col-sm-12">
<div class="col-sm-6">
@@ -100,6 +99,7 @@ export default {
$('.fixed-table-pagination').empty();
$('#table').bootstrapTable({
columns: [
{ field: 'title', title: '房间名', align: 'center', width: '5%' },
{ field: 'erbanNo', title: '房号', align: 'center', width: '5%' },
{ field: 'hour', title: '总时长(h)', align: 'center', width: '5%' },
{
@@ -264,6 +264,27 @@ export default {
}
return val + '时'
}
function setChargeSearchTimeUseQuickWay(quickDom) {
const days = quickDom.attr("data-days");
const today = new Date(new Date().setHours(0, 0, 0, 0));
const todayStr = formatTime(today);
const startTime = formatTime(new Date(today.getTime() - days * 24 * 60 * 60 * 1000));
$('#chargeStartTime').val(startTime);
$('#chargeEndTime').val(todayStr);
}
$('#btnToday').on('click', function () {
const startTime = new Date(new Date().setHours(0, 0, 0, 0));
const endTime = new Date(new Date().setHours(23, 59, 59, 0));
$('#qStartDate').val(formatTime(startTime));
$('#qEndDate').val(formatTime(endTime));
});
$('#btnWeek').on('click', function () {
const today = new Date(new Date().setHours(0, 0, 0, 0));
const startTime = new Date(today.getTime() - 7 * 24 * 60 * 60 * 1000);
const endTime = new Date(new Date().setHours(23, 59, 59, 0));
$('#qStartDate').val(formatTime(startTime));
$('#qEndDate').val(formatTime(endTime));
});
// 导出excel
$('#btnExport').on('click', function () {
var form = $("#form");