From ff4bdf027f3a5ea1935b84359b8e5886c05c5b03 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Sat, 8 Feb 2025 10:53:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20equip=5Flast=5Fmlog=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/wpm/datax.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/apps/wpm/datax.py b/apps/wpm/datax.py index 48f37bf6..96628cde 100644 --- a/apps/wpm/datax.py +++ b/apps/wpm/datax.py @@ -18,7 +18,7 @@ def tran_time_to_mstate(mstate_json, reminder_interval_list, work_start_time: da xval += val if work_start_time + timedelta(minutes=xval) > now: return mstate_json[ind]['name'] - return '未运行' + return '运行' class AnaViewSet(GenericViewSet): perms_map = {} @@ -30,9 +30,9 @@ class AnaViewSet(GenericViewSet): """ data = request.data now = timezone.now() - mgroup: Mgroup = Mgroup.objects.get(name=data['mgroup_name']) + mgroup: Mgroup = Mgroup.objects.get(id=data['mgroup']) # 子状态 - mstate_json = mgroup.process.mstate_json + mstate_json = mgroup.process.mstate_json if mgroup.process.mstate_json else [] # 生产设备 equip_qs = Equipment.objects.filter(mgroup=mgroup, type = 10) equip_qs_v = equip_qs.values('id', 'name', 'number', 'state').order_by('number') @@ -51,6 +51,7 @@ class AnaViewSet(GenericViewSet): 冷却 = 0 未运行 = 0 故障 = 0 + 运行 = 0 now = timezone.now() for item in equip_qs_l: item['mstate'] = '未运行' @@ -69,11 +70,13 @@ class AnaViewSet(GenericViewSet): 保温 += 1 elif item['mstate'] == '冷却': 冷却 += 1 + elif item['mstate'] == '运行': + 运行 += 1 elif item['mstate'] == '未运行': 未运行 += 1 elif item['mstate'] == '故障': 故障 += 1 - ret = {"保温": 保温, "冷却": 冷却, "未运行": 未运行, "故障": 故障} + ret = {"保温": 保温, "冷却": 冷却, "未运行": 未运行, "故障": 故障, "运行": 运行} ret['mstate_json'] = mstate_json ret['now'] = timezone.localtime(now).strftime('%Y-%m-%d %H:%M:%S') ret["rows"] = equip_qs_l