Merge remote-tracking branch 'origin/master'

# Conflicts:
#	js/lazhang-data.js

js/lazhang-data.js

@@ -89,7 +89,6 @@ function first_success(obj, sta) {
     showChart();
     lazhang.timer = setInterval(request_data_realtime, 1000);
 
-
 }
 function name_Success(obj, sta) {
     var factory = first_parse(this, obj);
@@ -97,9 +96,9 @@ function name_Success(obj, sta) {
     console.log(" factory : ");
     console.log(factory);
 
-    name1=factory.list.flowPlace;
-    name2=factory.list.flowName;
-    document.getElementById("test1").innerHTML = name1;
+    name1=factory.list[0].flowPlace;
+    name2=factory.list[0].flowName;
+    document.getElementById("test1").innerHTML = name1+"-"+name2;
 
 }