From 04bc2d9b97c61ea79017d05f81053e719742f82f Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期三, 19 十二月 2018 15:41:01 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/pages/js/pages/index-common.js | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/gx_tieta/WebRoot/pages/js/pages/index-common.js b/gx_tieta/WebRoot/pages/js/pages/index-common.js
index 6a683c0..abeab81 100644
--- a/gx_tieta/WebRoot/pages/js/pages/index-common.js
+++ b/gx_tieta/WebRoot/pages/js/pages/index-common.js
@@ -7,6 +7,10 @@
name: '鏈烘埧鍋滅數'
,cla: 'repair-pie'
},
+ {
+ name: '鏈烘埧缁埅鑳藉姏'
+ ,cla: 'endur-pie'
+ },
{
name: '鐢垫睜鐘舵��'
,cla: 'brdn-pie'
@@ -18,10 +22,6 @@
{
name: '鍗曚綋瀹归噺鍋ュ悍鐜�'
,cla: 'health-pie'
- },
- {
- name: '鏈烘埧缁埅鑳藉姏'
- ,cla: 'endur-pie'
}
];
@@ -45,10 +45,12 @@
var data = rs.data[0];
var rsStatus = formaterPieStauts(data);
pieItems = getPieList(rsStatus);
+ }else {
+ pieItems = getPieList([1, 1, 1, 1]);
}
}
});
-
+ //console.log(pieItems);
return pieItems;
}
--
Gitblit v1.9.1