|
@@ -115,6 +115,7 @@
|
|
@touchmove="moveLine1" @touchend="touchEndLine1" style="background-color: #FFFFFF;"></canvas>
|
|
@touchmove="moveLine1" @touchend="touchEndLine1" style="background-color: #FFFFFF;"></canvas>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
|
|
+ <view class="line"></view>
|
|
<view class="qiun-columns">
|
|
<view class="qiun-columns">
|
|
<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
|
|
<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
|
|
<view class="qiun-title-dot-light">本周销售情况</view>
|
|
<view class="qiun-title-dot-light">本周销售情况</view>
|
|
@@ -129,6 +130,7 @@
|
|
@touchmove="moveLine2" @touchend="touchEndLine2" style="background-color: #FFFFFF;"></canvas>
|
|
@touchmove="moveLine2" @touchend="touchEndLine2" style="background-color: #FFFFFF;"></canvas>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
|
|
+ <view class="line"></view>
|
|
<view class="qiun-columns">
|
|
<view class="qiun-columns">
|
|
<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
|
|
<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
|
|
<view class="qiun-title-dot-light">本月销售情况</view>
|
|
<view class="qiun-title-dot-light">本月销售情况</view>
|
|
@@ -143,6 +145,7 @@
|
|
@touchmove="moveLine3" @touchend="touchEndLine3" style="background-color: #FFFFFF;"></canvas>
|
|
@touchmove="moveLine3" @touchend="touchEndLine3" style="background-color: #FFFFFF;"></canvas>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
|
|
+ <view class="line"></view>
|
|
<view class="qiun-columns">
|
|
<view class="qiun-columns">
|
|
<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
|
|
<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
|
|
<view class="qiun-title-dot-light">本年销售情况</view>
|
|
<view class="qiun-title-dot-light">本年销售情况</view>
|
|
@@ -228,6 +231,7 @@
|
|
mounted() {
|
|
mounted() {
|
|
console.log("mounted");
|
|
console.log("mounted");
|
|
this.init();
|
|
this.init();
|
|
|
|
+ this.day();
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
...mapActions('chart', ['getStatistics', 'getMainStatistics', 'getMachineNum']),
|
|
...mapActions('chart', ['getStatistics', 'getMainStatistics', 'getMachineNum']),
|
|
@@ -257,11 +261,8 @@
|
|
},
|
|
},
|
|
day(){
|
|
day(){
|
|
var date = new Date();
|
|
var date = new Date();
|
|
- var Y = date.getFullYear() + '年';
|
|
|
|
- var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '月';
|
|
|
|
- var D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + '日';
|
|
|
|
- var today = Y+M+D;
|
|
|
|
- this.today = today;
|
|
|
|
|
|
+ var daystr = dateUtils.formateDate(date, 'yyyy年MM月dd日');
|
|
|
|
+ this.today = daystr;
|
|
var str= '星期'+'日一二三四五六'.charAt(date.getDay());
|
|
var str= '星期'+'日一二三四五六'.charAt(date.getDay());
|
|
this.week = str;
|
|
this.week = str;
|
|
},
|
|
},
|
|
@@ -711,7 +712,7 @@
|
|
|
|
|
|
.qiun-common-mt {
|
|
.qiun-common-mt {
|
|
margin-top: 0upx;
|
|
margin-top: 0upx;
|
|
- height: 200upx;
|
|
|
|
|
|
+ height: 160upx;
|
|
}
|
|
}
|
|
|
|
|
|
.qiun-bg-white {
|
|
.qiun-bg-white {
|
|
@@ -726,11 +727,12 @@
|
|
}
|
|
}
|
|
|
|
|
|
.qiun-title-dot-light {
|
|
.qiun-title-dot-light {
|
|
- border-left: 30upx solid #0ea391;
|
|
|
|
- padding-top: 20upx;
|
|
|
|
- /* border-left: 20upx; */
|
|
|
|
|
|
+ width: 92%;
|
|
|
|
+ border-left: 20upx;
|
|
|
|
+ border-left: 10upx solid #0ea391;
|
|
padding-left: 10upx;
|
|
padding-left: 10upx;
|
|
- height: 85upx;
|
|
|
|
|
|
+ height: 32upx;
|
|
|
|
+ padding-bottom: 40upx;
|
|
font-family: "PingFang-SC-Bold";
|
|
font-family: "PingFang-SC-Bold";
|
|
font-weight: bold;
|
|
font-weight: bold;
|
|
margin: auto;
|
|
margin: auto;
|
|
@@ -745,11 +747,14 @@
|
|
margin: auto;
|
|
margin: auto;
|
|
box-shadow: 0upx 0upx 10upx #D3D3D3;
|
|
box-shadow: 0upx 0upx 10upx #D3D3D3;
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ .line{
|
|
|
|
+ background:#ECECEC ;
|
|
|
|
+ height: 20upx;
|
|
|
|
+ }
|
|
.qiun-charts {
|
|
.qiun-charts {
|
|
width: 690upx;
|
|
width: 690upx;
|
|
height: 370upx;
|
|
height: 370upx;
|
|
- padding-top: 30upx;
|
|
|
|
|
|
+ padding-top: 50upx;
|
|
background-color: #FFFFFF;
|
|
background-color: #FFFFFF;
|
|
margin: auto;
|
|
margin: auto;
|
|
}
|
|
}
|