DFS_Shuo_Chen пре 2 месеци
родитељ
комит
cb6549637e

+ 3 - 0
.gitignore

@@ -167,3 +167,6 @@ VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统
 VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包V1.16.28/
 VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包V1.16.28.zip
 VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor.aps
+VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包V1.16.29/安装升级.bat
+VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包V1.16.29/
+VaporRecoveryMonitor/油气回收系统安装包/油气回收在线监控系统安装包V1.16.29.zip

BIN
VaporRecoveryMonitor/VaporRecoveryMonitor/Bin/VaporRecoveryMonitor.exe


BIN
VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor.v12.suo


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


BIN
VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/Release/VaporRec.A31C344F.tlog/CL.write.1.tlog


BIN
VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/Release/VaporRec.A31C344F.tlog/cl.command.1.tlog


+ 7 - 7
VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/Release/VaporRecoveryMonitor.log

@@ -1,11 +1,11 @@
-Build started 2025/9/29 11:10:52.
+Build started 2025/10/11 15:30:06.
      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 WebLink_GD_JY.cpp global.cpp
-         WebLink_GD_JY.cpp
-     1>WebLink_GD_JY.cpp(204): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_JY.cpp(271): warning C4018: '<' : signed/unsigned mismatch
-     1>WebLink_GD_JY.cpp(790): warning C4018: '<' : signed/unsigned mismatch
+         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 WebLink_BJ.cpp global.cpp
+         WebLink_BJ.cpp
+     1>WebLink_BJ.cpp(167): warning C4018: '<' : signed/unsigned mismatch
+     1>WebLink_BJ.cpp(465): warning C4018: '<' : signed/unsigned mismatch
+     1>WebLink_BJ.cpp(663): warning C4018: '<' : signed/unsigned mismatch
          global.cpp
      1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\SM4.h(290): warning C4101: 'szArray' : unreferenced local variable
      1>c:\bitbucket\apacsys-vaporrecoverymonitor_new\vaporrecoverymonitor\vaporrecoverymonitor\vaporrecoverymonitor\SM4.h(315): warning C4101: 'i' : unreferenced local variable
@@ -157,4 +157,4 @@
 
 Build succeeded.
 
-Time Elapsed 00:00:14.53
+Time Elapsed 00:00:15.88

+ 2 - 2
VaporRecoveryMonitor/VaporRecoveryMonitor/VaporRecoveryMonitor/WebLink_BJ.cpp

@@ -398,8 +398,8 @@ void CWebLink_BJ::PackWebData_Record(VR::WebData& webdata, const VR::notify::fil
 	data += "<row>";
 	data += "<ID>" + string(chID) + "</ID>";
 	data += "<DATE>" + string(record.tmEnd) + "</DATE>"; //tmEnd
-	data += "<JYJID>" + string(chFip) + "</JYJID>";	//加油点
-	data += "<JYQID>" + string(chNoz) + "</JYQID>";  //枪号 nozzle
+	data += "<JYJID>" + to_string(record.fip) + "</JYJID>";	//加油点
+	data += "<JYQID>" + to_string(record.nozzle) + "</JYQID>";  //枪号 nozzle
 	data += "<AL>" + string(chAL) + "</AL>";	//气液比 VLR 900
 	data += "<QLS>" + string(chQLS) + "</QLS>";	//气流速 vaporFR 700
 	data += "<QLL>" + string(chQLL) + "</QLL>"; //气流量 vaporVL 5000

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

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

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


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