diff options
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/MonitorModalCtrl.js | 14 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 15 |
2 files changed, 15 insertions, 14 deletions
diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js index 51f08fd5..b5bfdd92 100644 --- a/www/js/MonitorModalCtrl.js +++ b/www/js/MonitorModalCtrl.js @@ -1016,26 +1016,26 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ var color = ""; switch ($scope.monStatus) { case "": - color = "background-color:none"; + color = "none"; break; case status[0]: - color = "background-color:#4B77BE"; + color = "#4B77BE"; break; case status[1]: - color = "background-color:#e67e22"; + color = "#e67e22"; break; case status[2]: - color = "background-color:#D91E18"; + color = "#D91E18"; break; case status[3]: - color = "background-color:#e67e22"; + color = "#e67e22"; break; case status[4]: - color = "background-color:#26A65B"; + color = "#26A65B"; break; } - return "padding-left:4px;padding-right:4px;" + color; + return color; }; //----------------------------------------------------------------------- diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 02128ebc..70baec5b 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -508,6 +508,7 @@ angular.module('zmApp.controllers') (NVRDataModel.getBandwidth() == 'lowbw') || (NVRDataModel.getLogin().disableAlarmCheckMontage == true)) { + // console.log ("NOT DOING ALARMS"); return; } @@ -540,19 +541,19 @@ angular.module('zmApp.controllers') var sid = parseInt(data.data.status); switch (sid) { case 0: // idle - monitor.Monitor.alarmState = 'color:rgba(0,0,0,0);'; + monitor.Monitor.alarmState = 'rgba(0,0,0,0)'; break; case 1: // pre alarm - monitor.Monitor.alarmState = 'color:#e67e22;'; + monitor.Monitor.alarmState = '#e67e22'; break; case 2: // alarm - monitor.Monitor.alarmState = 'color:#D91E18;'; + monitor.Monitor.alarmState = '#D91E18'; break; case 3: // alert - monitor.Monitor.alarmState = 'color:#e67e22;'; + monitor.Monitor.alarmState = '#e67e22'; break; case 4: - monitor.Monitor.alarmState = 'color:#26A65B;'; + monitor.Monitor.alarmState = '#26A65B'; break; } @@ -560,7 +561,7 @@ angular.module('zmApp.controllers') }, function (error) { - monitor.Monitor.alarmState = 'color:rgba(0,0,0,0);'; + monitor.Monitor.alarmState = 'rgba(0,0,0,0)'; NVRDataModel.debug("Error in monitor alarmed status "); }); } @@ -1847,7 +1848,7 @@ angular.module('zmApp.controllers') for (var i = 0; i < $scope.MontageMonitors.length; i++) { $scope.MontageMonitors[i].Monitor.gridScale = "50"; $scope.MontageMonitors[i].Monitor.selectStyle = ""; - $scope.MontageMonitors[i].Monitor.alarmState = 'color:rgba(0,0,0,0);'; + $scope.MontageMonitors[i].Monitor.alarmState = 'rgba(0,0,0,0)'; $scope.MontageMonitors[i].Monitor.isStamp = false; } |