diff --git a/WebRoot/WEB-INF/classes/log4j.properties b/WebRoot/WEB-INF/classes/log4j.properties index 0b1e065..ea19663 100644 --- a/WebRoot/WEB-INF/classes/log4j.properties +++ b/WebRoot/WEB-INF/classes/log4j.properties @@ -5,7 +5,7 @@ log4j.appender.stdout.layout.ConversionPattern=%n%-d{yyyy-MM-dd HH:mm:ss}%n[%p]- # Output to the File log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.File=./zhongchou.log +log4j.appender.file.File=./jinshan.log log4j.appender.file.layout=org.apache.log4j.PatternLayout log4j.appender.file.layout.ConversionPattern=%n%-d{yyyy-MM-dd HH:mm:ss}%n[%p]-[Thread: %t]-[%C.%M()]: %m%n diff --git a/WebRoot/html/report.html b/WebRoot/html/report.html index 0608cad..1b6bb1e 100644 --- a/WebRoot/html/report.html +++ b/WebRoot/html/report.html @@ -1,45 +1,17 @@ - + - + -
+ aa{{report}} -
- -
- -
- -
- -
- -
- -
- -
- -
- Remember me - -
- -
- - - + + \ No newline at end of file diff --git a/WebRoot/html/reportList.html b/WebRoot/html/reportList.html index c2b2d34..1a67795 100644 --- a/WebRoot/html/reportList.html +++ b/WebRoot/html/reportList.html @@ -8,24 +8,25 @@ - + +
-

       安全检查信息列表

- -
- - - -
+
+ + + +
- - + + \ No newline at end of file diff --git a/WebRoot/js/app/ReportApp.js b/WebRoot/js/app/ReportApp.js index 2d569ad..215dd0e 100644 --- a/WebRoot/js/app/ReportApp.js +++ b/WebRoot/js/app/ReportApp.js @@ -1 +1 @@ -var app = angular.module("LoginApp", []); \ No newline at end of file +var app = angular.module("ReportApp", []); \ No newline at end of file diff --git a/WebRoot/js/controller/ReportController.js b/WebRoot/js/controller/ReportController.js index 02bfd2b..0d31f54 100644 --- a/WebRoot/js/controller/ReportController.js +++ b/WebRoot/js/controller/ReportController.js @@ -1,13 +1,11 @@ -app.controller("ReportListController", function($scope, $http) { - $http.get("http://localhost/summaryPlan/reportList").success( - function(response) { - if (response.status == "SUCCESS") { - - $scope.reportList = response.data; - - } - else{ -// $http.get("http://localhost/summaryPlan/reportlist"); - } - }); +app.controller("ReportController", function($scope, $http, $rootScope) { + + var report_id = $rootScope.root_report_id; + + alert(report_id); + +// $http.get("/report/query?report_id=" + 1) +// .success(function(response) { +// $scope.report = response; +// }); }); \ No newline at end of file diff --git a/WebRoot/js/controller/ReportListController.js b/WebRoot/js/controller/ReportListController.js index 2b314c0..b86a826 100644 --- a/WebRoot/js/controller/ReportListController.js +++ b/WebRoot/js/controller/ReportListController.js @@ -1,7 +1,16 @@ -app.controller("ReportListController", function($scope, $http) { - $http.get("http://localhost/report/reportList").success(function(response) { +app.controller("ReportListController", function($scope, $http, $rootScope) { + $http.get("/report/reportList").success(function(response) { $scope.reportList = response.reportList; }); + + $scope.goToReport = function(report_id) { + + alert(report_id); + + $rootScope.root_report_id = report_id; + + } + }); \ No newline at end of file diff --git a/jinshan.log b/jinshan.log new file mode 100644 index 0000000..5c69097 --- /dev/null +++ b/jinshan.log @@ -0,0 +1,60 @@ + +2015-11-25 22:27:16 +[WARN]-[Thread: qtp1549409129-26]-[com.jfinal.core.ActionException.()]: Can not parse the parameter "undefined" to Integer value. + +2015-11-25 22:27:16 +[WARN]-[Thread: qtp1549409129-26]-[com.jfinal.core.ActionHandler.handle()]: 404 Not Found: /report/query?report_id=undefined + +2015-11-25 22:29:18 +[WARN]-[Thread: qtp1549409129-26]-[com.jfinal.core.ActionException.()]: Can not parse the parameter "undefined" to Integer value. + +2015-11-25 22:29:18 +[WARN]-[Thread: qtp1549409129-26]-[com.jfinal.core.ActionHandler.handle()]: 404 Not Found: /report/query?report_id=undefined + +2015-11-25 22:29:46 +[WARN]-[Thread: qtp1549409129-24]-[com.jfinal.core.ActionException.()]: Can not parse the parameter "undefined" to Integer value. + +2015-11-25 22:29:46 +[WARN]-[Thread: qtp1549409129-24]-[com.jfinal.core.ActionHandler.handle()]: 404 Not Found: /report/query?report_id=undefined + +2015-11-25 22:29:51 +[WARN]-[Thread: qtp1549409129-29]-[com.jfinal.core.ActionException.()]: Can not parse the parameter "undefined" to Integer value. + +2015-11-25 22:29:51 +[WARN]-[Thread: qtp1549409129-29]-[com.jfinal.core.ActionHandler.handle()]: 404 Not Found: /report/query?report_id=undefined + +2015-11-25 22:30:45 +[WARN]-[Thread: qtp1549409129-26]-[com.jfinal.core.ActionException.()]: Can not parse the parameter "undefined" to Integer value. + +2015-11-25 22:30:45 +[WARN]-[Thread: qtp1549409129-26]-[com.jfinal.core.ActionHandler.handle()]: 404 Not Found: /report/query?report_id=undefined + +2015-11-25 22:30:48 +[WARN]-[Thread: qtp1549409129-29]-[com.jfinal.core.ActionException.()]: Can not parse the parameter "undefined" to Integer value. + +2015-11-25 22:30:48 +[WARN]-[Thread: qtp1549409129-29]-[com.jfinal.core.ActionHandler.handle()]: 404 Not Found: /report/query?report_id=undefined + +2015-11-25 22:30:53 +[WARN]-[Thread: qtp1549409129-28]-[com.jfinal.core.ActionException.()]: Can not parse the parameter "undefined" to Integer value. + +2015-11-25 22:30:53 +[WARN]-[Thread: qtp1549409129-28]-[com.jfinal.core.ActionHandler.handle()]: 404 Not Found: /report/query?report_id=undefined + +2015-11-25 22:30:59 +[WARN]-[Thread: qtp1549409129-29]-[com.jfinal.core.ActionException.()]: Can not parse the parameter "undefined" to Integer value. + +2015-11-25 22:30:59 +[WARN]-[Thread: qtp1549409129-29]-[com.jfinal.core.ActionHandler.handle()]: 404 Not Found: /report/query?report_id=undefined + +2015-11-25 22:33:58 +[WARN]-[Thread: qtp1549409129-24]-[com.jfinal.core.ActionException.()]: Can not parse the parameter "undefined" to Integer value. + +2015-11-25 22:33:58 +[WARN]-[Thread: qtp1549409129-24]-[com.jfinal.core.ActionHandler.handle()]: 404 Not Found: /report/query?report_id=undefined + +2015-11-25 22:34:05 +[WARN]-[Thread: qtp1549409129-28]-[com.jfinal.core.ActionException.()]: Can not parse the parameter "undefined" to Integer value. + +2015-11-25 22:34:05 +[WARN]-[Thread: qtp1549409129-28]-[com.jfinal.core.ActionHandler.handle()]: 404 Not Found: /report/query?report_id=undefined diff --git a/res/log4j.properties b/res/log4j.properties index 0b1e065..ea19663 100644 --- a/res/log4j.properties +++ b/res/log4j.properties @@ -5,7 +5,7 @@ log4j.appender.stdout.layout.ConversionPattern=%n%-d{yyyy-MM-dd HH:mm:ss}%n[%p]- # Output to the File log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.File=./zhongchou.log +log4j.appender.file.File=./jinshan.log log4j.appender.file.layout=org.apache.log4j.PatternLayout log4j.appender.file.layout.ConversionPattern=%n%-d{yyyy-MM-dd HH:mm:ss}%n[%p]-[Thread: %t]-[%C.%M()]: %m%n