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

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

@@ -50,17 +50,30 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
         $scope.uploadExcel = function () {
             var fd = new FormData();
             var files = document.querySelector('input#id_file_photo_for_check').files;
-            if(angular.isUndefined(files)){
+            if(files.length==0){
                 MessageService.showAlert("请选择上传的文件...")
             }else{
                 for(var i in files){
                     fd.append('file', files[i]);
                 }
-                HttpService.uploadExcelFile($("#datepicker1").val(),$("#datepicker2").val(),fd,function (data) {
-                    if(data){
-                        MessageService.showAlert("上传成功")
-                    }
-                })
+                var getData = $scope.getPostPackage;
+                ngDialog.openConfirm({
+                    template: 'dialogs/alert.html' + urlTimeStamp(),
+                    width: 600,
+                    cache: false,
+                    closeByDocument:false,
+                    controller: ['$scope', function ($scope) {
+                        $scope.msgText = "解析中..."
+                        HttpService.uploadExcelFile($("#datepicker1").val(),$("#datepicker2").val(),fd,function (data) {
+                            if(data){
+                                $scope.closeThisDialog();
+                                getData();
+                                MessageService.showAlert("上传成功")
+                            }
+                        })
+                    }]
+                });
+
             }
         }
 

src/main/resources/static/views/task/taskListEwriting.html

@@ -92,9 +92,6 @@
                                    </tbody>
                                </table>
                          </td>
-                         <td></td>
-                         <td></td>
-                         <td></td>
                      </tr>
                      </tbody>
                 </table>
@@ -178,9 +175,6 @@
                                      </tbody>
                                  </table>
                              </td>
-                             <td></td>
-                             <td></td>
-                             <td></td>
                          </tr>
                          </tbody>
                     </table>

src/main/resources/static/views/task/taskListPreLocating.html

@@ -89,9 +89,6 @@
                                 </tbody>
                             </table>
                         </td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
                     </tr>
                     </tbody>
             </table>
@@ -170,9 +167,6 @@
                                         </tbody>
                                     </table>
                                 </td>
-                                <td></td>
-                                <td></td>
-                                <td></td>
                             </tr>
                             </tbody>
                     </table>

src/main/resources/static/views/task/taskListPrint.html

@@ -90,9 +90,6 @@
                               </tbody>
                           </table>
                       </td>
-                      <td></td>
-                      <td></td>
-                      <td></td>
                   </tr>
                   </tbody>
                 </table>
@@ -179,9 +176,6 @@
                                   </tbody>
                               </table>
                           </td>
-                          <td></td>
-                          <td></td>
-                          <td></td>
                       </tr>
                       </tbody>
                     </table>

src/main/resources/static/views/task/taskListPushing.html

@@ -89,9 +89,6 @@
                                   </tbody>
                               </table>
                           </td>
-                          <td></td>
-                          <td></td>
-                          <td></td>
                       </tr>
                       </tbody>
                 </table>

src/main/resources/static/views/task/taskListSorting.html

@@ -94,9 +94,6 @@
                                   </tbody>
                               </table>
                           </td>
-                          <td></td>
-                          <td></td>
-                          <td></td>
                       </tr>
                   </tbody>
                 </table>

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

@@ -60,18 +60,31 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
         $scope.uploadXml = function () {
             var fd = new FormData();
             var files = document.querySelector('input#id_file_photo_for_check').files;
-            if(angular.isUndefined(files)){
+            if(files.length==0){
                 MessageService.showAlert("请选择上传的文件...")
             }else{
                 for(var i in files){
                     fd.append('file', files[i]);
                 }
-                HttpService.uploadPackage(fd,function (data) {
-                    if(data){
-                        MessageService.showAlert("上传成功")
-                        $scope.getXmlPackage();
-                    }
-                })
+                var getData =  $scope.getXmlPackage;
+                ngDialog.openConfirm({
+                    template: 'dialogs/alert.html' + urlTimeStamp(),
+                    width: 600,
+                    cache: false,
+                    closeByDocument:false,
+                    controller: ['$scope', function ($scope) {
+                        $scope.msgText = "解析中..."
+                        HttpService.uploadPackage(fd,function (data) {
+                            if(data){
+                                $scope.closeThisDialog();
+                                getData();
+                                MessageService.showAlert("上传成功")
+                            }
+                        })
+                    }]
+                });
+
+
             }
         }