|
|
@@ -36,15 +36,17 @@ class Alarm extends Base_Controller {
|
|
|
|
|
|
// 告警类型筛选
|
|
|
$alarmtype = trim($this->input->post('alarmtype',true));
|
|
|
+ // var_dump($alarmtype);
|
|
|
|
|
|
// 时间筛选
|
|
|
$endDate = $this->input->post('endDate',true);
|
|
|
$startDate = $this->input->post('startDate',true);
|
|
|
|
|
|
$type = intval($this->input->post('type',true));
|
|
|
- $version = $this->session->userdata('version');
|
|
|
+ $version = $this->version;
|
|
|
+ // var_dump($version);
|
|
|
if (!empty($version)) {
|
|
|
- $alarmtype = alarm_translate_ch($alarmtype);
|
|
|
+ $alarmtype = alarm_translate($alarmtype);
|
|
|
}
|
|
|
|
|
|
$page = empty($page) ? 1 : $page;
|
|
|
@@ -62,11 +64,12 @@ class Alarm extends Base_Controller {
|
|
|
$status = empty($filter['status']) ? 0 : $filter['status'];
|
|
|
$where[] = 'AI.status = '.$status;
|
|
|
}
|
|
|
- if(!empty($alarmtype)) $filter['alarmtype'] = $alarmtype;
|
|
|
- if(!empty($alarmtype)) $where[] = 'AI.alarmtype like "%'.$alarmtype.'%"';
|
|
|
+ // if(!empty($alarmtype)) $filter['alarmtype'] = $alarmtype;
|
|
|
+ // if(!empty($alarmtype)) $where[] = 'AI.alarmtype like "%'.$alarmtype.'%"';
|
|
|
+ // var_dump($alarmtype);
|
|
|
// if(isset($endDate)) $filter['endDate'] = $endDate;
|
|
|
- if(isset($endDate)) $where = 'AI.updatetime <= "'.$endDate.'"';
|
|
|
- if(isset($startDate)) $where = 'AI.updatetime >= "'.$startDate.'"';
|
|
|
+ if(isset($endDate) && !empty($endDate)) $where[] = 'AI.updatetime <= "'.$endDate.'"';
|
|
|
+ if(isset($startDate) && !empty($startDate)) $where[] = 'AI.updatetime >= "'.$startDate.'"';
|
|
|
// if(isset($startDate)) $filter['startDate'] = $startDate;
|
|
|
|
|
|
if (empty($download)) {
|
