Merge branch 'master' of http://git_xt.git.topm.win:8080/wenhongquan/VisualInspection

# Conflicts:
#	VisualInspection/js/config.js

VisualInspection/js/config.js

@@ -1,6 +1,17 @@
 // var base_ui_url = "http://10.112.0.236:8088/";
 // var base_server_url = "http://10.112.0.236:8089/";
-var base_image_server_url = "http://localhost:8080/";//系统登录会自动重置
+var base_image_server_url = getCurrentaddr();
 
-var base_ui_url = "http://localhost:8081/";//系统登录会自动重置
-var base_server_url = "http://localhost:8089/";//系统登录会自动重置
+var base_ui_url = getCurrentaddr();
+var base_server_url = getserveraddr();
+
+function getCurrentaddr(){
+    return "http://"+window.location.host
+}
+function getserveraddr(){
+    if(base_ui_url.indexOf("topm.win")!=-1){
+        return "http://server_yanhai.git.topm.win:8080/";
+    }else{
+        return "http://10.112.0.199:8089/"
+    }
+}