From b3f62ab5fb6adf03a92f62b42e69ad849f903b45 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 28 十二月 2018 17:08:53 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/batt-approved.html | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-approved.html b/gx_tieta/WebRoot/mobil/batt-approved.html
index bb11edc..e4333e5 100644
--- a/gx_tieta/WebRoot/mobil/batt-approved.html
+++ b/gx_tieta/WebRoot/mobil/batt-approved.html
@@ -188,6 +188,7 @@
,anim: 4
,content: 'iframe/homeinfo1.html'
});
+ layer.full(iframePopup);
// applyendyanshou(arr);
@@ -268,8 +269,8 @@
if(id == number[i].dev_id){
var errorCount = number[i].dev_errcommcount;
var allCount = number[i].dev_commcount+errorCount;
-
- return number[i].dev_commcount;
+ var parcent = (allCount==0?0:errCount/allCount*100)
+ return parcent;
}
}
}
--
Gitblit v1.9.1