fix transaction 时间选择

master
luoyang 6 years ago
parent 917eadf0f1
commit 65e5378d1c

@ -2,15 +2,15 @@
spring.datasource.type = com.zaxxer.hikari.HikariDataSource spring.datasource.type = com.zaxxer.hikari.HikariDataSource
#数据源master #数据源master
spring.datasource.master.schema-name=royalpay_production spring.datasource.master.schema-name=royalpay_dev
spring.datasource.master.host=119.28.3.196:3310 spring.datasource.master.host=127.0.0.1:3306
spring.datasource.master.jdbc-url=jdbc:mysql://${spring.datasource.master.host}/${spring.datasource.master.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false spring.datasource.master.jdbc-url=jdbc:mysql://${spring.datasource.master.host}/${spring.datasource.master.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
spring.datasource.master.username=readonly spring.datasource.master.username=root
spring.datasource.master.password=read0nly spring.datasource.master.password=root
#数据源salve #数据源salve
spring.datasource.slave.schema-name=royalpay_production spring.datasource.slave.schema-name=royalpay_dev
spring.datasource.slave.host=119.28.3.196:3310 spring.datasource.slave.host=127.0.0.1:3306
spring.datasource.slave.jdbc-url=jdbc:mysql://${spring.datasource.slave.host}/${spring.datasource.slave.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false spring.datasource.slave.jdbc-url=jdbc:mysql://${spring.datasource.slave.host}/${spring.datasource.slave.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
spring.datasource.slave.username=readonly spring.datasource.slave.username=root
spring.datasource.slave.password=read0nly spring.datasource.slave.password=root

@ -34,7 +34,8 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$scope.today = new Date(); $scope.today = new Date();
$scope.chooseToday = function () { $scope.chooseToday = function () {
$scope.params.datefrom = $scope.params.dateto = new Date(); $scope.params.datefrom = new Date();
$scope.params.dateto = new Date();
$scope.loadTradeLogs(1); $scope.loadTradeLogs(1);
}; };
$scope.chooseYesterday = function () { $scope.chooseYesterday = function () {
@ -269,14 +270,16 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
// var day = new Date(); // var day = new Date();
// day.setDate(day.getDate() - 7); // day.setDate(day.getDate() - 7);
// $scope.params.datefrom = day; // $scope.params.datefrom = day;
$scope.params.datefrom = $scope.params.dateto = new Date(); $scope.params.datefrom = new Date();
$scope.params.dateto = new Date();
$scope.chooseClient('all'); $scope.chooseClient('all');
}else { }else {
// $scope.params.dateto = new Date(); // $scope.params.dateto = new Date();
// var day = new Date(); // var day = new Date();
// day.setDate(day.getDate() - 7); // day.setDate(day.getDate() - 7);
// $scope.params.datefrom = day; // $scope.params.datefrom = day;
$scope.params.datefrom = $scope.params.dateto = new Date(); $scope.params.datefrom = new Date();
$scope.params.dateto = new Date();
$scope.chooseClient('all'); $scope.chooseClient('all');
} }

Loading…
Cancel
Save