diff --git a/gulpfile.js b/gulpfile.js index d433f04..703f065 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -134,7 +134,8 @@ 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 || 'https://192.168.191.120:8443'; + + var kubeBase = process.env.KUBERNETES_MASTER || 'http://192.168.191.120:8443'; console.log("==== using KUBERNETES URL: " + kubeBase); var kube = uri(urljoin(kubeBase, 'api')); var kubeapis = uri(urljoin(kubeBase, 'apis')); @@ -249,8 +250,8 @@ gulp.task('connect', ['watch'], function() { targetPath: '/hawtio/git' }, { proto: "http", - port: "8080", - hostname: "127.0.0.1", //hostname:"127.0.0.1" + port: "9001", + hostname: "192.168.191.120", //hostname:"127.0.0.1" path: '/java/console/api', targetPath: "/" }]; diff --git a/plugins/system/ts/systemList.ts b/plugins/system/ts/systemList.ts index b4006b0..a176a59 100644 --- a/plugins/system/ts/systemList.ts +++ b/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 = () =>{