From 745f15410ad87c6b42a79c8bf27dde901500a6bd Mon Sep 17 00:00:00 2001
From: corala <18339694416@163.com>
Date: Tue, 22 Nov 2022 10:57:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=A8=E6=8A=A5=E6=95=B0=E6=8D=AE=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                       |  2 +-
 pages/reportExcel/weekReport.vue | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pages.json b/pages.json
index 4e40796..c655341 100644
--- a/pages.json
+++ b/pages.json
@@ -45,7 +45,7 @@
 		}
 	],
 	"subPackages": [{
-			"root": "pages/login", //登录相关
+			"root": "pages/login",
 			"name": "login",
 			"pages": [{
 					"path": "index"
diff --git a/pages/reportExcel/weekReport.vue b/pages/reportExcel/weekReport.vue
index 0fc74a1..13bdfc9 100644
--- a/pages/reportExcel/weekReport.vue
+++ b/pages/reportExcel/weekReport.vue
@@ -145,15 +145,16 @@
 
 									<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">
 										<view class="tbody-items week" :class="{up: data.pk > 0, down: data.pk < 0}">
 											<template v-if="data.pk">
+												111
 												{{ data.pk > 0 ? `+${data.pk}` : data.pk }}%
 											</template>
 										</view>
@@ -164,6 +165,7 @@
 											<template v-if="data.fractionContrast">
 												{{ data.fractionContrast > 0 ? `+${data.fractionContrast}` : data.fractionContrast }}%
 											</template>
+											<template v-else>--</template>
 										</view>
 									</template>
 								</view>
@@ -581,6 +583,13 @@
 		},
 
 		methods: {
+			tofixed2(time){
+				if(time){
+					return time.toFixed(2)
+				}else{
+					return 0
+				}
+			},
 			forShare() {
 				this.$u.get("/zkMessage/shareMessage", {
 					id: this.id