kubbo/dvcp_v2_wxcp_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

开始日期可以等于结束日期

Browse Source
This commit is contained in:
shijingjing
2022-07-26 13:48:13 +08:00
parent dc9f38a5a5
commit 75403a1057
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue
View File

@@ -150,8 +150,8 @@ export default {
let endTmp = this.end.split("-");
let stT = new Date(startTmp[0], startTmp[1], startTmp[2]);
let edT = new Date(endTmp[0], endTmp[1], endTmp[2]);
if (stT.getTime() >= edT.getTime()) {
this.$u.toast("开始日期不能大于或等于结束日期！");
if (stT.getTime() > edT.getTime()) {
this.$u.toast("开始日期不能大于结束日期！");
this.filterShow = true
return
}

11
src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue
View File

@@ -310,8 +310,8 @@ export default {
let endTmp = this.end.split("-");
let stT = new Date(startTmp[0], startTmp[1], startTmp[2]);
let edT = new Date(endTmp[0], endTmp[1], endTmp[2]);
if (stT.getTime() >= edT.getTime()) {
this.$u.toast("开始日期不能大于或等于结束日期！");
if (stT.getTime() > edT.getTime()) {
this.$u.toast("开始日期不能大于结束日期！");
this.customShow = true
return
}
@@ -571,18 +571,13 @@ export default {
items.push(i)
yData.push(item.taskCount)
})
console.log('111');
this.initOpenData({canvas:true})
console.log('222');
setTimeout(() => {
this.transCanvas(items).then((data) => {
console.log("333");
data.items.map((a) => {
xData.push(a.data)
console.log( xData)
})
console.log('4444');
this.getColumnarEcharts(xData, yData)
})
},600)