This commit is contained in:
root committed 2025-05-09 19:13:11 +08:00
1 parent 4e8b281640
commit 4c19c0f873
2 files changed
+36 -25

No files matched your search

+35 -24
View File
@@ -71,7 +71,7 @@ $DEBUG = 0;
//==========================================================
$dbName = 'OMC_PUB';
$defTable = 'sysAlarmConf';
$logTable = 'sysAlarmLog';
$logTable = 'sysAlarmInfo';
$numberPerPage = 100; //每页纪录数
$orderByStr = "alarmTime DESC,sysTypeNo,sysNo,subSysNo";//排序顺序
@@ -103,23 +103,23 @@ do{
}while($device_rows = mysqli_fetch_array($device_result));
//需要被查询的字段名
$selectFieldList="$logTable.sysTypeNo,sysNo,subSysNo,$logTable.compCode,$logTable.alarmCode,alarmLevel,$alarmDesc ,alarmTime,clearTime,clearMode,clearInfo";
$selectFieldList="$logTable.sysTypeNo,sysNo,subSysNo,$logTable.compCode,$logTable.alarmCode,$logTable.alarmInfo,$logTable.alarmId,alarmLevel,$alarmDesc ,alarmTime,clearTime,clearMode,clearInfo";
//显示列表时的表头标题
$noop=0;
if($noop!=1)
{
if ($selectedLanguage == 'eng')
$showFieldArr=array('System','Alarm level','Events','Alarm time','Clear time','Clear');
$showFieldArr=array('System','Alarm level','Alarm Info','Alarm time','Clear time','Clear');
elseif ($selectedLanguage == 'chn')
$showFieldArr=array('系统号','告警等级','描述','告警时间','清除时间','清除');
$showFieldArr=array('系统号','告警等级','详细内容','告警时间','清除时间','清除');
}
else
{
if ($selectedLanguage == 'eng')
$showFieldArr=array('System','Alarm level','Events','Alarm time','Clear time');
$showFieldArr=array('System','Alarm level','Alarm Info','Alarm time','Clear time');
elseif ($selectedLanguage == 'chn')
$showFieldArr=array('系统号','告警等级','描述','告警时间','清除时间');
$showFieldArr=array('系统号','告警等级','详细内容','告警时间','清除时间');
}
//==========================================================
@@ -140,6 +140,8 @@ if($actMode == 'clear')
$sysTypeNo=$_REQUEST['sysTypeNo'];
$sysNo=$_REQUEST['sysNo'];
$subSysNo=$_REQUEST['subSysNo'];
$alarmId=$_REQUEST['alarmId'];
//告警清除时需要的变量
if($DEBUG) echo "<br>actMode = $actMode";
if($DEBUG) echo "<br>sysTypeNo = $sysTypeNo";
@@ -149,6 +151,8 @@ if($DEBUG) echo "<br>compCode = $compCode";
if($DEBUG) echo "<br>alarmCode = $alarmCode";
if($DEBUG) echo "<br>alarmTime = $alarmTime";
if($DEBUG) echo "<br>clearMode = $clearMode";
if($DEBUG) echo "<br>alarmId = $alarmId";
//上部页面传入的变量
if($DEBUG) echo "<br>selAlarmLevel = $selAlarmLevel";
if($DEBUG) echo "<br>selSysTypeNo = $selSysTypeNo";
@@ -189,13 +193,14 @@ $bssDbConn=mysqli_connect($$OMC_server[0]['host'],$OMC_server[0]['user'],$OMC_se
else
{
$clearAlarmSql=" UPDATE $logTable
SET clearTime=CURRENT_TIMESTAMP,clearMode='1',clearBy='$userInfo[ID]'
SET clearTime=CURRENT_TIMESTAMP,clearMode='0',clearBy='$userInfo[ID]'
WHERE sysTypeNo = '$sysTypeNo'
AND sysNo = '$sysNo'
AND subSysNo = '$subSysNo'
AND compCode = '$compCode'
AND alarmCode = '$alarmCode'
AND alarmTime = '$alarmTime'
AND alarmId = '$alarmId'
";
if($DEBUG)
echo "<br>clearAlarmSql=$clearAlarmSql";
@@ -287,7 +292,7 @@ if($selSysTypeNo==500)
$showBgnNo=$bgnNo+1;
}
}
else
else//other 500
{
//根据上部页面传来的变量,生成查询条件
if( strlen($selSysTypeNo) > 0){
@@ -299,26 +304,26 @@ else
$whereStr .=" ";
}elseif( $selAlarmLevel == 'unclear'){
if(strlen($whereStr) > 0){
$whereStr .=" AND clearTime = '0000-00-00 00:00:00' ";
$whereStr .=" AND clearMode= '1' ";
}else{
$whereStr .=" clearTime = '0000-00-00 00:00:00' ";
$whereStr .=" clearMode= '1' ";
}
}elseif( $selAlarmLevel == 'cleared'){
if(strlen($whereStr) > 0){
$whereStr .=" AND clearTime <> '0000-00-00 00:00:00' ";
$whereStr .=" AND clearMode= '0' ";
}else{
$whereStr .=" clearTime <> '0000-00-00 00:00:00' ";
$whereStr .=" clearMode= '0' ";
}
}else{
if(strlen($whereStr) > 0){
$whereStr .=" AND alarmLevel = '$selAlarmLevel' AND clearTime = '0000-00-00 00:00:00'";
$whereStr .=" AND alarmLevel = '$selAlarmLevel' AND clearMode= '1'";
}else{
$whereStr .=" alarmLevel = '$selAlarmLevel' AND clearTime = '0000-00-00 00:00:00'";
$whereStr .=" alarmLevel = '$selAlarmLevel' AND clearMode= '1'";
}
}
}else{
if(strlen($whereStr) < 1){
$whereStr =" clearTime = '0000-00-00 00:00:00' ";
$whereStr =" clearMode= '1' ";
}
}
@@ -444,8 +449,8 @@ else
$showSql=" SELECT $selectFieldList FROM $bssLogTable WHERE $bssWhereStr
ORDER BY $bssOrderByStr LIMIT $bssBgnNo, $numberPerPage ";
if(0)
echo "<br>bssShowSql=$showSql";
if($DEBUUG)
echo "<br>bssShowSql=$showSql<br>";
$bss_Result=@mysqli_query($pubConn,$showSql);
echo mysqli_error($pubConn);
$thisPageBSSNum = @mysqli_num_rows($bss_Result);
@@ -580,6 +585,8 @@ do
$alarmCode =$rows[alarmCode];
$alarmLevel =$rows[alarmLevel];
$descript =$rows[$alarmDesc];
$alarmInfo =$rows[alarmInfo];
$alarmId =$rows[alarmId];
$alarmTime =$rows[alarmTime];
$clearTime =$rows[clearTime];
$clearMode =$rows[clearMode];
@@ -594,10 +601,14 @@ do
echo "<font color=\"{$alarmLevelDefArr[$alarmLevel][color]}\">&nbsp; $alarmLevelRemark</font>";
echo "</td>";
echo "<td align=\"left\">";
echo "&nbsp; $descript";
echo "</td>";
// echo "<td align=\"left\">";
// echo "&nbsp; $descript";
// echo "</td>";
echo "<td align=\"left\">";
echo "&nbsp; $alarmInfo";
echo "</td>";
echo "<td align=\"right\">";
echo "&nbsp; $alarmTime";
echo "</td>";
@@ -618,7 +629,7 @@ do
}else{
echo "<a href=\"$PHP_SELF?actMode=clear&sysTypeNo=$sysTypeNo&sysNo=$sysNo&subSysNo=$subSysNo";
echo "&compCode=$compCode&alarmCode=$alarmCode&alarmTime=$alarmTime&alarmLevel=$alarmLevel";
echo "&compCode=$compCode&alarmCode=$alarmCode&alarmTime=$alarmTime&alarmLevel=$alarmLevel&alarmId=$rows[alarmId]";
echo "&selSysTypeNo=$selSysTypeNo&selAlarmLevel=$selAlarmLevel&bgnNo=$bgnNo";
echo "\"><img src=\"../../images/delete.gif\" border=\"0\"></a>";
}
@@ -658,9 +669,9 @@ do
echo "<font color=\"{$alarmLevelDefArr[$alarmLevel][color]}\">&nbsp; $alarmLevelRemark</font>";
echo "</td>";
echo "<td align=\"left\">";
echo "&nbsp; $descript";
echo "</td>";
// echo "<td align=\"left\">";
// echo "&nbsp; $descript";
// echo "</td>";
echo "<td align=\"right\">";
echo "&nbsp; $alarmTime";
+1 -1
View File
@@ -227,7 +227,7 @@ function selectChn(){
}
?>
</td></tr>
<tr><td align="center"><b><font size=6>R2503.2</font></b></td></tr>
<tr><td align="center"><b><font size=6>R2505.1</font></b></td></tr>
</table>
</form>
</body>