测试：BUG下面的【250】功能完善

git-svn-id: https://202.107.226.68:8443/svn/Services/ResistanceMonitor@113 a05970a1-87b9-9d4f-9ee5-fa77e2ec115b

4.Data/HttpPrcess.cpp

@@ -3464,15 +3464,13 @@ int DealGetResistCurve(const httplib::Request& req, const string token, char** j
 	{
 		//转换阻力报警线
 		CONVERT_RESIST_OVER_LIMIT* pInfo = (CONVERT_RESIST_OVER_LIMIT*)CResistAlarmMng::Instance()->Find(mo, mp, 2, eZL_ALARMTYPE::CONVERT_LIMIT);
-		string direct1, direct2;
-		CMonitorObjectMng::Instance()->GetDirectByMoMp(mo+"."+mp, direct1, direct2);
 		if (pInfo && pInfo->enable)
 		{
 			if (pInfo->dw_warn_low_limit > INT_MIN)
 			{
 				auto obj = yyjson_mut_obj(doc);
 				yyjson_mut_arr_add_val(convert_line, obj);
-				yyjson_mut_obj_add_strcpy(doc, obj, "name", ANSItoUTF8(direct1+"预警线").c_str());
+				yyjson_mut_obj_add_strcpy(doc, obj, "name", ANSItoUTF8("定板反预警值").c_str());
 				yyjson_mut_obj_add_int(doc, obj, "value", pInfo->dw_warn_low_limit);
 				yyjson_mut_obj_add_str(doc, obj, "color", "Orange");
 			}
@@ -3480,7 +3478,7 @@ int DealGetResistCurve(const httplib::Request& req, const string token, char** j
 			{
 				auto obj = yyjson_mut_obj(doc);
 				yyjson_mut_arr_add_val(convert_line, obj);
-				yyjson_mut_obj_add_strcpy(doc, obj, "name", ANSItoUTF8(direct2+"预警线").c_str());
+				yyjson_mut_obj_add_strcpy(doc, obj, "name", ANSItoUTF8("反板定预警值").c_str());
 				yyjson_mut_obj_add_int(doc, obj, "value", pInfo->up_warn_high_limit);
 				yyjson_mut_obj_add_str(doc, obj, "color", "Orange");
 			}
@@ -3488,7 +3486,7 @@ int DealGetResistCurve(const httplib::Request& req, const string token, char** j
 			{
 				auto obj = yyjson_mut_obj(doc);
 				yyjson_mut_arr_add_val(convert_line, obj);
-				yyjson_mut_obj_add_strcpy(doc, obj, "name", ANSItoUTF8(direct1+"报警线").c_str());
+				yyjson_mut_obj_add_strcpy(doc, obj, "name", ANSItoUTF8("定板反报警值").c_str());
 				yyjson_mut_obj_add_int(doc, obj, "value", pInfo->dw_alarm_low_limit);
 				yyjson_mut_obj_add_str(doc, obj, "color", "Red");
 			}
@@ -3496,7 +3494,7 @@ int DealGetResistCurve(const httplib::Request& req, const string token, char** j
 			{
 				auto obj = yyjson_mut_obj(doc);
 				yyjson_mut_arr_add_val(convert_line, obj);
-				yyjson_mut_obj_add_strcpy(doc, obj, "name", ANSItoUTF8(direct2+"报警线").c_str());
+				yyjson_mut_obj_add_strcpy(doc, obj, "name", ANSItoUTF8("反板定报警值").c_str());
 				yyjson_mut_obj_add_int(doc, obj, "value", pInfo->up_alarm_high_limit);
 
 				yyjson_mut_obj_add_str(doc, obj, "color", "Red");

4.Data/ResistAlarm.h

@@ -61,11 +61,11 @@ typedef struct tagSuobi_Over_Limit : public tagBaseInfo
 
 typedef struct tagConvertResist_Over_Limit : public tagBaseInfo
 {
-	int dw_alarm_low_limit = INT_MIN;	//伸出告警值
-	int dw_warn_low_limit = INT_MIN;	//伸出预警值
+	int dw_alarm_low_limit = INT_MIN;	//定板反报警值
+	int dw_warn_low_limit = INT_MIN;	//定板反预警值
 
-	int up_alarm_high_limit = INT_MAX;  //缩进告警值
-	int up_warn_high_limit = INT_MAX;  //缩进预警值
+	int up_alarm_high_limit = INT_MAX;  //反板定报警值
+	int up_warn_high_limit = INT_MAX;  //反板定预警值
 }CONVERT_RESIST_OVER_LIMIT;
 
 typedef struct tagRetension_Force_Drop : public  tagBaseInfo