Merge remote-tracking branch 'remotes/origin/master' into hechu1

# Conflicts: # src/gdms/GDMS.java
6 years ago · 2e93831e8a
parent 6d1ee2f0d1
commit 2e93831e8a
1 changed files with 1 additions and 0 deletions
--- a/web/jsFile/home-update.js
+++ b/web/jsFile/home-update.js
@ -6,6 +6,7 @@ function upadateFrame(e) {
  var updateUrl=$(this).attr('href');
  var arr=updateUrl.split('?');
  var proccessIndex=arr[1];
+  alert(proccessIndex);
  var indexData={"index":proccessIndex};
  $('.update-frame').load(updateUrl+' .updated',indexData,function (data) {
  });