Browse Source

Merge branch 'master' of http://git.2weisou.com/liumin/NewZkgj

branch0222
douzhuo 1 year ago
parent
commit
cc2c08728c
2 changed files with 12 additions and 4 deletions
  1. +1
    -1
      pages.json
  2. +11
    -3
      pages/reportExcel/weekReport.vue

+ 1
- 1
pages.json View File

@@ -45,7 +45,7 @@
}
],
"subPackages": [{
"root": "pages/login", //登录相关
"root": "pages/login",
"name": "login",
"pages": [{
"path": "index"


+ 11
- 3
pages/reportExcel/weekReport.vue View File

@@ -145,10 +145,10 @@

<view class="tbody-items nums">{{ data.activeCustomer }}</view>
<template v-if="!weekObj.orgCode">
<view class="tbody-items time">{{ data.avgDuration }}m</view>
<view class="tbody-items time">{{ tofixed2(data.avgDuration)}}m</view>
</template>
<template v-else>
<view class="tbody-items time">{{ data.avgDuration/60 }}m</view>
<view class="tbody-items time">{{ tofixed2(data.avgDuration/60) }}m</view>
</template>
<view class="tbody-items percent">{{ data.fraction }}%</view>
<template v-if="!weekObj.orgCode">
@@ -164,6 +164,7 @@
<template v-if="data.fractionContrast">
{{ data.fractionContrast > 0 ? `+${data.fractionContrast}` : data.fractionContrast }}%
</template>
<template v-else>--</template>
</view>
</template>
</view>
@@ -200,7 +201,7 @@
inactive-color="#F2F2F2" :show-percent="false" :percent="percent.value">
</u-line-progress>
</view>
<view class="right"> {{ percent.value || '0' }} %</view>
<view class="right"> {{ percent.value || '0' }}%</view>
</view>
</block>
</view>
@@ -581,6 +582,13 @@
},

methods: {
tofixed2(time){
if(time){
return time.toFixed(2)
}else{
return 0
}
},
forShare() {
this.$u.get("/zkMessage/shareMessage", {
id: this.id


Loading…
Cancel
Save