fix: 统计分析自测问题修复。
This commit is contained in:
tianyongbao
@@ -1,131 +1,135 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<div class="search-con">
|
||||
<div class="title">查询条件</div>
|
||||
<el-form :model="queryParams" ref="queryRef" :inline="true" :rules="rules" label-width="100px">
|
||||
<el-form-item label="POS机" style="width: 500px;" prop="id">
|
||||
<el-select v-model="queryParams.id" placeholder="请选择POS机" clearable>
|
||||
<el-option v-for="pos in posMachineList" :key="pos.id" :label="pos.nameMerchantName" :value="pos.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="type">
|
||||
<el-select v-model="queryParams.type" @change="handleTimeChange" placeholder="请选择日期">
|
||||
<el-option v-for="item in dates" :key="item.value" :label="item.label" :value="item.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="time" v-if="queryParams.type === 1">
|
||||
<el-date-picker
|
||||
v-model="queryParams.time"
|
||||
type="daterange"
|
||||
range-separator="~"
|
||||
start-placeholder="开始时间"
|
||||
end-placeholder="结束时间"
|
||||
format="YYYY-MM-DD"
|
||||
@calendar-change="calendarChange"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="time" v-if="queryParams.type === 2">
|
||||
<el-date-picker
|
||||
v-model="queryParams.time"
|
||||
type="monthrange"
|
||||
range-separator="~"
|
||||
format="YYYY-MM"
|
||||
start-placeholder="开始时间"
|
||||
end-placeholder="结束时间"
|
||||
:disabled-date="disabledDateFun"
|
||||
@calendar-change="calendarChange"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="time" v-if="queryParams.type === 3">
|
||||
<yearPicker
|
||||
v-model="queryParams.time"
|
||||
ref="statisticPicker"
|
||||
labelText="选择年份"
|
||||
:initYear="dateValue"
|
||||
:showYear="showYearValue"
|
||||
:maxLength="5"
|
||||
sp="~"
|
||||
@updateTimeRange="updateStatisticYear"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div class="search-btn-con">
|
||||
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
||||
<el-button type="info" icon="Refresh" @click="resetQuery">重置</el-button>
|
||||
<div class="search-con">
|
||||
<div class="title">查询条件</div>
|
||||
<el-form :model="queryParams" ref="queryRef" :inline="true" :rules="rules" label-width="100px">
|
||||
<el-form-item label="POS机" style="width: 500px" prop="id">
|
||||
<el-select v-model="queryParams.id" placeholder="请选择POS机" clearable>
|
||||
<el-option v-for="pos in posMachineList" :key="pos.id" :label="pos.nameMerchantName" :value="pos.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="type">
|
||||
<el-select v-model="queryParams.type" @change="handleTimeChange" placeholder="请选择日期">
|
||||
<el-option v-for="item in dates" :key="item.value" :label="item.label" :value="item.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="time" v-if="queryParams.type === 1">
|
||||
<el-date-picker
|
||||
v-model="queryParams.time"
|
||||
type="daterange"
|
||||
range-separator="~"
|
||||
start-placeholder="开始时间"
|
||||
end-placeholder="结束时间"
|
||||
format="YYYY-MM-DD"
|
||||
@calendar-change="calendarChange"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="time" v-if="queryParams.type === 2">
|
||||
<el-date-picker
|
||||
v-model="queryParams.time"
|
||||
type="monthrange"
|
||||
range-separator="~"
|
||||
format="YYYY-MM"
|
||||
start-placeholder="开始时间"
|
||||
end-placeholder="结束时间"
|
||||
:disabled-date="disabledDateFun"
|
||||
@calendar-change="calendarChange"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="time" v-if="queryParams.type === 3">
|
||||
<yearPicker
|
||||
v-model="queryParams.time"
|
||||
ref="statisticPicker"
|
||||
labelText="选择年份"
|
||||
:initYear="dateValue"
|
||||
:showYear="showYearValue"
|
||||
:maxLength="5"
|
||||
sp="~"
|
||||
@updateTimeRange="updateStatisticYear"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div class="search-btn-con">
|
||||
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
||||
<el-button type="info" icon="Refresh" @click="resetQuery">重置</el-button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="main-con" style="height: calc(100% - 1.45rem)">
|
||||
<div class="summary-con">
|
||||
<div class="right-con">
|
||||
<div class="img">
|
||||
<img src="@/assets/images/average.png" alt="" />
|
||||
</div>
|
||||
<div class="item-wrap">
|
||||
<div class="title">刷卡金额</div>
|
||||
<div>
|
||||
<span class="num">{{ pos.amount }}</span> <span class="unit"></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="main-con" style="height: calc(100% - 1.45rem)">
|
||||
<div class="summary-con" >
|
||||
|
||||
<div class="right-con">
|
||||
<div class="img">
|
||||
<img src="@/assets/images/average.png" alt="" />
|
||||
</div>
|
||||
<div class="item-wrap">
|
||||
<div class="title">刷卡金额</div>
|
||||
<div>
|
||||
<span class="num">{{ pos.amount }}</span> <span class="unit"></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="right-con">
|
||||
<div class="img">
|
||||
<img src="@/assets/images/average.png" alt="" />
|
||||
</div>
|
||||
<div class="item-wrap">
|
||||
<div class="title">刷卡手续费</div>
|
||||
<div>
|
||||
<span class="num">{{ pos.commission }}</span> <span class="unit"></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="right-con">
|
||||
<div class="img">
|
||||
<img src="@/assets/images/average.png" alt="" />
|
||||
</div>
|
||||
<div class="item-wrap">
|
||||
<div class="title">入账金额</div>
|
||||
<div>
|
||||
<span class="num">{{ pos.actualAmount }}</span> <span class="unit"></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="right-con">
|
||||
<div class="img">
|
||||
<img src="@/assets/images/average.png" alt="" />
|
||||
</div>
|
||||
<div class="item-wrap">
|
||||
<div class="title">刷卡次数</div>
|
||||
<div>
|
||||
<span class="num">{{ pos.count }}</span> <span class="unit">次</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="right-con">
|
||||
<div class="img">
|
||||
<img src="@/assets/images/average.png" alt="" />
|
||||
</div>
|
||||
<div class="title-con" >
|
||||
<div class="title">POS机刷卡统计</div>
|
||||
<div class="operate-btn-con">
|
||||
<el-radio-group v-model="radioVal" @change="handleRadioChange">
|
||||
<el-radio-button label="柱状图" />
|
||||
<el-radio-button label="折线图" />
|
||||
<el-radio-button label="表格" />
|
||||
</el-radio-group>
|
||||
<div class="item-wrap">
|
||||
<div class="title">刷卡手续费</div>
|
||||
<div>
|
||||
<span class="num">{{ pos.commission }}</span> <span class="unit"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="content-con">
|
||||
<div v-show="radioVal === '柱状图'" class="chart" id="chartBar" style="height: calc(100% - 170px);"></div>
|
||||
<div v-show="radioVal === '折线图'" class="chart" id="chartLine" style="height: calc(100% - 170px);"></div>
|
||||
<el-table v-show="radioVal === '表格'" v-loading="loading" :data="pos.tablePosList" height="calc(100% - 170px)">
|
||||
<el-table-column label="序号" width="50" type="index" align="center">
|
||||
<template #default="scope">
|
||||
<span>{{ scope.$index + 1 }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="刷卡日期" align="center" prop="time" />
|
||||
<el-table-column label="刷卡金额" align="center" prop="value" />
|
||||
</el-table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="right-con">
|
||||
<div class="img">
|
||||
<img src="@/assets/images/average.png" alt="" />
|
||||
</div>
|
||||
<div class="item-wrap">
|
||||
<div class="title">入账金额</div>
|
||||
<div>
|
||||
<span class="num">{{ pos.actualAmount }}</span> <span class="unit"></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="right-con">
|
||||
<div class="img">
|
||||
<img src="@/assets/images/average.png" alt="" />
|
||||
</div>
|
||||
<div class="item-wrap">
|
||||
<div class="title">刷卡次数</div>
|
||||
<div>
|
||||
<span class="num">{{ pos.count }}</span> <span class="unit">次</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="title-con">
|
||||
<div class="title">POS机刷卡统计</div>
|
||||
<div class="operate-btn-con">
|
||||
<el-radio-group v-model="radioVal" @change="handleRadioChange">
|
||||
<el-radio-button label="柱状图" />
|
||||
<el-radio-button label="折线图" />
|
||||
<el-radio-button label="表格" />
|
||||
</el-radio-group>
|
||||
</div>
|
||||
</div>
|
||||
<div class="content-con">
|
||||
<div v-show="radioVal === '柱状图'" class="chart" id="chartBar" style="height: calc(100% - 170px)"></div>
|
||||
<div v-show="radioVal === '折线图'" class="chart" id="chartLine" style="height: calc(100% - 170px)"></div>
|
||||
<el-table v-show="radioVal === '表格'" v-loading="loading" :data="pos.tablePosList" height="calc(100% - 170px)">
|
||||
<el-table-column label="序号" width="50" type="index" align="center">
|
||||
<template #default="scope">
|
||||
<span>{{ scope.$index + 1 }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="刷卡日期" align="center" prop="time" />
|
||||
<el-table-column label="刷卡金额" align="center" prop="value" />
|
||||
<el-table-column prop="detail" label="刷卡明细" v-if="queryParams.type === 1">
|
||||
<template #default="scope">
|
||||
<span v-html="formatMultiLineData(scope.row.detail)"></span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -255,6 +259,12 @@ function getPosMachineList() {
|
||||
})
|
||||
}
|
||||
|
||||
function formatMultiLineData(data) {
|
||||
if (data != null) {
|
||||
return data.replace(/<br\/>/g, '<br/>')
|
||||
}
|
||||
}
|
||||
|
||||
function getList() {
|
||||
loading.value = true
|
||||
chartData.value = { name: [], value1: [] }
|
||||
|
||||
Reference in New Issue
Block a user