|
@@ -1,7 +1,7 @@
|
|
<template>
|
|
<template>
|
|
<view class="page" :style="{'padding-top':mt+'px'}">
|
|
<view class="page" :style="{'padding-top':mt+'px'}">
|
|
<c-nav-bar title="统计" :showIcon="false"></c-nav-bar>
|
|
<c-nav-bar title="统计" :showIcon="false"></c-nav-bar>
|
|
- <view class="hander" @click="show=true">
|
|
|
|
|
|
+ <view class="hander" @click="DateTimes">
|
|
<!-- 2024年1月 -->
|
|
<!-- 2024年1月 -->
|
|
<view
|
|
<view
|
|
class="tn-flex tn-flex-col-center tn-margin-right tn-padding-xs tn-text-sm tn-bg-gray--light tn-radius tn-color-gray--dark"
|
|
class="tn-flex tn-flex-col-center tn-margin-right tn-padding-xs tn-text-sm tn-bg-gray--light tn-radius tn-color-gray--dark"
|
|
@@ -66,7 +66,8 @@
|
|
</view>
|
|
</view>
|
|
<view class="Pie_charts" style="min-height: 580rpx;">
|
|
<view class="Pie_charts" style="min-height: 580rpx;">
|
|
<!-- <PieCharts></PieCharts> -->
|
|
<!-- <PieCharts></PieCharts> -->
|
|
- <qiun-data-charts type="ring" :opts="optsPied" :chartData="chartDataPied" />
|
|
|
|
|
|
+ <qiun-data-charts :canvas2d='true' type="ring" :opts="optsPied" :chartData="chartDataPied" />
|
|
|
|
+
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
<view class="echarts-two">
|
|
<view class="echarts-two">
|
|
@@ -101,9 +102,12 @@
|
|
<!-- <u-calendar :show="show" :mode="range" :closeOnClickOverlay="true" @close="closeDate"
|
|
<!-- <u-calendar :show="show" :mode="range" :closeOnClickOverlay="true" @close="closeDate"
|
|
@confirm="confirm"></u-calendar> -->
|
|
@confirm="confirm"></u-calendar> -->
|
|
|
|
|
|
- <u-calendar class="u-time" confirmDisabledText="确定" :show="show" mode="range" @confirm="confirm"
|
|
|
|
|
|
+
|
|
|
|
+ <u-calendar class="u-time" confirmDisabledText="确定" :show="showTime" mode="range" @confirm="confirm"
|
|
@close="closeDate" :closeOnClickOverlay="true"></u-calendar>
|
|
@close="closeDate" :closeOnClickOverlay="true"></u-calendar>
|
|
|
|
|
|
|
|
+
|
|
|
|
+
|
|
</view>
|
|
</view>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
@@ -238,7 +242,7 @@
|
|
|
|
|
|
|
|
|
|
list: {},
|
|
list: {},
|
|
- show: false,
|
|
|
|
|
|
+ showTime: false,
|
|
dateTime: ''
|
|
dateTime: ''
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -263,20 +267,20 @@
|
|
methods: {
|
|
methods: {
|
|
confirm(e) {
|
|
confirm(e) {
|
|
console.log(e);
|
|
console.log(e);
|
|
- this.show = false
|
|
|
|
|
|
+ this.showTime = false
|
|
this.dateTime = e[0] + '~' + e[e.length - 1]
|
|
this.dateTime = e[0] + '~' + e[e.length - 1]
|
|
-
|
|
|
|
this.fromData.dateDayStart = e[0]
|
|
this.fromData.dateDayStart = e[0]
|
|
this.fromData.dateDayEnd = e[e.length - 1]
|
|
this.fromData.dateDayEnd = e[e.length - 1]
|
|
this.getList()
|
|
this.getList()
|
|
-
|
|
|
|
-
|
|
|
|
},
|
|
},
|
|
closeDate() {
|
|
closeDate() {
|
|
- this.show = false
|
|
|
|
|
|
+ console.log('456789');
|
|
|
|
+ this.showTime = false
|
|
|
|
+ },
|
|
|
|
+ DateTimes() {
|
|
|
|
+ console.log('123456');
|
|
|
|
+ this.showTime = true
|
|
},
|
|
},
|
|
-
|
|
|
|
-
|
|
|
|
|
|
|
|
getDays(day) {
|
|
getDays(day) {
|
|
var today = new Date();
|
|
var today = new Date();
|
|
@@ -427,7 +431,7 @@
|
|
}
|
|
}
|
|
|
|
|
|
.u-popup__content {
|
|
.u-popup__content {
|
|
- z-index: 999 !important;
|
|
|
|
|
|
+ z-index: 99999 !important;
|
|
}
|
|
}
|
|
|
|
|
|
.u-calendar-month__days__day {
|
|
.u-calendar-month__days__day {
|