|
@@ -240,7 +240,7 @@ void wgelectcore::AlarmReport(QString DeviceCode,QString lastid,QString SETime,Q
|
|
}
|
|
}
|
|
}
|
|
}
|
|
for(int j=0;j<35;j++){
|
|
for(int j=0;j<35;j++){
|
|
- if(MeasName.compare(wgdev->devs[i].alarm[j].measname)==0){
|
|
|
|
|
|
+ if((MeasName.compare(wgdev->devs[i].alarm[j].measname)==0)&&((QString("PhaseLoss")).compare(MeasName)==0 || (QString("OverV")).compare(MeasName)==0 || (QString("UnderV")).compare(MeasName)==0 || (QString("BusOutage")).compare(MeasName)==0 || (QString("OverEvT")).compare(MeasName)==0 || (QString("DevAbnormal")).compare(MeasName)==0)){
|
|
if(DigitalValue.compare("0")==0){
|
|
if(DigitalValue.compare("0")==0){
|
|
if((soeTime-wgdev->devs[i].alarm[j].soetime0)>60){
|
|
if((soeTime-wgdev->devs[i].alarm[j].soetime0)>60){
|
|
if((soeTime-busTime0)>60){
|
|
if((soeTime-busTime0)>60){
|