p01469285
/
aggregation-platform
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

# Conflicts:
#	gulpfile.js
This commit is contained in:
ladventure 2017-12-20 15:17:19 +08:00
parent 3c3532b4c5 b075866072
commit c276f69de4
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gulpfile.js
View File

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

11
plugins/system/ts/systemList.ts
View File

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