|
|
@@ -19,11 +19,11 @@
|
|
|
<view class="riTitle">
|
|
|
<view style="text-align:left;font-size:28upx;font-family:PingFang-SC-Medium">
|
|
|
<font class="fontLeft" style="color: #596D83;">{{$t('mainStatistics.dayTotalMoney')}}:</font>
|
|
|
- <font style="color: #ED341F;">{{dayTotalMoney}}</font>
|
|
|
+ <font style="color: #ED341F;">{{dayRandomTimes}}</font>
|
|
|
</view>
|
|
|
<view style="text-align:left;font-size:28upx;font-family:PingFang-SC-Medium">
|
|
|
<font class="fontLeft" style="color: #596D83;">{{$t('mainStatistics.dayTotalNum')}}:</font>
|
|
|
- <font style="color: #ED341F;">{{dayTotalNum}}</font>
|
|
|
+ <font style="color: #ED341F;">{{dayRegularTimes}}</font>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -44,11 +44,11 @@
|
|
|
<view class="fourShell">
|
|
|
<view class="one">
|
|
|
<font class="fontLeft" style="color: #596D83;">{{$t('mainStatistics.weekTotalMoney')}}:</font>
|
|
|
- <font style="color: #ED341F;">{{weekTotalMoney}}</font>
|
|
|
+ <font style="color: #ED341F;">{{weekRandomTimes}}</font>
|
|
|
</view>
|
|
|
<view class="two">
|
|
|
<font class="fontLeft" style="color: #596D83;">{{$t('mainStatistics.weekTotalNum')}}:</font>
|
|
|
- <font style="color: #ED341F;">{{weekTotalNum}}</font>
|
|
|
+ <font style="color: #ED341F;">{{weekRegularTimes}}</font>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -60,11 +60,11 @@
|
|
|
<view class="fourShell">
|
|
|
<view class="one">
|
|
|
<font class="fontLeft" style="color: #596D83;">{{$t('mainStatistics.monthTotalMoney')}}:</font>
|
|
|
- <font style="color: #ED341F;">{{monthTotalMoney}}</font>
|
|
|
+ <font style="color: #ED341F;">{{monthRandomTimes}}</font>
|
|
|
</view>
|
|
|
<view class="two">
|
|
|
<font class="fontLeft" style="color: #596D83;">{{$t('mainStatistics.monthTotalNum')}}:</font>
|
|
|
- <font style="color: #ED341F;">{{monthTotalNum}}</font>
|
|
|
+ <font style="color: #ED341F;">{{monthRegularTimes}}</font>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -76,11 +76,11 @@
|
|
|
<view class="fourShell">
|
|
|
<view class="one">
|
|
|
<font class="fontLeft" style="color: #596D83;">{{$t('mainStatistics.yearTotalMoney')}}:</font>
|
|
|
- <font style="color: #ED341F;">{{yearTotalMoney}}</font>
|
|
|
+ <font style="color: #ED341F;">{{yearRandomTimes}}</font>
|
|
|
</view>
|
|
|
<view class="two">
|
|
|
<font class="fontLeft" style="color: #596D83;">{{$t('mainStatistics.yearTotalNum')}}:</font>
|
|
|
- <font style="color: #ED341F;">{{yearTotalNum}}</font>
|
|
|
+ <font style="color: #ED341F;">{{yearRegularTimes}}</font>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -101,7 +101,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="qiun-columns">
|
|
|
+ <!-- <view class="qiun-columns">
|
|
|
<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
|
|
|
<view class="qiun-title-dot-light">
|
|
|
<view class="dis">{{$t('mainStatistics.day')}}</view>
|
|
|
@@ -117,8 +117,8 @@
|
|
|
@touchmove="moveLine1" @touchend="touchEndLine1" style="background-color: #FFFFFF;"></canvas>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="line"></view>
|
|
|
- <view class="qiun-columns">
|
|
|
+ <view class="line"></view> -->
|
|
|
+ <!-- <view class="qiun-columns">
|
|
|
<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
|
|
|
<view class="qiun-title-dot-light">
|
|
|
<view class="dis">{{$t('mainStatistics.week')}}</view>
|
|
|
@@ -134,8 +134,8 @@
|
|
|
@touchmove="moveLine2" @touchend="touchEndLine2" style="background-color: #FFFFFF;"></canvas>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="line"></view>
|
|
|
- <view class="qiun-columns">
|
|
|
+ <view class="line"></view> -->
|
|
|
+<!-- <view class="qiun-columns">
|
|
|
<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
|
|
|
<view class="qiun-title-dot-light">
|
|
|
<view class="dis">{{$t('mainStatistics.month')}}</view>
|
|
|
@@ -151,8 +151,8 @@
|
|
|
@touchmove="moveLine3" @touchend="touchEndLine3" style="background-color: #FFFFFF;"></canvas>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="line"></view>
|
|
|
- <view class="qiun-columns">
|
|
|
+ <view class="line"></view> -->
|
|
|
+<!-- <view class="qiun-columns">
|
|
|
<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
|
|
|
<view class="qiun-title-dot-light">
|
|
|
<view class="dis">{{$t('mainStatistics.year')}}</view>
|
|
|
@@ -167,7 +167,7 @@
|
|
|
<canvas canvas-id="canvaColumn4" id="canvaColumn4" class="charts" disable-scroll=true @touchstart="touchLine4"
|
|
|
@touchmove="moveLine4" @touchend="touchEndLine4" style="background-color: #FFFFFF;"></canvas>
|
|
|
</view>
|
|
|
- </view>
|
|
|
+ </view> -->
|
|
|
</view>
|
|
|
</template>
|
|
|
|
|
|
@@ -183,10 +183,10 @@
|
|
|
} from '@/common/util.js';
|
|
|
|
|
|
var _self;
|
|
|
- var canvaColumn1 = null;
|
|
|
- var canvaColumn2 = null;
|
|
|
- var canvaColumn3 = null;
|
|
|
- var canvaColumn4 = null;
|
|
|
+ // var canvaColumn1 = null;
|
|
|
+ // var canvaColumn2 = null;
|
|
|
+ // var canvaColumn3 = null;
|
|
|
+ // var canvaColumn4 = null;
|
|
|
export default {
|
|
|
name: 'mainStatistics',
|
|
|
props: {
|
|
|
@@ -198,14 +198,14 @@
|
|
|
return {
|
|
|
machineTotalNum: 0,
|
|
|
machineUseNum: 0,
|
|
|
- dayTotalMoney: 0,
|
|
|
- dayTotalNum: 0,
|
|
|
- weekTotalMoney: 0,
|
|
|
- weekTotalNum: 0,
|
|
|
- monthTotalMoney: 0,
|
|
|
- monthTotalNum: 0,
|
|
|
- yearTotalMoney: 0,
|
|
|
- yearTotalNum: 0,
|
|
|
+ dayRandomTimes: 0,
|
|
|
+ dayRegularTimes: 0,
|
|
|
+ weekRandomTimes: 0,
|
|
|
+ weekRegularTimes: 0,
|
|
|
+ monthRandomTimes: 0,
|
|
|
+ monthRegularTimes: 0,
|
|
|
+ yearRandomTimes: 0,
|
|
|
+ yearRegularTimes: 0,
|
|
|
cWidth: '',
|
|
|
cHeight: '',
|
|
|
pixelRatio: 1,
|
|
|
@@ -283,10 +283,10 @@
|
|
|
|
|
|
await this.getMainStatisticsData();
|
|
|
|
|
|
- await this.initDateRang(new Date(), 'day');
|
|
|
- await this.initDateRang(new Date(), 'week');
|
|
|
- await this.initDateRang(new Date(), 'month');
|
|
|
- await this.initDateRang(new Date(), 'year');
|
|
|
+ // await this.initDateRang(new Date(), 'day');
|
|
|
+ // await this.initDateRang(new Date(), 'week');
|
|
|
+ // await this.initDateRang(new Date(), 'month');
|
|
|
+ // await this.initDateRang(new Date(), 'year');
|
|
|
|
|
|
//初次登陆跳转后，把test变成2
|
|
|
uni.setStorageSync('test', '2');
|
|
|
@@ -318,232 +318,232 @@
|
|
|
},
|
|
|
});
|
|
|
},
|
|
|
- initDateRang(day, chartType) {
|
|
|
- const daystr = dateUtils.formateDate(day, 'yyyy/MM/dd');
|
|
|
- if (chartType === 'day') {
|
|
|
- this.startDate1 = dateUtils.formateDate(day, 'yyyy/MM/dd');
|
|
|
- }
|
|
|
- if (chartType === 'week') {
|
|
|
- this.startDate2 = dateUtils.formateDate(dateUtils.getFirstDayOfWeek(day), 'yyyy/MM/dd');
|
|
|
- this.endDate2 = dateUtils.formateDate(dateUtils.getLastDayOfWeek(day), 'yyyy/MM/dd');
|
|
|
- }
|
|
|
- if (chartType === 'month') {
|
|
|
- this.startDate3 = dateUtils.formateDate(dateUtils.getCurrentMonFirstDate(day), 'yyyy/MM/dd');
|
|
|
- this.endDate3 = dateUtils.formateDate(dateUtils.getCurrentMonLastDate(day), 'yyyy/MM/dd');
|
|
|
- }
|
|
|
- if (chartType === 'year') {
|
|
|
- this.startDate4 = dateUtils.formateDate(dateUtils.getCurrentYearFirstDate(day), 'yyyy/MM/dd');
|
|
|
- this.endDate4 = dateUtils.formateDate(dateUtils.getCurrentYearLastDate(day), 'yyyy/MM/dd');
|
|
|
- }
|
|
|
-
|
|
|
- return this.getStatisticsData(chartType);
|
|
|
- },
|
|
|
+ // initDateRang(day, chartType) {
|
|
|
+ // const daystr = dateUtils.formateDate(day, 'yyyy/MM/dd');
|
|
|
+ // if (chartType === 'day') {
|
|
|
+ // this.startDate1 = dateUtils.formateDate(day, 'yyyy/MM/dd');
|
|
|
+ // }
|
|
|
+ // if (chartType === 'week') {
|
|
|
+ // this.startDate2 = dateUtils.formateDate(dateUtils.getFirstDayOfWeek(day), 'yyyy/MM/dd');
|
|
|
+ // this.endDate2 = dateUtils.formateDate(dateUtils.getLastDayOfWeek(day), 'yyyy/MM/dd');
|
|
|
+ // }
|
|
|
+ // if (chartType === 'month') {
|
|
|
+ // this.startDate3 = dateUtils.formateDate(dateUtils.getCurrentMonFirstDate(day), 'yyyy/MM/dd');
|
|
|
+ // this.endDate3 = dateUtils.formateDate(dateUtils.getCurrentMonLastDate(day), 'yyyy/MM/dd');
|
|
|
+ // }
|
|
|
+ // if (chartType === 'year') {
|
|
|
+ // this.startDate4 = dateUtils.formateDate(dateUtils.getCurrentYearFirstDate(day), 'yyyy/MM/dd');
|
|
|
+ // this.endDate4 = dateUtils.formateDate(dateUtils.getCurrentYearLastDate(day), 'yyyy/MM/dd');
|
|
|
+ // }
|
|
|
+
|
|
|
+ // return this.getStatisticsData(chartType);
|
|
|
+ // },
|
|
|
/**上一个 */
|
|
|
- pre(chartType) {
|
|
|
- let day;
|
|
|
- if (chartType === 'day') { // 日
|
|
|
- day = new Date(this.startDate1);
|
|
|
- day.setDate(day.getDate() - 1);
|
|
|
- }
|
|
|
- if (chartType === 'week') { // 周
|
|
|
- day = new Date(this.startDate2);
|
|
|
- day.setDate(day.getDate() - 7);
|
|
|
- }
|
|
|
- if (chartType === 'month') { // 月
|
|
|
- day = new Date(this.startDate3);
|
|
|
- day.setMonth(day.getMonth() - 1);
|
|
|
- }
|
|
|
- if (chartType === 'year') { // 年
|
|
|
- day = new Date(this.startDate4);
|
|
|
- day.setFullYear(day.getFullYear() - 1);
|
|
|
- }
|
|
|
- this.initDateRang(day, chartType);
|
|
|
- },
|
|
|
- /**下一个 */
|
|
|
- next(chartType) {
|
|
|
- let day;
|
|
|
- if (chartType === 'day') { // 日
|
|
|
- day = new Date(this.startDate1);
|
|
|
- day.setDate(day.getDate() + 1);
|
|
|
- }
|
|
|
- if (chartType === 'week') { // 周
|
|
|
- day = new Date(this.startDate2);
|
|
|
- day.setDate(day.getDate() + 7);
|
|
|
- }
|
|
|
- if (chartType === 'month') { // 月
|
|
|
- day = new Date(this.startDate3);
|
|
|
- day.setMonth(day.getMonth() + 1);
|
|
|
- }
|
|
|
- if (chartType === 'year') { // 年
|
|
|
- day = new Date(this.startDate4);
|
|
|
- day.setFullYear(day.getFullYear() + 1);
|
|
|
- }
|
|
|
-
|
|
|
- this.initDateRang(day, chartType);
|
|
|
- },
|
|
|
- getStatisticsData(chartType) {
|
|
|
- const param = {
|
|
|
- 'chartType': chartType
|
|
|
- };
|
|
|
- if (chartType == 'day') {
|
|
|
- param['startDate'] = this.startDate1;
|
|
|
- param['endDate'] = this.startDate1;
|
|
|
- }
|
|
|
- if (chartType == 'week') {
|
|
|
- param['startDate'] = this.startDate2;
|
|
|
- param['endDate'] = this.endDate2;
|
|
|
- }
|
|
|
- if (chartType == 'month') {
|
|
|
- param['startDate'] = this.startDate3;
|
|
|
- param['endDate'] = this.endDate3;
|
|
|
- }
|
|
|
- if (chartType == 'year') {
|
|
|
- param['startDate'] = this.startDate4;
|
|
|
- param['endDate'] = this.endDate4;
|
|
|
- }
|
|
|
- if (this.adminId) { // 子组件，则拿传过来的参
|
|
|
- param['adminId'] = this.adminId;
|
|
|
- } else if ('admin' !== this.loginUser['username']) { //否则为主页，拿登录用户
|
|
|
- param['adminId'] = this.loginUser['id'];
|
|
|
- }
|
|
|
- var globalUser = uni.getStorageSync("globalUser");
|
|
|
- if (globalUser.id != 1) {
|
|
|
- if (param.adminId == null || param.adminId == undefined) {
|
|
|
- param['adminId'] = globalUser.id;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- if (this.equipmentId) {
|
|
|
- param['equipmentId'] = this.equipmentId;
|
|
|
- }
|
|
|
- return this.getStatistics(param)
|
|
|
- .then(data => {
|
|
|
- uni.stopPullDownRefresh();
|
|
|
- if (param['chartType'] == 'day') {
|
|
|
- canvaColumn1 = this.initChart('canvaColumn1', data);
|
|
|
- }
|
|
|
- if (param['chartType'] == 'week') {
|
|
|
- canvaColumn2 = this.initChart('canvaColumn2', data);
|
|
|
- }
|
|
|
- if (param['chartType'] == 'month') {
|
|
|
- canvaColumn3 = this.initChart('canvaColumn3', data);
|
|
|
- }
|
|
|
- if (param['chartType'] == 'year') {
|
|
|
- canvaColumn4 = this.initChart('canvaColumn4', data);
|
|
|
- }
|
|
|
-
|
|
|
- }, _ => {
|
|
|
- uni.stopPullDownRefresh();
|
|
|
- if (param['chartType'] == 'day') {
|
|
|
- canvaColumn1 = this.initChart('canvaColumn1', {
|
|
|
- categories: ['暂无数据'],
|
|
|
- series: [{
|
|
|
- name: '销售个数',
|
|
|
- data: [0]
|
|
|
- }]
|
|
|
- });
|
|
|
- }
|
|
|
- if (param['chartType'] == 'week') {
|
|
|
- canvaColumn2 = this.initChart('canvaColumn2', {
|
|
|
- categories: ['暂无数据'],
|
|
|
- series: [{
|
|
|
- name: '销售个数',
|
|
|
- data: [0]
|
|
|
- }]
|
|
|
- });
|
|
|
- }
|
|
|
- if (param['chartType'] == 'month') {
|
|
|
- canvaColumn3 = this.initChart('canvaColumn3', {
|
|
|
- categories: ['暂无数据'],
|
|
|
- series: [{
|
|
|
- name: '销售个数',
|
|
|
- data: [0]
|
|
|
- }]
|
|
|
- });
|
|
|
- }
|
|
|
- if (param['chartType'] == 'year') {
|
|
|
- canvaColumn4 = this.initChart('canvaColumn4', {
|
|
|
- categories: ['暂无数据'],
|
|
|
- series: [{
|
|
|
- name: '销售个数',
|
|
|
- data: [0]
|
|
|
- }]
|
|
|
- });
|
|
|
- }
|
|
|
- });
|
|
|
- },
|
|
|
- initChart(canvasId, chartData) {
|
|
|
- if (this.$t('lang') != 'zh') {
|
|
|
- chartData.categories = chartData.categories.map(e => {
|
|
|
- if (e.indexOf('点') >= 0) {
|
|
|
- return e.replace('点', this.$t('mainStatistics.oclock'));
|
|
|
- }
|
|
|
- if (e.indexOf('周') >= 0) {
|
|
|
- const weekNum = e.substring(e.length - 1) == '日' ? '0' : e.substring(e.length - 1);
|
|
|
- return this.$t('mainStatistics.week' + weekNum);
|
|
|
- }
|
|
|
- if (e.indexOf('月') >= 0) {
|
|
|
- var res = e.toString();
|
|
|
- if (res.length > 3) {
|
|
|
- return e.replace('月', this.$t('mainStatistics.mon'));
|
|
|
- } else {
|
|
|
- return e.replace('月', this.$t('mainStatistics.y'));
|
|
|
- }
|
|
|
- }
|
|
|
- return e;
|
|
|
- });
|
|
|
-
|
|
|
- chartData.series = chartData.series.map(e => {
|
|
|
- if (e['name'] == '销售个数') {
|
|
|
- e['name'] = this.$t('mainStatistics.saleNum');
|
|
|
- }
|
|
|
- if (e['name'] == '销售额') {
|
|
|
- e['name'] = this.$t('mainStatistics.saleroom');
|
|
|
- }
|
|
|
- return e;
|
|
|
- });
|
|
|
- }
|
|
|
- return new uCharts({
|
|
|
- $this: _self,
|
|
|
- canvasId: canvasId,
|
|
|
- enableScroll: true,
|
|
|
- type: 'column',
|
|
|
- legend: true,
|
|
|
- fontSize: 10,
|
|
|
- background: '#FFFFFF', //y轴颜色
|
|
|
- pixelRatio: 1,
|
|
|
- animation: true,
|
|
|
- categories: chartData.categories,
|
|
|
- series: chartData.series,
|
|
|
- xAxis: {
|
|
|
- type: 'grid',
|
|
|
- gridType: 'dash',
|
|
|
- itemCount: 5, //x轴单屏显示数据的数量，默认为5个
|
|
|
- scrollShow: true, //新增是否显示滚动条，默认false
|
|
|
- scrollAlign: 'left', //滚动条初始位置
|
|
|
- scrollBackgroundColor: '#F7F7FF', //默认为 #EFEBEF 滚动条颜色底色
|
|
|
- scrollColor: '#DEE7F7', //默认为 #A6A6A6 滚动条颜色
|
|
|
- disableGrid: true,
|
|
|
-
|
|
|
- },
|
|
|
- yAxis: {
|
|
|
-
|
|
|
- type: 'grid',
|
|
|
- gridType: 'soild',
|
|
|
- // disabled:true
|
|
|
- // disableGrid:true,
|
|
|
- },
|
|
|
- dataLabel: true,
|
|
|
- width: _self.cWidth * _self.pixelRatio,
|
|
|
- height: _self.cHeight * _self.pixelRatio,
|
|
|
- extra: {
|
|
|
- column: {
|
|
|
- // width: _self.cWidth*_self.pixelRatio*0.45/chartData.categories.length
|
|
|
- width: 18
|
|
|
- }
|
|
|
- }
|
|
|
- });
|
|
|
- },
|
|
|
+ // pre(chartType) {
|
|
|
+ // let day;
|
|
|
+ // if (chartType === 'day') { // 日
|
|
|
+ // day = new Date(this.startDate1);
|
|
|
+ // day.setDate(day.getDate() - 1);
|
|
|
+ // }
|
|
|
+ // if (chartType === 'week') { // 周
|
|
|
+ // day = new Date(this.startDate2);
|
|
|
+ // day.setDate(day.getDate() - 7);
|
|
|
+ // }
|
|
|
+ // if (chartType === 'month') { // 月
|
|
|
+ // day = new Date(this.startDate3);
|
|
|
+ // day.setMonth(day.getMonth() - 1);
|
|
|
+ // }
|
|
|
+ // if (chartType === 'year') { // 年
|
|
|
+ // day = new Date(this.startDate4);
|
|
|
+ // day.setFullYear(day.getFullYear() - 1);
|
|
|
+ // }
|
|
|
+ // this.initDateRang(day, chartType);
|
|
|
+ // },
|
|
|
+ // /**下一个 */
|
|
|
+ // next(chartType) {
|
|
|
+ // let day;
|
|
|
+ // if (chartType === 'day') { // 日
|
|
|
+ // day = new Date(this.startDate1);
|
|
|
+ // day.setDate(day.getDate() + 1);
|
|
|
+ // }
|
|
|
+ // if (chartType === 'week') { // 周
|
|
|
+ // day = new Date(this.startDate2);
|
|
|
+ // day.setDate(day.getDate() + 7);
|
|
|
+ // }
|
|
|
+ // if (chartType === 'month') { // 月
|
|
|
+ // day = new Date(this.startDate3);
|
|
|
+ // day.setMonth(day.getMonth() + 1);
|
|
|
+ // }
|
|
|
+ // if (chartType === 'year') { // 年
|
|
|
+ // day = new Date(this.startDate4);
|
|
|
+ // day.setFullYear(day.getFullYear() + 1);
|
|
|
+ // }
|
|
|
+
|
|
|
+ // this.initDateRang(day, chartType);
|
|
|
+ // },
|
|
|
+ // getStatisticsData(chartType) {
|
|
|
+ // const param = {
|
|
|
+ // 'chartType': chartType
|
|
|
+ // };
|
|
|
+ // if (chartType == 'day') {
|
|
|
+ // param['startDate'] = this.startDate1;
|
|
|
+ // param['endDate'] = this.startDate1;
|
|
|
+ // }
|
|
|
+ // if (chartType == 'week') {
|
|
|
+ // param['startDate'] = this.startDate2;
|
|
|
+ // param['endDate'] = this.endDate2;
|
|
|
+ // }
|
|
|
+ // if (chartType == 'month') {
|
|
|
+ // param['startDate'] = this.startDate3;
|
|
|
+ // param['endDate'] = this.endDate3;
|
|
|
+ // }
|
|
|
+ // if (chartType == 'year') {
|
|
|
+ // param['startDate'] = this.startDate4;
|
|
|
+ // param['endDate'] = this.endDate4;
|
|
|
+ // }
|
|
|
+ // if (this.adminId) { // 子组件，则拿传过来的参
|
|
|
+ // param['adminId'] = this.adminId;
|
|
|
+ // } else if ('admin' !== this.loginUser['username']) { //否则为主页，拿登录用户
|
|
|
+ // param['adminId'] = this.loginUser['id'];
|
|
|
+ // }
|
|
|
+ // var globalUser = uni.getStorageSync("globalUser");
|
|
|
+ // if (globalUser.id != 1) {
|
|
|
+ // if (param.adminId == null || param.adminId == undefined) {
|
|
|
+ // param['adminId'] = globalUser.id;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+
|
|
|
+ // if (this.equipmentId) {
|
|
|
+ // param['equipmentId'] = this.equipmentId;
|
|
|
+ // }
|
|
|
+ // return this.getStatistics(param)
|
|
|
+ // .then(data => {
|
|
|
+ // uni.stopPullDownRefresh();
|
|
|
+ // if (param['chartType'] == 'day') {
|
|
|
+ // canvaColumn1 = this.initChart('canvaColumn1', data);
|
|
|
+ // }
|
|
|
+ // if (param['chartType'] == 'week') {
|
|
|
+ // canvaColumn2 = this.initChart('canvaColumn2', data);
|
|
|
+ // }
|
|
|
+ // if (param['chartType'] == 'month') {
|
|
|
+ // canvaColumn3 = this.initChart('canvaColumn3', data);
|
|
|
+ // }
|
|
|
+ // if (param['chartType'] == 'year') {
|
|
|
+ // canvaColumn4 = this.initChart('canvaColumn4', data);
|
|
|
+ // }
|
|
|
+
|
|
|
+ // }, _ => {
|
|
|
+ // uni.stopPullDownRefresh();
|
|
|
+ // if (param['chartType'] == 'day') {
|
|
|
+ // canvaColumn1 = this.initChart('canvaColumn1', {
|
|
|
+ // categories: ['暂无数据'],
|
|
|
+ // series: [{
|
|
|
+ // name: '销售个数',
|
|
|
+ // data: [0]
|
|
|
+ // }]
|
|
|
+ // });
|
|
|
+ // }
|
|
|
+ // if (param['chartType'] == 'week') {
|
|
|
+ // canvaColumn2 = this.initChart('canvaColumn2', {
|
|
|
+ // categories: ['暂无数据'],
|
|
|
+ // series: [{
|
|
|
+ // name: '销售个数',
|
|
|
+ // data: [0]
|
|
|
+ // }]
|
|
|
+ // });
|
|
|
+ // }
|
|
|
+ // if (param['chartType'] == 'month') {
|
|
|
+ // canvaColumn3 = this.initChart('canvaColumn3', {
|
|
|
+ // categories: ['暂无数据'],
|
|
|
+ // series: [{
|
|
|
+ // name: '销售个数',
|
|
|
+ // data: [0]
|
|
|
+ // }]
|
|
|
+ // });
|
|
|
+ // }
|
|
|
+ // if (param['chartType'] == 'year') {
|
|
|
+ // canvaColumn4 = this.initChart('canvaColumn4', {
|
|
|
+ // categories: ['暂无数据'],
|
|
|
+ // series: [{
|
|
|
+ // name: '销售个数',
|
|
|
+ // data: [0]
|
|
|
+ // }]
|
|
|
+ // });
|
|
|
+ // }
|
|
|
+ // });
|
|
|
+ // },
|
|
|
+ // initChart(canvasId, chartData) {
|
|
|
+ // if (this.$t('lang') != 'zh') {
|
|
|
+ // chartData.categories = chartData.categories.map(e => {
|
|
|
+ // if (e.indexOf('点') >= 0) {
|
|
|
+ // return e.replace('点', this.$t('mainStatistics.oclock'));
|
|
|
+ // }
|
|
|
+ // if (e.indexOf('周') >= 0) {
|
|
|
+ // const weekNum = e.substring(e.length - 1) == '日' ? '0' : e.substring(e.length - 1);
|
|
|
+ // return this.$t('mainStatistics.week' + weekNum);
|
|
|
+ // }
|
|
|
+ // if (e.indexOf('月') >= 0) {
|
|
|
+ // var res = e.toString();
|
|
|
+ // if (res.length > 3) {
|
|
|
+ // return e.replace('月', this.$t('mainStatistics.mon'));
|
|
|
+ // } else {
|
|
|
+ // return e.replace('月', this.$t('mainStatistics.y'));
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // return e;
|
|
|
+ // });
|
|
|
+
|
|
|
+ // chartData.series = chartData.series.map(e => {
|
|
|
+ // if (e['name'] == '销售个数') {
|
|
|
+ // e['name'] = this.$t('mainStatistics.saleNum');
|
|
|
+ // }
|
|
|
+ // if (e['name'] == '销售额') {
|
|
|
+ // e['name'] = this.$t('mainStatistics.saleroom');
|
|
|
+ // }
|
|
|
+ // return e;
|
|
|
+ // });
|
|
|
+ // }
|
|
|
+ // return new uCharts({
|
|
|
+ // $this: _self,
|
|
|
+ // canvasId: canvasId,
|
|
|
+ // enableScroll: true,
|
|
|
+ // type: 'column',
|
|
|
+ // legend: true,
|
|
|
+ // fontSize: 10,
|
|
|
+ // background: '#FFFFFF', //y轴颜色
|
|
|
+ // pixelRatio: 1,
|
|
|
+ // animation: true,
|
|
|
+ // categories: chartData.categories,
|
|
|
+ // series: chartData.series,
|
|
|
+ // xAxis: {
|
|
|
+ // type: 'grid',
|
|
|
+ // gridType: 'dash',
|
|
|
+ // itemCount: 5, //x轴单屏显示数据的数量，默认为5个
|
|
|
+ // scrollShow: true, //新增是否显示滚动条，默认false
|
|
|
+ // scrollAlign: 'left', //滚动条初始位置
|
|
|
+ // scrollBackgroundColor: '#F7F7FF', //默认为 #EFEBEF 滚动条颜色底色
|
|
|
+ // scrollColor: '#DEE7F7', //默认为 #A6A6A6 滚动条颜色
|
|
|
+ // disableGrid: true,
|
|
|
+
|
|
|
+ // },
|
|
|
+ // yAxis: {
|
|
|
+
|
|
|
+ // type: 'grid',
|
|
|
+ // gridType: 'soild',
|
|
|
+ // // disabled:true
|
|
|
+ // // disableGrid:true,
|
|
|
+ // },
|
|
|
+ // dataLabel: true,
|
|
|
+ // width: _self.cWidth * _self.pixelRatio,
|
|
|
+ // height: _self.cHeight * _self.pixelRatio,
|
|
|
+ // extra: {
|
|
|
+ // column: {
|
|
|
+ // // width: _self.cWidth*_self.pixelRatio*0.45/chartData.categories.length
|
|
|
+ // width: 18
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // });
|
|
|
+ // },
|
|
|
getMainStatisticsData() {
|
|
|
const param = {};
|
|
|
if (this.adminId) { // 子组件，则拿传过来的参
|
|
|
@@ -583,110 +583,110 @@
|
|
|
.then(data => {
|
|
|
for (let bean of data) {
|
|
|
if (bean['categorie'] === 'day') {
|
|
|
- this.dayTotalMoney = bean['salePrice'];
|
|
|
- this.dayTotalNum = bean['saleNum'];
|
|
|
+ this.dayRandomTimes = bean['randomTimes'];
|
|
|
+ this.dayRegularTimes = bean['regularTimes'];
|
|
|
}
|
|
|
if (bean['categorie'] === 'week') {
|
|
|
- this.weekTotalMoney = bean['salePrice'];
|
|
|
- this.weekTotalNum = bean['saleNum'];
|
|
|
+ this.weekRandomTimes = bean['randomTimes'];
|
|
|
+ this.weekRegularTimes = bean['regularTimes'];
|
|
|
}
|
|
|
if (bean['categorie'] === 'month') {
|
|
|
- this.monthTotalMoney = bean['salePrice'];
|
|
|
- this.monthTotalNum = bean['saleNum'];
|
|
|
+ this.monthRandomTimes = bean['randomTimes'];
|
|
|
+ this.monthRegularTimes = bean['regularTimes'];
|
|
|
}
|
|
|
if (bean['categorie'] === 'year') {
|
|
|
- this.yearTotalMoney = bean['salePrice'];
|
|
|
- this.yearTotalNum = bean['saleNum'];
|
|
|
+ this.yearRandomTimes = bean['randomTimes'];
|
|
|
+ this.yearRegularTimes = bean['regularTimes'];
|
|
|
}
|
|
|
}
|
|
|
uni.stopPullDownRefresh();
|
|
|
}, _ => void uni.stopPullDownRefresh());
|
|
|
},
|
|
|
|
|
|
- touchLine1(e) {
|
|
|
- if (canvaColumn1) {
|
|
|
- canvaColumn1.scrollStart(e);
|
|
|
- }
|
|
|
- },
|
|
|
- moveLine1(e) {
|
|
|
- if (canvaColumn1) {
|
|
|
- canvaColumn1.scroll(e);
|
|
|
- }
|
|
|
- },
|
|
|
- touchEndLine1(e) {
|
|
|
- if (canvaColumn1) {
|
|
|
- canvaColumn1.scrollEnd(e);
|
|
|
- //下面是toolTip事件，如果滚动后不需要显示，可不填写
|
|
|
- canvaColumn1.showToolTip(e, {
|
|
|
- format: function(item, category) {
|
|
|
- return category + ' ' + item.name + ':' + item.data
|
|
|
- }
|
|
|
- });
|
|
|
- }
|
|
|
- },
|
|
|
- touchLine2(e) {
|
|
|
- if (canvaColumn2) {
|
|
|
- canvaColumn2.scrollStart(e);
|
|
|
- }
|
|
|
- },
|
|
|
- moveLine2(e) {
|
|
|
- if (canvaColumn2) {
|
|
|
- canvaColumn2.scroll(e);
|
|
|
- }
|
|
|
- },
|
|
|
- touchEndLine2(e) {
|
|
|
- if (canvaColumn2) {
|
|
|
- canvaColumn2.scrollEnd(e);
|
|
|
- //下面是toolTip事件，如果滚动后不需要显示，可不填写
|
|
|
- canvaColumn2.showToolTip(e, {
|
|
|
- format: function(item, category) {
|
|
|
- return category + ' ' + item.name + ':' + item.data
|
|
|
- }
|
|
|
- });
|
|
|
- }
|
|
|
- },
|
|
|
- touchLine3(e) {
|
|
|
- if (canvaColumn3) {
|
|
|
- canvaColumn3.scrollStart(e);
|
|
|
- }
|
|
|
- },
|
|
|
- moveLine3(e) {
|
|
|
- if (canvaColumn3) {
|
|
|
- canvaColumn3.scroll(e);
|
|
|
- }
|
|
|
- },
|
|
|
- touchEndLine3(e) {
|
|
|
- if (canvaColumn3) {
|
|
|
- canvaColumn3.scrollEnd(e);
|
|
|
- //下面是toolTip事件，如果滚动后不需要显示，可不填写
|
|
|
- canvaColumn3.showToolTip(e, {
|
|
|
- format: function(item, category) {
|
|
|
- return category + ' ' + item.name + ':' + item.data
|
|
|
- }
|
|
|
- });
|
|
|
- }
|
|
|
- },
|
|
|
- touchLine4(e) {
|
|
|
- if (canvaColumn4) {
|
|
|
- canvaColumn4.scrollStart(e);
|
|
|
- }
|
|
|
- },
|
|
|
- moveLine4(e) {
|
|
|
- if (canvaColumn4) {
|
|
|
- canvaColumn4.scroll(e);
|
|
|
- }
|
|
|
- },
|
|
|
- touchEndLine4(e) {
|
|
|
- if (canvaColumn4) {
|
|
|
- canvaColumn4.scrollEnd(e);
|
|
|
- //下面是toolTip事件，如果滚动后不需要显示，可不填写
|
|
|
- canvaColumn4.showToolTip(e, {
|
|
|
- format: function(item, category) {
|
|
|
- return category + ' ' + item.name + ':' + item.data
|
|
|
- }
|
|
|
- });
|
|
|
- }
|
|
|
- },
|
|
|
+ // touchLine1(e) {
|
|
|
+ // if (canvaColumn1) {
|
|
|
+ // canvaColumn1.scrollStart(e);
|
|
|
+ // }
|
|
|
+ // },
|
|
|
+ // moveLine1(e) {
|
|
|
+ // if (canvaColumn1) {
|
|
|
+ // canvaColumn1.scroll(e);
|
|
|
+ // }
|
|
|
+ // },
|
|
|
+ // touchEndLine1(e) {
|
|
|
+ // if (canvaColumn1) {
|
|
|
+ // canvaColumn1.scrollEnd(e);
|
|
|
+ // //下面是toolTip事件，如果滚动后不需要显示，可不填写
|
|
|
+ // canvaColumn1.showToolTip(e, {
|
|
|
+ // format: function(item, category) {
|
|
|
+ // return category + ' ' + item.name + ':' + item.data
|
|
|
+ // }
|
|
|
+ // });
|
|
|
+ // }
|
|
|
+ // },
|
|
|
+ // touchLine2(e) {
|
|
|
+ // if (canvaColumn2) {
|
|
|
+ // canvaColumn2.scrollStart(e);
|
|
|
+ // }
|
|
|
+ // },
|
|
|
+ // moveLine2(e) {
|
|
|
+ // if (canvaColumn2) {
|
|
|
+ // canvaColumn2.scroll(e);
|
|
|
+ // }
|
|
|
+ // },
|
|
|
+ // touchEndLine2(e) {
|
|
|
+ // if (canvaColumn2) {
|
|
|
+ // canvaColumn2.scrollEnd(e);
|
|
|
+ // //下面是toolTip事件，如果滚动后不需要显示，可不填写
|
|
|
+ // canvaColumn2.showToolTip(e, {
|
|
|
+ // format: function(item, category) {
|
|
|
+ // return category + ' ' + item.name + ':' + item.data
|
|
|
+ // }
|
|
|
+ // });
|
|
|
+ // }
|
|
|
+ // },
|
|
|
+ // touchLine3(e) {
|
|
|
+ // if (canvaColumn3) {
|
|
|
+ // canvaColumn3.scrollStart(e);
|
|
|
+ // }
|
|
|
+ // },
|
|
|
+ // moveLine3(e) {
|
|
|
+ // if (canvaColumn3) {
|
|
|
+ // canvaColumn3.scroll(e);
|
|
|
+ // }
|
|
|
+ // },
|
|
|
+ // touchEndLine3(e) {
|
|
|
+ // if (canvaColumn3) {
|
|
|
+ // canvaColumn3.scrollEnd(e);
|
|
|
+ // //下面是toolTip事件，如果滚动后不需要显示，可不填写
|
|
|
+ // canvaColumn3.showToolTip(e, {
|
|
|
+ // format: function(item, category) {
|
|
|
+ // return category + ' ' + item.name + ':' + item.data
|
|
|
+ // }
|
|
|
+ // });
|
|
|
+ // }
|
|
|
+ // },
|
|
|
+ // touchLine4(e) {
|
|
|
+ // if (canvaColumn4) {
|
|
|
+ // canvaColumn4.scrollStart(e);
|
|
|
+ // }
|
|
|
+ // },
|
|
|
+ // moveLine4(e) {
|
|
|
+ // if (canvaColumn4) {
|
|
|
+ // canvaColumn4.scroll(e);
|
|
|
+ // }
|
|
|
+ // },
|
|
|
+ // touchEndLine4(e) {
|
|
|
+ // if (canvaColumn4) {
|
|
|
+ // canvaColumn4.scrollEnd(e);
|
|
|
+ // //下面是toolTip事件，如果滚动后不需要显示，可不填写
|
|
|
+ // canvaColumn4.showToolTip(e, {
|
|
|
+ // format: function(item, category) {
|
|
|
+ // return category + ' ' + item.name + ':' + item.data
|
|
|
+ // }
|
|
|
+ // });
|
|
|
+ // }
|
|
|
+ // },
|
|
|
}
|
|
|
}
|
|
|
</script>
|
|
|
@@ -806,91 +806,91 @@
|
|
|
flex-direction: row !important;
|
|
|
}
|
|
|
|
|
|
- .qiun-columns {
|
|
|
+/* .qiun-columns {
|
|
|
display: flex;
|
|
|
flex-direction: column !important;
|
|
|
- }
|
|
|
+ } */
|
|
|
|
|
|
- .qiun-common-mt {
|
|
|
+/* .qiun-common-mt {
|
|
|
margin-top: 0upx;
|
|
|
height: 160upx;
|
|
|
}
|
|
|
-
|
|
|
- .qiun-bg-white {
|
|
|
+ */
|
|
|
+/* .qiun-bg-white {
|
|
|
background: #FFFFFF;
|
|
|
- }
|
|
|
+ } */
|
|
|
|
|
|
- .qiun-title-bar {
|
|
|
+/* .qiun-title-bar {
|
|
|
width: 100%;
|
|
|
/* padding: 10upx 2%; */
|
|
|
- flex-wrap: nowrap;
|
|
|
+/* flex-wrap: nowrap;
|
|
|
border-radius: 15upx;
|
|
|
- }
|
|
|
+ } */
|
|
|
|
|
|
- .qiun-title-dot-light {
|
|
|
+/* .qiun-title-dot-light {
|
|
|
width: 92%;
|
|
|
border-left: 20upx;
|
|
|
border-left: 10upx solid #206DC3;
|
|
|
padding-left: 10upx;
|
|
|
height: 32upx;
|
|
|
/* padding-bottom: 40upx; */
|
|
|
- font-family: "PingFang-SC-Bold";
|
|
|
+/* font-family: "PingFang-SC-Bold";
|
|
|
font-weight: bold;
|
|
|
margin: auto;
|
|
|
font-size: 32upx;
|
|
|
color: #363D44;
|
|
|
transform: translateY(20upx);
|
|
|
- }
|
|
|
+ } */
|
|
|
|
|
|
- .dis {
|
|
|
+/* .dis {
|
|
|
transform: translateY(-13upx);
|
|
|
font-size: 32upx;
|
|
|
font-family: "PingFang-SC-Bold";
|
|
|
color: #363D44;
|
|
|
- }
|
|
|
+ } */
|
|
|
|
|
|
- .shijian {
|
|
|
+/* .shijian {
|
|
|
transform: translateY(40upx);
|
|
|
padding-top: 30upx;
|
|
|
height: 80upx;
|
|
|
width: 690upx;
|
|
|
margin: auto;
|
|
|
box-shadow: 0upx 0upx 10upx #D3D3D3;
|
|
|
- }
|
|
|
+ } */
|
|
|
|
|
|
.line {
|
|
|
background: #ECECEC;
|
|
|
height: 20upx;
|
|
|
}
|
|
|
|
|
|
- .qiun-charts {
|
|
|
+/* .qiun-charts {
|
|
|
width: 690upx;
|
|
|
height: 370upx;
|
|
|
padding-top: 50upx;
|
|
|
background-color: #FFFFFF;
|
|
|
margin: auto;
|
|
|
}
|
|
|
-
|
|
|
- .charts {
|
|
|
+ */
|
|
|
+/* .charts {
|
|
|
width: 690upx;
|
|
|
height: 370upx;
|
|
|
background-color: #FFFFFF;
|
|
|
margin: auto;
|
|
|
- }
|
|
|
+ } */
|
|
|
|
|
|
- .preImg {
|
|
|
+/* .preImg {
|
|
|
position: absolute;
|
|
|
left: 30upx;
|
|
|
width: 71upx;
|
|
|
height: 57upx;
|
|
|
}
|
|
|
-
|
|
|
- .nextImg {
|
|
|
+ */
|
|
|
+/* .nextImg {
|
|
|
position: absolute;
|
|
|
right: 30upx;
|
|
|
width: 71upx;
|
|
|
height: 57upx;
|
|
|
- }
|
|
|
+ } */
|
|
|
|
|
|
.fontLeft {
|
|
|
margin-right: 6upx;
|
