Merge branch 'main' of http://git.hivekion.com:3000/jiayulong/logplus

Slfio/include/MemRdWt.h

@@ -125,7 +125,7 @@ public:
 	CMemRdWt(const char *wellname,bool mconst=FALSE,int FileType=0);
 	~CMemRdWt();
 
-    static bool getPrjAllSlf(QString prjname, QVector<QString> &vecSlfList, QVector<QString> &vecWellList);//直方图，获取当前工程下的slf
+    static bool getPrjAllSlf(QString prjname, QVector<QString> &vecSlfList, QVector<QString> &vecWellList);//获取当前工程下的slf
 
 	void Initialize(bool mconst=FALSE);
 	void BackData();

logPlus/formdraw.cpp

@@ -431,7 +431,8 @@ void FormDraw::DisplayLines(QJsonArray linesArray)
                         }
                         if (strLineName == "GUJING1_RESULT" || strLineName == "GUJING2_RESULT" || strLineName == "GUJING3_RESULT"
                                 || strLineName == "WORDS_RELUST" || strLineName == "GEO_LITH" || strLineName == "SWALL_CORE"
-                                || strLineName == "LAYER_DATA")
+                                || strLineName == "LAYER_DATA"
+                                || strLineName == "RESULT")
                         {
                             //固井结论/井壁取心/录井剖面/文字结论/地质分层
                             DisplayTable_One(lineObjInfo);