Merge remote-tracking branch 'origin/dev' into dev

src/main/resources/static/views/xmlAndSearch/xmlAndSearch.js

@@ -151,15 +151,16 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
                     closeByDocument:false,
                     controller: ['$scope', function ($scope) {
                         $scope.wrongMsg =-1;
-                        $scope.msgText = "上传中，请稍等..."
+                        $scope.msgText = "/////上传中，请稍等.../////"
                         HttpService.uploadPackage(fd,function (data) {
-                            if(data){
-                                $scope.closeThisDialog();
-                                getData();
-                                // MessageService.showAlert("上传成功")
+                            if(angular.equals(data.code,"200")){
+                                // $scope.closeThisDialog();
+                                $scope.msgText = "上传成功！";
                             }else{
-                                $scope.wrongMsg = "上传失败"
+                                $scope.msgText="";
+                                $scope.wrongMsg = data.errMsg;
                             }
+                            getData();//获取导入数据信息
                         })
                     }]
                 });