From cf762ff3a5b53aba5c44f296926c077e83518967 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.23>
Date: 星期二, 20 十一月 2018 10:03:16 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/pages/js/pages/homeInfo.js | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/pages/js/pages/homeInfo.js b/gx_tieta/WebRoot/pages/js/pages/homeInfo.js
index d6ab551..da07a63 100644
--- a/gx_tieta/WebRoot/pages/js/pages/homeInfo.js
+++ b/gx_tieta/WebRoot/pages/js/pages/homeInfo.js
@@ -37,6 +37,7 @@
// 鏍煎紡鍖栨満鎴夸俊鎭暟鎹�
function formatHomeInfo(data) {
+ //console.log(data);
var groupDefaults = {
homeid: '',
homename: '',
@@ -51,7 +52,8 @@
chargecurr: '',
chargevol: '',
equipeinfo: '',
- person: ''
+ person: '',
+ install_user: ''
};
var homeDefaults = {
@@ -96,10 +98,12 @@
+'锛汭P锛�'+_data.FbsDeviceIp+'锛汢Index锛�'+_data.GroupIndexInFBSDevice;
content.equipeinfo = equipeinfo;
content.person = '';
+ content.install_user = _data.install_user;
tabc.push(tmp);
}
var StationId_ex = data[0].StationId_ex;
+ var install_user = data[0].install_user;
var homeData = data[0].binf_ex;
var tmp = {};
tmp.title = '鍩虹珯淇℃伅';
@@ -158,6 +162,7 @@
content.distance = homeData.upperStationRoute;
content.degree = homeData.upperStationDifficult;
content.repair = homeData.clienteleErrorService;
+ content.install_user = install_user;
// 鏄惁娣诲姞鍩虹珯淇℃伅
if(content.stationid != '0') {
@@ -168,12 +173,16 @@
var tmp = {};
tmp.type = 'env';
tmp.title = '鍩虹珯鐜鐭棰�';
+ tmp.tshow = '';
+ tmp.cshow = '';
tabc.push(tmp);
// 涓婁紶瑙嗛
var tmp = {};
tmp.type = 'upload';
tmp.title = '涓婁紶鐭棰�';
+ tmp.tshow = '';
+ tmp.cshow = '';
tabc.push(tmp);
--
Gitblit v1.9.1