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

View File

@@ -71,7 +71,7 @@ $DEBUG = 0;
//========================================================== //==========================================================
$dbName = 'OMC_PUB'; $dbName = 'OMC_PUB';
$defTable = 'sysAlarmConf'; $defTable = 'sysAlarmConf';
$logTable = 'sysAlarmLog'; $logTable = 'sysAlarmInfo';
$numberPerPage = 100; //ÿҳ<C3BF><D2B3>¼<EFBFBD><C2BC> $numberPerPage = 100; //ÿҳ<C3BF><D2B3>¼<EFBFBD><C2BC>
$orderByStr = "alarmTime DESC,sysTypeNo,sysNo,subSysNo";//<2F><><EFBFBD><EFBFBD>˳<EFBFBD><CBB3> $orderByStr = "alarmTime DESC,sysTypeNo,sysNo,subSysNo";//<2F><><EFBFBD><EFBFBD>˳<EFBFBD><CBB3>
@@ -103,23 +103,23 @@ do{
}while($device_rows = mysqli_fetch_array($device_result)); }while($device_rows = mysqli_fetch_array($device_result));
//<2F><>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD>ѯ<EFBFBD><D1AF><EFBFBD>ֶ<EFBFBD><D6B6><EFBFBD> //<2F><>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD>ѯ<EFBFBD><D1AF><EFBFBD>ֶ<EFBFBD><D6B6><EFBFBD>
$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";
//<2F><>ʾ<EFBFBD>б<EFBFBD>ʱ<EFBFBD>ı<EFBFBD>ͷ<EFBFBD><CDB7><EFBFBD><EFBFBD> //<2F><>ʾ<EFBFBD>б<EFBFBD>ʱ<EFBFBD>ı<EFBFBD>ͷ<EFBFBD><CDB7><EFBFBD><EFBFBD>
$noop=0; $noop=0;
if($noop!=1) if($noop!=1)
{ {
if ($selectedLanguage == 'eng') 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') elseif ($selectedLanguage == 'chn')
$showFieldArr=array('ϵͳ<CFB5><CDB3>','<27><EFBFBD>ȼ<EFBFBD>','<27><><EFBFBD><EFBFBD>','<27>澯ʱ<E6BEAF><CAB1>','<27><><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>','<27><><EFBFBD><EFBFBD>'); $showFieldArr=array('ϵͳ<CFB5><CDB3>','<27><EFBFBD>ȼ<EFBFBD>','<27><>ϸ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>','<27>澯ʱ<E6BEAF><CAB1>','<27><><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>','<27><><EFBFBD><EFBFBD>');
} }
else else
{ {
if ($selectedLanguage == 'eng') 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') elseif ($selectedLanguage == 'chn')
$showFieldArr=array('ϵͳ<CFB5><CDB3>','<27><EFBFBD>ȼ<EFBFBD>','<27><><EFBFBD><EFBFBD>','<27>澯ʱ<E6BEAF><CAB1>','<27><><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>'); $showFieldArr=array('ϵͳ<CFB5><CDB3>','<27><EFBFBD>ȼ<EFBFBD>','<27><>ϸ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>','<27>澯ʱ<E6BEAF><CAB1>','<27><><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>');
} }
//========================================================== //==========================================================
@@ -140,6 +140,8 @@ if($actMode == 'clear')
$sysTypeNo=$_REQUEST['sysTypeNo']; $sysTypeNo=$_REQUEST['sysTypeNo'];
$sysNo=$_REQUEST['sysNo']; $sysNo=$_REQUEST['sysNo'];
$subSysNo=$_REQUEST['subSysNo']; $subSysNo=$_REQUEST['subSysNo'];
$alarmId=$_REQUEST['alarmId'];
//<2F><EFBFBD><E6BEAF><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>Ҫ<EFBFBD>ı<EFBFBD><C4B1><EFBFBD> //<2F><EFBFBD><E6BEAF><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>Ҫ<EFBFBD>ı<EFBFBD><C4B1><EFBFBD>
if($DEBUG) echo "<br>actMode = $actMode"; if($DEBUG) echo "<br>actMode = $actMode";
if($DEBUG) echo "<br>sysTypeNo = $sysTypeNo"; 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>alarmCode = $alarmCode";
if($DEBUG) echo "<br>alarmTime = $alarmTime"; if($DEBUG) echo "<br>alarmTime = $alarmTime";
if($DEBUG) echo "<br>clearMode = $clearMode"; if($DEBUG) echo "<br>clearMode = $clearMode";
if($DEBUG) echo "<br>alarmId = $alarmId";
//<2F>ϲ<EFBFBD>ҳ<EFBFBD><EFBFBD><E6B4AB><EFBFBD>ı<EFBFBD><C4B1><EFBFBD> //<2F>ϲ<EFBFBD>ҳ<EFBFBD><EFBFBD><E6B4AB><EFBFBD>ı<EFBFBD><C4B1><EFBFBD>
if($DEBUG) echo "<br>selAlarmLevel = $selAlarmLevel"; if($DEBUG) echo "<br>selAlarmLevel = $selAlarmLevel";
if($DEBUG) echo "<br>selSysTypeNo = $selSysTypeNo"; if($DEBUG) echo "<br>selSysTypeNo = $selSysTypeNo";
@@ -189,13 +193,14 @@ $bssDbConn=mysqli_connect($$OMC_server[0]['host'],$OMC_server[0]['user'],$OMC_se
else else
{ {
$clearAlarmSql=" UPDATE $logTable $clearAlarmSql=" UPDATE $logTable
SET clearTime=CURRENT_TIMESTAMP,clearMode='1',clearBy='$userInfo[ID]' SET clearTime=CURRENT_TIMESTAMP,clearMode='0',clearBy='$userInfo[ID]'
WHERE sysTypeNo = '$sysTypeNo' WHERE sysTypeNo = '$sysTypeNo'
AND sysNo = '$sysNo' AND sysNo = '$sysNo'
AND subSysNo = '$subSysNo' AND subSysNo = '$subSysNo'
AND compCode = '$compCode' AND compCode = '$compCode'
AND alarmCode = '$alarmCode' AND alarmCode = '$alarmCode'
AND alarmTime = '$alarmTime' AND alarmTime = '$alarmTime'
AND alarmId = '$alarmId'
"; ";
if($DEBUG) if($DEBUG)
echo "<br>clearAlarmSql=$clearAlarmSql"; echo "<br>clearAlarmSql=$clearAlarmSql";
@@ -287,7 +292,7 @@ if($selSysTypeNo==500)
$showBgnNo=$bgnNo+1; $showBgnNo=$bgnNo+1;
} }
} }
else else//other 500
{ {
//<2F><><EFBFBD><EFBFBD><EFBFBD>ϲ<EFBFBD>ҳ<EFBFBD><EFBFBD><E6B4AB><EFBFBD>ı<EFBFBD><C4B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɲ<EFBFBD>ѯ<EFBFBD><D1AF><EFBFBD><EFBFBD> //<2F><><EFBFBD><EFBFBD><EFBFBD>ϲ<EFBFBD>ҳ<EFBFBD><EFBFBD><E6B4AB><EFBFBD>ı<EFBFBD><C4B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɲ<EFBFBD>ѯ<EFBFBD><D1AF><EFBFBD><EFBFBD>
if( strlen($selSysTypeNo) > 0){ if( strlen($selSysTypeNo) > 0){
@@ -299,26 +304,26 @@ else
$whereStr .=" "; $whereStr .=" ";
}elseif( $selAlarmLevel == 'unclear'){ }elseif( $selAlarmLevel == 'unclear'){
if(strlen($whereStr) > 0){ if(strlen($whereStr) > 0){
$whereStr .=" AND clearTime = '0000-00-00 00:00:00' "; $whereStr .=" AND clearMode= '1' ";
}else{ }else{
$whereStr .=" clearTime = '0000-00-00 00:00:00' "; $whereStr .=" clearMode= '1' ";
} }
}elseif( $selAlarmLevel == 'cleared'){ }elseif( $selAlarmLevel == 'cleared'){
if(strlen($whereStr) > 0){ if(strlen($whereStr) > 0){
$whereStr .=" AND clearTime <> '0000-00-00 00:00:00' "; $whereStr .=" AND clearMode= '0' ";
}else{ }else{
$whereStr .=" clearTime <> '0000-00-00 00:00:00' "; $whereStr .=" clearMode= '0' ";
} }
}else{ }else{
if(strlen($whereStr) > 0){ if(strlen($whereStr) > 0){
$whereStr .=" AND alarmLevel = '$selAlarmLevel' AND clearTime = '0000-00-00 00:00:00'"; $whereStr .=" AND alarmLevel = '$selAlarmLevel' AND clearMode= '1'";
}else{ }else{
$whereStr .=" alarmLevel = '$selAlarmLevel' AND clearTime = '0000-00-00 00:00:00'"; $whereStr .=" alarmLevel = '$selAlarmLevel' AND clearMode= '1'";
} }
} }
}else{ }else{
if(strlen($whereStr) < 1){ 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 $showSql=" SELECT $selectFieldList FROM $bssLogTable WHERE $bssWhereStr
ORDER BY $bssOrderByStr LIMIT $bssBgnNo, $numberPerPage "; ORDER BY $bssOrderByStr LIMIT $bssBgnNo, $numberPerPage ";
if(0) if($DEBUUG)
echo "<br>bssShowSql=$showSql"; echo "<br>bssShowSql=$showSql<br>";
$bss_Result=@mysqli_query($pubConn,$showSql); $bss_Result=@mysqli_query($pubConn,$showSql);
echo mysqli_error($pubConn); echo mysqli_error($pubConn);
$thisPageBSSNum = @mysqli_num_rows($bss_Result); $thisPageBSSNum = @mysqli_num_rows($bss_Result);
@@ -580,6 +585,8 @@ do
$alarmCode =$rows[alarmCode]; $alarmCode =$rows[alarmCode];
$alarmLevel =$rows[alarmLevel]; $alarmLevel =$rows[alarmLevel];
$descript =$rows[$alarmDesc]; $descript =$rows[$alarmDesc];
$alarmInfo =$rows[alarmInfo];
$alarmId =$rows[alarmId];
$alarmTime =$rows[alarmTime]; $alarmTime =$rows[alarmTime];
$clearTime =$rows[clearTime]; $clearTime =$rows[clearTime];
$clearMode =$rows[clearMode]; $clearMode =$rows[clearMode];
@@ -594,10 +601,14 @@ do
echo "<font color=\"{$alarmLevelDefArr[$alarmLevel][color]}\">&nbsp; $alarmLevelRemark</font>"; echo "<font color=\"{$alarmLevelDefArr[$alarmLevel][color]}\">&nbsp; $alarmLevelRemark</font>";
echo "</td>"; echo "</td>";
echo "<td align=\"left\">"; // echo "<td align=\"left\">";
echo "&nbsp; $descript"; // echo "&nbsp; $descript";
echo "</td>"; // echo "</td>";
echo "<td align=\"left\">";
echo "&nbsp; $alarmInfo";
echo "</td>";
echo "<td align=\"right\">"; echo "<td align=\"right\">";
echo "&nbsp; $alarmTime"; echo "&nbsp; $alarmTime";
echo "</td>"; echo "</td>";
@@ -618,7 +629,7 @@ do
}else{ }else{
echo "<a href=\"$PHP_SELF?actMode=clear&sysTypeNo=$sysTypeNo&sysNo=$sysNo&subSysNo=$subSysNo"; 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 "&selSysTypeNo=$selSysTypeNo&selAlarmLevel=$selAlarmLevel&bgnNo=$bgnNo";
echo "\"><img src=\"../../images/delete.gif\" border=\"0\"></a>"; echo "\"><img src=\"../../images/delete.gif\" border=\"0\"></a>";
} }
@@ -658,9 +669,9 @@ do
echo "<font color=\"{$alarmLevelDefArr[$alarmLevel][color]}\">&nbsp; $alarmLevelRemark</font>"; echo "<font color=\"{$alarmLevelDefArr[$alarmLevel][color]}\">&nbsp; $alarmLevelRemark</font>";
echo "</td>"; echo "</td>";
echo "<td align=\"left\">"; // echo "<td align=\"left\">";
echo "&nbsp; $descript"; // echo "&nbsp; $descript";
echo "</td>"; // echo "</td>";
echo "<td align=\"right\">"; echo "<td align=\"right\">";
echo "&nbsp; $alarmTime"; echo "&nbsp; $alarmTime";

View File

@@ -227,7 +227,7 @@ function selectChn(){
} }
?> ?>
</td></tr> </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> </table>
</form> </form>
</body> </body>