Commit 0112c97b by 李君

优化

1 parent ac2b5c55
...@@ -79,6 +79,12 @@ ...@@ -79,6 +79,12 @@
},{ },{
value: 15, value: 15,
label: '15min' label: '15min'
},{
value: 30,
label: '30min'
},{
value: 60,
label: '1h'
} }
], ],
mallListForTerm: [], mallListForTerm: [],
......
...@@ -356,6 +356,12 @@ ...@@ -356,6 +356,12 @@
},{ },{
value: 15, value: 15,
label: '15min' label: '15min'
},{
value: 30,
label: '30min'
},{
value: 60,
label: '1h'
} }
], ],
optionTopConfig: { optionTopConfig: {
......
...@@ -204,6 +204,12 @@ ...@@ -204,6 +204,12 @@
},{ },{
value: 15, value: 15,
label: '15min' label: '15min'
},{
value: 30,
label: '30min'
},{
value: 60,
label: '1h'
} }
], ],
counterTypeData:[], counterTypeData:[],
...@@ -409,7 +415,27 @@ ...@@ -409,7 +415,27 @@
} }
}, },
exportFun(){ exportFun(){
let language = localStorage.getItem('lang');
if(language){
var languageObj = {
zh_CN: 'zh_CN',
en_US: 'en_US',
zh_TW: 'zh_TW',
}
language = '/localLanguage=' + languageObj[language];
}
let parmas = {
mallId: this.searchForm.mallId,
cashierAreaId: this.searchForm.cashierAreaId,
channelIds: this.searchForm.channelIds.toString(),
counterType: this.searchForm.counterType,
startDate: moment(this.searchForm.countDate[0]).format('YYYY-MM-DD HH:mm:ss'),
endDate:moment(this.searchForm.countDate[1]).format('YYYY-MM-DD HH:mm:ss'),
granularityMinute:this.searchForm.granularityMinute,
}
let Url = window._vionConfig.queuingUrl + '/d-cashier-channel-minute-count-data/page/export?'
let dowloadUrl = Url + language + `&granularityMinute=${parmas.granularityMinute}&counterType=${parmas.counterType}&mallId=${parmas.mallId}&startDate=${parmas.startDate}&endDate=${parmas.endDate}&cashierAreaIdcashierAreaId=${parmas.cashierAreaId}&channelIds=${parmas.channelIds}&authorization=${this.$cookie.get("atoken")}`;
window.open(dowloadUrl)
} }
} }
} }
......
...@@ -834,7 +834,7 @@ export default { ...@@ -834,7 +834,7 @@ export default {
vertical-align: middle; vertical-align: middle;
} }
.el-select{ .el-select{
width: 150px !important; width: 180px !important;
} }
} }
/deep/tr.current-row{ /deep/tr.current-row{
......
...@@ -111,6 +111,12 @@ ...@@ -111,6 +111,12 @@
},{ },{
value: 15, value: 15,
label: '15min' label: '15min'
},{
value: 30,
label: '30min'
},{
value: 60,
label: '1h'
} }
], ],
mallListForTerm: [], mallListForTerm: [],
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!