diff --git a/wxc2_omc/configuration/tabParamConfiguration/cos_edit.php b/wxc2_omc/configuration/tabParamConfiguration/cos_edit.php
index afa1c67..2b94ef5 100755
--- a/wxc2_omc/configuration/tabParamConfiguration/cos_edit.php
+++ b/wxc2_omc/configuration/tabParamConfiguration/cos_edit.php
@@ -736,6 +736,33 @@ echo "
";
echo "";
echo "
";
+ echo "";
+ //Bundle Plan Control
+ $param_oid="2.2.52.1.27";
+ $singleParameterInfo=GetSingleParameterInfo($sysId,$param_oid);
+ echo "| ";
+ echo "{$singleParameterInfo[ShowName]}";
+ echo " | ";
+ echo "";
+ $param_instance=$nest_instance0;
+ showParameterAdv($sysId,$param_oid,$param_instance);
+ echo " | ";
+ echo "
";
+
+
+ echo "";
+ //Bundle Plan Control
+ $param_oid="2.2.52.1.28";
+ $singleParameterInfo=GetSingleParameterInfo($sysId,$param_oid);
+ echo "| ";
+ echo "{$singleParameterInfo[ShowName]}";
+ echo " | ";
+ echo "";
+ $param_instance=$nest_instance0;
+ showParameterAdv($sysId,$param_oid,$param_instance);
+ echo " | ";
+ echo "
";
+
echo "";
echo "";
echo "";
diff --git a/wxc2_omc/fault/alarmList/alarmList_down.php b/wxc2_omc/fault/alarmList/alarmList_down.php
index ffbd94d..3ba6a5b 100755
--- a/wxc2_omc/fault/alarmList/alarmList_down.php
+++ b/wxc2_omc/fault/alarmList/alarmList_down.php
@@ -31,11 +31,16 @@ function goPage(numberOfRec){
$bgnNo=$_REQUEST['bgnNo'];
$numberOfRecords=$_REQUEST['numberOfRecords'];
$selSysTypeNo=$_REQUEST['selSysTypeNo'];
+$sel_date_from=$_REQUEST['sel_date_from'];
+$sel_date_to=$_REQUEST['sel_date_to'];
+$startTime=date("Y-m-d H:i:s",mktime(0,0,0,date("m"),date("d")-$sel_date_from,date("Y")));
+$endTime=date("Y-m-d H:i:s",mktime(23,59,59,date("m"),date("d")-$sel_date_to,date("Y")));
+
$selAlarmLevel=$_REQUEST['selAlarmLevel'];
$nextPageLink=$_REQUEST['nextPageLink'];
$prePageLink=$_REQUEST['prePageLink'];
$actMode=$_REQUEST['actMode'];
-echo "";
+//echo "";
adjust_head_frame("down");
adjust_title_head_frame("down");
adjust_title_tail_frame("down");
@@ -297,7 +302,9 @@ else//other 500
//根据上部页面传来的变量,生成查询条件
if( strlen($selSysTypeNo) > 0){
if( $selSysTypeNo != 'all'){
- $whereStr .=" $logTable.sysTypeNo = '$selSysTypeNo'";
+ $whereStr .=" $logTable.sysTypeNo = '$selSysTypeNo' and alarmTime >= '{$startTime}' AND alarmTime <= '{$endTime}'";
+ }else{
+ $whereStr .="alarmTime >= '{$startTime}' AND alarmTime <= '{$endTime}'";
}
if($selAlarmLevel == 'all'){
@@ -316,14 +323,14 @@ else//other 500
}
}else{
if(strlen($whereStr) > 0){
- $whereStr .=" AND alarmLevel = '$selAlarmLevel' AND clearMode= '1'";
+ $whereStr .=" AND alarmLevel = '$selAlarmLevel' AND clearMode= '1' ";
}else{
- $whereStr .=" alarmLevel = '$selAlarmLevel' AND clearMode= '1'";
+ $whereStr .=" alarmLevel = '$selAlarmLevel' AND clearMode= '1' ";
}
}
}else{
if(strlen($whereStr) < 1){
- $whereStr =" clearMode= '1' ";
+ $whereStr =" clearMode= '1' and alarmTime >= '{$startTime}' AND alarmTime <= '{$endTime}'";
}
}
diff --git a/wxc2_omc/fault/alarmList/alarmList_up.php b/wxc2_omc/fault/alarmList/alarmList_up.php
index c6b53f5..dbe2b74 100755
--- a/wxc2_omc/fault/alarmList/alarmList_up.php
+++ b/wxc2_omc/fault/alarmList/alarmList_up.php
@@ -27,6 +27,12 @@ $device_result = @mysqli_query($pubConn,$device_sql);
$device_rows = @mysqli_fetch_array($device_result);
echo mysqli_error($pubConn);
+
+$selSysTypeNo=$_REQUEST['selSysTypeNo'];
+$selAlarmLevel=$_REQUEST['selAlarmLevel'];
+$sel_date_from=$_REQUEST['sel_date_from'];
+$sel_date_to=$_REQUEST['sel_date_to'];
+
?>
@@ -73,16 +79,46 @@ for($i=1;$i$alarmLevelRemark";
}
-echo " ";
+echo " ";
+
+for($i=0;$i<30;$i++)
+{
+ $startDay[]=date("Y-m-d",mktime(0,0,0,date("m"),date("d")-$i,date("Y")));
+}
+//select day from
+echo " to ";
+//select day to
+echo " ";
+
echo "";
?>
-
+
";
echo "";
+echo "";
+echo " ";
+echo " ";
+
echo " | ";
echo "";
echo "";
@@ -95,4 +131,24 @@ adjust_content_tail_frame("up");