@@ -9700,9 +9700,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
$scope.data = [];// 列表数据
- $scope.condition = {
- $fromOpened: false
- }
+ $scope.condition.$fromOpened = false
$scope.openDatePicker = function ($event, item, openParam) {
$event.preventDefault();
@@ -204,7 +204,7 @@
<div class="condition block" >
<div class="search-bg condition block" style="padding: 10px 15px;">
<div class="row">
- <div id="topSearch" ng-if="active !== 'all'" style="float: left">
+ <div id="topSearch" ng-show="active !== 'all'" style="float: left">
<a ng-click="changeDateZone(1);condition.$open=false" title="最近一个月" ng-class="{'active':condition.dateZone=='1'}">最近一个月</a>
<a ng-click="changeDateZone(3);condition.$open=false" title="最近三个月" ng-class="{'active':condition.dateZone=='3'}">最近三个月</a>
<a ng-click="changeDateZone(6);condition.$open=false" title="最近六个月" ng-class="{'active':condition.dateZone=='6'}">最近六个月</a>
@@ -566,6 +566,11 @@
}
</style>
<style>
+ .wui-date-picker.left {
+ margin-right : 0 !important;
+ right: 0;
+ left: auto
+ }
.add-apCheckList {
background: #fff