|
@@ -112,15 +112,17 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
|
112
|
112
|
// }
|
113
|
113
|
}
|
114
|
114
|
}else if($rootScope.isHk){
|
115
|
|
- if (toState.name != "app.incident.editor" && toState.name != "echart") {
|
116
|
|
- if ($rootScope.status == 2 || $rootScope.status == 4 || $rootScope.status == 9) {
|
117
|
|
- $rootScope.setidle();
|
118
|
|
- }
|
119
|
|
- }
|
|
115
|
+ // if (toState.name != "app.incident.editor" && toState.name != "echart") {
|
|
116
|
+ // if ($rootScope.status == 2 || $rootScope.status == 4 || $rootScope.status == 9) {
|
|
117
|
+ // $rootScope.setidle();
|
|
118
|
+ // }
|
|
119
|
+ // }
|
120
|
120
|
if (toState.name != "app.incident.editor" && toState.name != "app.incident.title") {
|
|
121
|
+ if(fromState.name == "app.incident.editor" || fromState.name == "app.incident.title"){
|
121
|
122
|
if ($scope.login && $rootScope.statecall == 2 && !$rootScope.busy) {
|
122
|
|
- $rootScope.setidle();
|
|
123
|
+ $rootScope.setidle();
|
123
|
124
|
}
|
|
125
|
+ }
|
124
|
126
|
} else {
|
125
|
127
|
if ($scope.login && !$rootScope.busy) {
|
126
|
128
|
$rootScope.setbusy();
|