task#14504,月总,客户评价率缺少百分号,移动端时效切换折线图数据bugfix,table双loading优化,请求慢时,日期渲染无效日期格式优化
This commit is contained in:
@ -1,45 +0,0 @@
|
||||
<template>
|
||||
<div class="wrap">
|
||||
<el-table :data="tableData"
|
||||
stripe
|
||||
border
|
||||
style="width: 100%"
|
||||
class="custom-table">
|
||||
<el-table-column
|
||||
v-for="(column,i) in tableData"
|
||||
:key="i"
|
||||
:prop="column.prop"
|
||||
:label="column.label"
|
||||
:fixed="i===0"
|
||||
:width="i===0 ? '40' :'80'"
|
||||
align="center"
|
||||
>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: "commonTable",
|
||||
props: ['tableData'],
|
||||
data() {
|
||||
return {}
|
||||
},
|
||||
mounted() {
|
||||
},
|
||||
methods: {}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
@import "@/styles/mixin.scss";
|
||||
::v-deep .el-table thead{
|
||||
font-size: 11px;
|
||||
color: #1D2129;
|
||||
font-weight: bold;
|
||||
}
|
||||
::v-deep .el-table th.el-table__cell.is-leaf {
|
||||
background-color: #E5E6EB;
|
||||
}
|
||||
</style>
|
@ -238,7 +238,7 @@
|
||||
<div v-loading="loadingData" class="contentWrap monthTotal" v-if="[5,6,7,8,9].includes(active)">
|
||||
<div :class="{'comTab':true,'detailTable':isMobile}">
|
||||
<noFit-table :active='active' :is-mobile='isMobile' :table-data="detailList" :label-list="labelList"
|
||||
:loading="loading"></noFit-table>
|
||||
></noFit-table>
|
||||
</div>
|
||||
<!-- <el-pagination
|
||||
small
|
||||
@ -324,7 +324,7 @@ export default {
|
||||
pageSize: 20,
|
||||
total: 0,
|
||||
swithVal: true,
|
||||
supplierId:'',//1128
|
||||
supplierId:1128,
|
||||
selectLoading: false,
|
||||
selectOption: [],
|
||||
driverId:'',//68517
|
||||
@ -398,6 +398,8 @@ export default {
|
||||
console.log("搜索按钮")
|
||||
},
|
||||
async changeHandle() {
|
||||
this.v1=[]
|
||||
this.v2=[]
|
||||
await this.twoTabHanldeData();
|
||||
await this.drawLine();
|
||||
},
|
||||
@ -508,6 +510,7 @@ export default {
|
||||
label: {
|
||||
show: true, // 显示标签
|
||||
position: 'top', // 标签位置在柱形顶部
|
||||
formatter: '{c}%'
|
||||
}
|
||||
},
|
||||
{
|
||||
@ -972,7 +975,7 @@ export default {
|
||||
});
|
||||
this.total = result.total
|
||||
this.detailList = result.data?.map(item => {
|
||||
let formatVal = dayjs(item.createTime).format('DD');
|
||||
let formatVal =item.createTime ? dayjs(item.createTime).format('DD') : '';
|
||||
return {...item, date: formatVal};
|
||||
});
|
||||
this.loading = false
|
||||
@ -1197,11 +1200,13 @@ export default {
|
||||
this.v2.push(item.threeMinutesReceivingRate.replace('%', ''))
|
||||
})
|
||||
} else {
|
||||
console.log(" this.detailList师傅接单时效", this.detailList)
|
||||
this.detailList?.map(item => {
|
||||
this.v1.push(item.arriving)
|
||||
this.v2.push(item.polymerizationSuccessArriving)
|
||||
this.v3.push(item.fortyMinutesArrivalRate.replace('%', ''))
|
||||
})
|
||||
console.log("this.v1",this.v1,this.v2,this.v3)
|
||||
}
|
||||
this.detailList?.map((item,index) => {
|
||||
const columnObj = {}
|
||||
@ -1221,7 +1226,7 @@ export default {
|
||||
if (this.swithVal) {
|
||||
this.detailList?.map(item => {
|
||||
this.v3.push(item.trailArriving)
|
||||
this.v4.push(item.trailPolymerizationSuccessArriving)
|
||||
this.v4.push(item.trailPolymerizationSuccessArsriving)
|
||||
this.v5.push(item.trailFortyMinutesArrivalRate ? item.trailFortyMinutesArrivalRate.replace('%', '') : item.trailFortyMinutesArrivalRate)
|
||||
})
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user