DFS_Shuo_Chen 3 mesiacov pred
rodič
commit
0079500fc3

+ 1 - 0
.gitignore

@@ -163,3 +163,4 @@ RecordExtractor/RecordExtractor.sdf
 RecordExtractor/RecordExtractor/RecordExtractor.aps
 VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包V1.16.26.zip
 RecordExtractor/Debug/RecordExtractor.exe
+VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包V1.16.27.zip

+ 2 - 2
ChatRoomClient-VR/Release/conn.ini

@@ -1,12 +1,12 @@
 [Config]
 fip=1
-noz=19
+noz=1
 YLS=10.00
 QLS=10.00
 YL=15.00
 QL=15.00
 VL=1.00
-TTC=82
+TTC=87
 ERROR=0
 PRESS=10
 PWM=10

BIN
VaporRecoveryMonitor/VaporRecoveryMonitor/Bin/VaporRecoveryMonitor.exe


BIN
VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor.v12.suo


BIN
VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/Release/VaporRec.A31C344F.tlog/link.read.1.tlog


+ 3 - 3
VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/Release/VaporRecoveryMonitor.log

@@ -1,4 +1,4 @@
-Build started 2025/9/16 13:36:54.
+Build started 2025/9/17 9:16:48.
      1>Project "C:\bitbucket\apacsys-vaporrecoverymonitor_new\VaporRecoveryMonitor\VaporRecoveryMonitor\VaporRecoveryMonitor\VaporRecoveryMonitor.vcxproj" on node 2 (Build target(s)).
      1>ClCompile:
          C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\CL.exe /c /I..\..\..\SDK\DuiLib /I..\VaporRecoveryMonitor /I..\..\..\cryptopp /Zi /nologo /W3 /WX- /sdl /Od /Oi /Oy- /GL /D WIN32 /D NDEBUG /D _WINDOWS /D _CRT_NONSTDC_NO_DEPRECATE /D _CRT_SECURE_NO_WARNINGS /D _USING_V110_SDK71_ /D _UNICODE /D UNICODE /Gm- /EHsc /MT /GS /Gy /fp:precise /Zc:wchar_t /Zc:forScope /Yu"stdafx.h" /Fp"Release\VaporRecoveryMonitor.pch" /Fo"Release\\" /Fd"Release\vc120.pdb" /Gd /TP /analyze- /errorReport:prompt global.cpp
@@ -110,8 +110,8 @@
          Release\vr_ui.obj
          Generating code
      1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\global.h(187): warning C4715: 'Area::getArea' : not all control paths return a value
-     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\vr_ext.cpp(1047): warning C4715: 'ThreadHandle_Start_2' : not all control paths return a value
      1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\vr_ext.cpp(1095): warning C4715: 'ThreadHandle_Start_3' : not all control paths return a value
+     1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\vr_ext.cpp(1047): warning C4715: 'ThreadHandle_Start_2' : not all control paths return a value
      1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\vr_ext.cpp(991): warning C4715: 'ThreadHandle_Start' : not all control paths return a value
          Finished generating code
      1>cryptlib.lib(cryptlib.obj) : warning LNK4099: PDB 'vc120.pdb' was not found with 'cryptlib.lib(cryptlib.obj)' or at 'C:\bitbucket\apacsys-vaporrecoverymonitor_new\VaporRecoveryMonitor\VaporRecoveryMonitor\Bin\vc120.pdb'; linking object as if no debug info
@@ -153,4 +153,4 @@
 
 Build succeeded.
 
-Time Elapsed 00:00:15.32
+Time Elapsed 00:00:12.39

+ 1 - 1
VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/conn.ini

@@ -959,7 +959,7 @@ configupdatetime=20250910150916
 
 [RunningState]
 UnLockFlag=000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-Date=20250916
+Date=20250917
 TradeFlag=100000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000
 
 

+ 1 - 1
VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/global.cpp

@@ -25,7 +25,7 @@
 
 using namespace VR::notify;
 
-string g_version = "V1.16.26";
+string g_version = "V1.16.27";
 
 
 int g_read_unuploadday = 31;	//程序开启时读未上传交易的天数 非特殊情况皆为31天

+ 2 - 1
VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/vr_app.cpp

@@ -3840,8 +3840,9 @@ DWORD __stdcall ThreadHandle_Search(LPVOID lparam)
 
 	pthis->searchrecordset.clear();
 
-	db.query_filling(pthis->searchrecordset, nid, -1, s_tm_begin, s_tm_end,1);
+	db.query_filling(pthis->searchrecordset, nid, -1, s_tm_begin, s_tm_end,0);
 
+	reverse(pthis->searchrecordset.begin(),pthis->searchrecordset.end());
 		
 	pthis->searchpage.init(pthis->searchrecordset.size());
 	pthis->showSearchPage();

BIN
VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控_版本发布说明.xlsx


BIN
VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包/files/VR/VaporRecoveryMonitor.exe