From 431cd58c8e8b36fa59beba7aae2700789ae43b43 Mon Sep 17 00:00:00 2001 From: xianfuxing Date: Fri, 19 Jun 2020 16:09:01 +0800 Subject: [PATCH] =?UTF-8?q?#=20=E6=9B=B4=E6=96=B0=E7=94=B5=E9=87=8F?= =?UTF-8?q?=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/counter/api/serializers.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/counter/api/serializers.py b/apps/counter/api/serializers.py index 7ef106c..ba5aae7 100644 --- a/apps/counter/api/serializers.py +++ b/apps/counter/api/serializers.py @@ -56,6 +56,8 @@ class DeviceCountSerializer(serializers.ModelSerializer): return obj.csq def get_energy(self, obj): + if float(obj.vol) <= 100: + return '{}{}'.format(round(float(obj.vol), 1), '%') return get_vol(obj.device_id, obj.vol) def get_calc_time(self, obj): @@ -144,6 +146,8 @@ class DeviceInfoSerializer(serializers.ModelSerializer): def get_energy(self, obj): if self.latest: + if float(self.latest.vol) <= 100: + return '{}{}'.format(round(float(self.latest.vol), 1), '%') return get_vol(obj.device_id, self.latest.vol) return 0