|
@@ -72,16 +72,16 @@
|
|
|
this.$set(this.config,'data',[]);
|
|
this.$set(this.config,'data',[]);
|
|
|
dashboardsResearchUsage(this.roomNames).then(res => {
|
|
dashboardsResearchUsage(this.roomNames).then(res => {
|
|
|
let list = []
|
|
let list = []
|
|
|
- for (let i = 0; i < res.data.monthlyUsage.length; i++) {
|
|
|
|
|
|
|
+ for (let i = 0; i < res.data.length; i++) {
|
|
|
let obj = {
|
|
let obj = {
|
|
|
name: res.data[i].roomNumValue,
|
|
name: res.data[i].roomNumValue,
|
|
|
num: res.data[i].usageCount,
|
|
num: res.data[i].usageCount,
|
|
|
- // value: this.accMul(res.data[i].rentingMonthFromYearRate,100).toFixed(0)
|
|
|
|
|
- value: res.data[i].usageRate
|
|
|
|
|
|
|
+ value: this.accMul(res.data[i].usageRate,100).toFixed(0)+'%'
|
|
|
|
|
+ // value: res.data[i].usageRate
|
|
|
}
|
|
}
|
|
|
list.push(obj)
|
|
list.push(obj)
|
|
|
}
|
|
}
|
|
|
- list = this.sortByPercentageDesc(list)
|
|
|
|
|
|
|
+ // list = this.sortByPercentageDesc(list)
|
|
|
let newList = [];
|
|
let newList = [];
|
|
|
for(let i=0;i<list.length;i++){
|
|
for(let i=0;i<list.length;i++){
|
|
|
if(i==0){
|
|
if(i==0){
|