Merge branch 'Web_Manager_Develope' of https://git.trustie.net/fhx569287825/aggregation-platform into Web_Manager_Develope

# Conflicts:
#	gulpfile.js

gulpfile.js

@@ -133,7 +133,6 @@ gulp.task('connect', ['watch'], function() {
 
     // lets disable unauthorised TLS issues with kube REST API
     process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
-
     var kubeBase = process.env.KUBERNETES_MASTER || 'http://192.168.191.120:8080';
     console.log("==== using KUBERNETES URL: " + kubeBase);
     var kube = uri(urljoin(kubeBase, 'api'));
@@ -250,7 +249,7 @@ gulp.task('connect', ['watch'], function() {
     }, {
         proto: "http",
         port: "9001",
-        hostname: "192.168.191.1",   //hostname:"127.0.0.1"
+        hostname: "192.168.191.120",   //hostname:"127.0.0.1"
         path: '/java/console/api',
         targetPath: "/"
     }];

plugins/system/ts/systemList.ts

@@ -72,16 +72,17 @@ module System{
               "Content-Type": "application/x-www-form-urlencoded;charset=utf-8"
             }*/
         });
+        
         if(!r.support){
             throw "当前浏览器不支持Resumable.js文件上传";          
         }else{           
             angular.forEach(files, (file) => {
                r.addFile(file);
-            })
+             })
 
             r.on('fileAdded', function(file){               
                 r.upload();
-            });
+             });
 
             r.on('complete', function(){   
                 $('#loadmsg').html("所以文件上传完毕,正在读取文件中的数据,此过程时间可能会较长,请稍等...");               
@@ -103,6 +104,7 @@ module System{
                       dataset: $scope.model
                     }); 
                     Configs.customAlert("提示", "操作成功: 本次合计新增了" + data.area + "个行政区划、" + data.system + "个信息系统,更新了" + data.update + "个信息系统", '',null, 0, "success");
+                   
                   },
                   error: (XMLHttpRequest, textStatus, errorThrown) =>{
                     $("#load").remove();
@@ -133,8 +135,11 @@ module System{
     } 	
 
     //excel下载
-    $scope.downLoadExcelFile = () =>{        
-        Configs.downloadFile($scope, $http, '/java/console/api/fileOperation/file/download');
+    $scope.downLoadExcelFile = () =>{   
+        Configs.downloadFile($scope, $http, '/java/console/api/fileOperation/file/download', () =>{
+             Configs.customAlert("提示","导出成功,文件下载完成",'',null,0,"success");
+        });
+       
     }
 
     $scope.downloadFilePackage = () =>{