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/js/base.js | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/js/base.js b/gx_tieta/WebRoot/js/base.js
index 3a8d23d..7ff1c73 100644
--- a/gx_tieta/WebRoot/js/base.js
+++ b/gx_tieta/WebRoot/js/base.js
@@ -412,7 +412,7 @@
//console.info(data);
document.getElementById("FBSDeviceIp").innerHTML=data.FbsDeviceIp; //璁惧Ip
document.getElementById("GroupIndexInFBSDevice").innerHTML=data.GroupIndexInFBSDevice; //Bindex
-
+ document.getElementById("installUser").innerHTML= data.install_user; // 瀹夎浜哄憳
//鏄剧ず鐢垫睜缁勬満鍘嗗崱
$('#card_infor').show();
@@ -424,7 +424,7 @@
//鏍规嵁stationid鏌ヨ鍩虹珯鐨勪俊鎭�
function findStationInfoByStation(temp){
- console.info(JSON.stringify(temp));
+ //console.info(JSON.stringify(temp));
$.ajax({
type:"post",
url: "Battinf_exAction!serchByCondition",
@@ -433,7 +433,7 @@
data:"json="+JSON.stringify(temp),
success: function(data){
var model = eval('('+data.result+')');
- console.log(model);
+ //console.log(model);
if(model.code == 1 && model.data.length>0){
var station = model.data[0];
//console.info(station);
--
Gitblit v1.9.1