From 43eed9ee5a33f49070f7daa69fbcb1bc663bbe30 Mon Sep 17 00:00:00 2001
From: like <1415600682@qq.com>
Date: 星期二, 06 五月 2025 16:23:31 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/InduSmartControl4.0
---
Client/王旭凯/log/日志_王旭凯_20250506.doc | 0
/dev/null | 4 ----
Server/申鑫/log/日志_申鑫_20250505.doc | 0
Server/陈松/log/陈松_20250506.docx | 0
Client/种祺轩/document/系统设置___需求分析.docx | 0
Server/魏兴宇/log/日志_魏兴宇_2025.5.6.doc | 0
Client/种祺轩/log/日志_种祺轩_2025.5.6.doc | 0
7 files changed, 0 insertions(+), 4 deletions(-)
diff --git "a/Client/\347\216\213\346\227\255\345\207\257/log/\346\227\245\345\277\227_\347\216\213\346\227\255\345\207\257_20250506.doc" "b/Client/\347\216\213\346\227\255\345\207\257/log/\346\227\245\345\277\227_\347\216\213\346\227\255\345\207\257_20250506.doc"
new file mode 100644
index 0000000..d263c6e
--- /dev/null
+++ "b/Client/\347\216\213\346\227\255\345\207\257/log/\346\227\245\345\277\227_\347\216\213\346\227\255\345\207\257_20250506.doc"
Binary files differ
diff --git "a/Client/\347\247\215\347\245\272\350\275\251/document/\347\263\273\347\273\237\350\256\276\347\275\256___\351\234\200\346\261\202\345\210\206\346\236\220.docx" "b/Client/\347\247\215\347\245\272\350\275\251/document/\347\263\273\347\273\237\350\256\276\347\275\256___\351\234\200\346\261\202\345\210\206\346\236\220.docx"
index 3a7c73c..a72eaf5 100644
--- "a/Client/\347\247\215\347\245\272\350\275\251/document/\347\263\273\347\273\237\350\256\276\347\275\256___\351\234\200\346\261\202\345\210\206\346\236\220.docx"
+++ "b/Client/\347\247\215\347\245\272\350\275\251/document/\347\263\273\347\273\237\350\256\276\347\275\256___\351\234\200\346\261\202\345\210\206\346\236\220.docx"
Binary files differ
diff --git "a/Client/\347\247\215\347\245\272\350\275\251/log/\346\227\245\345\277\227_\347\247\215\347\245\272\350\275\251_2025.5.6.doc" "b/Client/\347\247\215\347\245\272\350\275\251/log/\346\227\245\345\277\227_\347\247\215\347\245\272\350\275\251_2025.5.6.doc"
new file mode 100644
index 0000000..106f0a7
--- /dev/null
+++ "b/Client/\347\247\215\347\245\272\350\275\251/log/\346\227\245\345\277\227_\347\247\215\347\245\272\350\275\251_2025.5.6.doc"
Binary files differ
diff --git "a/Server/\347\224\263\351\221\253/code/ISC4_server_project/.vs/ISC4_server_project/FileContentIndex/d064e075-675b-4899-9574-ba89437afedf.vsidx" "b/Server/\347\224\263\351\221\253/code/ISC4_server_project/.vs/ISC4_server_project/FileContentIndex/d064e075-675b-4899-9574-ba89437afedf.vsidx"
deleted file mode 100644
index 5ed87cd..0000000
--- "a/Server/\347\224\263\351\221\253/code/ISC4_server_project/.vs/ISC4_server_project/FileContentIndex/d064e075-675b-4899-9574-ba89437afedf.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/Server/\347\224\263\351\221\253/code/ISC4_server_project/.vs/ISC4_server_project/v17/.suo" "b/Server/\347\224\263\351\221\253/code/ISC4_server_project/.vs/ISC4_server_project/v17/.suo"
deleted file mode 100644
index 358e738..0000000
--- "a/Server/\347\224\263\351\221\253/code/ISC4_server_project/.vs/ISC4_server_project/v17/.suo"
+++ /dev/null
Binary files differ
diff --git "a/Server/\347\224\263\351\221\253/code/ISC4_server_project/.vs/ISC4_server_project/v17/Browse.VC.db" "b/Server/\347\224\263\351\221\253/code/ISC4_server_project/.vs/ISC4_server_project/v17/Browse.VC.db"
deleted file mode 100644
index 2d67475..0000000
--- "a/Server/\347\224\263\351\221\253/code/ISC4_server_project/.vs/ISC4_server_project/v17/Browse.VC.db"
+++ /dev/null
Binary files differ
diff --git "a/Server/\347\224\263\351\221\253/code/ISC4_server_project/.vs/ISC4_server_project/v17/DocumentLayout.json" "b/Server/\347\224\263\351\221\253/code/ISC4_server_project/.vs/ISC4_server_project/v17/DocumentLayout.json"
deleted file mode 100644
index 54afa5d..0000000
--- "a/Server/\347\224\263\351\221\253/code/ISC4_server_project/.vs/ISC4_server_project/v17/DocumentLayout.json"
+++ /dev/null
@@ -1,43 +0,0 @@
-{
- "Version": 1,
- "WorkspaceRootPath": "E:\\InduSmartControl4.0\\Server\\\u7533\u946B\\code\\ISC4_server_project\\",
- "Documents": [],
- "DocumentGroupContainers": [
- {
- "Orientation": 0,
- "VerticalTabListWidth": 256,
- "DocumentGroups": [
- {
- "DockedWidth": 200,
- "SelectedChildIndex": -1,
- "Children": [
- {
- "$type": "Bookmark",
- "Name": "ST:0:0:{3ae79031-e1bc-11d0-8f78-00a0c9110057}"
- },
- {
- "$type": "Bookmark",
- "Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
- },
- {
- "$type": "Bookmark",
- "Name": "ST:129:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
- },
- {
- "$type": "Bookmark",
- "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}"
- },
- {
- "$type": "Bookmark",
- "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
- },
- {
- "$type": "Bookmark",
- "Name": "ST:128:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
- }
- ]
- }
- ]
- }
- ]
-}
\ No newline at end of file
diff --git "a/Server/\347\224\263\351\221\253/code/ISC4_server_project/ISC4_server_project.sln" "b/Server/\347\224\263\351\221\253/code/ISC4_server_project/ISC4_server_project.sln"
deleted file mode 100644
index 32e2f5c..0000000
--- "a/Server/\347\224\263\351\221\253/code/ISC4_server_project/ISC4_server_project.sln"
+++ /dev/null
@@ -1,31 +0,0 @@
-锘�
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.11.35327.3
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ISC4_server_project", "ISC4_server_project.vcxproj", "{9A230C46-DD69-4E5A-8C02-BE90E472334D}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|x64 = Debug|x64
- Debug|x86 = Debug|x86
- Release|x64 = Release|x64
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {9A230C46-DD69-4E5A-8C02-BE90E472334D}.Debug|x64.ActiveCfg = Debug|x64
- {9A230C46-DD69-4E5A-8C02-BE90E472334D}.Debug|x64.Build.0 = Debug|x64
- {9A230C46-DD69-4E5A-8C02-BE90E472334D}.Debug|x86.ActiveCfg = Debug|Win32
- {9A230C46-DD69-4E5A-8C02-BE90E472334D}.Debug|x86.Build.0 = Debug|Win32
- {9A230C46-DD69-4E5A-8C02-BE90E472334D}.Release|x64.ActiveCfg = Release|x64
- {9A230C46-DD69-4E5A-8C02-BE90E472334D}.Release|x64.Build.0 = Release|x64
- {9A230C46-DD69-4E5A-8C02-BE90E472334D}.Release|x86.ActiveCfg = Release|Win32
- {9A230C46-DD69-4E5A-8C02-BE90E472334D}.Release|x86.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {C69D9E5E-B521-46AB-8F35-A76D4C5F2E7E}
- EndGlobalSection
-EndGlobal
diff --git "a/Server/\347\224\263\351\221\253/code/ISC4_server_project/ISC4_server_project.vcxproj" "b/Server/\347\224\263\351\221\253/code/ISC4_server_project/ISC4_server_project.vcxproj"
deleted file mode 100644
index fe1c6f6..0000000
--- "a/Server/\347\224\263\351\221\253/code/ISC4_server_project/ISC4_server_project.vcxproj"
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
-
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <VCProjectVersion>17.0</VCProjectVersion>
- <Keyword>Win32Proj</Keyword>
- <ProjectGuid>{9a230c46-dd69-4e5a-8c02-be90e472334d}</ProjectGuid>
- <RootNamespace>ISC4serverproject</RootNamespace>
- <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v143</PlatformToolset>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v143</PlatformToolset>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v143</PlatformToolset>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v143</PlatformToolset>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
-
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Label="Shared" >
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
-
- <PropertyGroup Label="UserMacros" />
-
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <SDLCheck>true</SDLCheck>
- <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ConformanceMode>true</ConformanceMode>
- </ClCompile>
- <Link>
- <SubSystem>Console</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <SDLCheck>true</SDLCheck>
- <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ConformanceMode>true</ConformanceMode>
- </ClCompile>
- <Link>
- <SubSystem>Console</SubSystem>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <SDLCheck>true</SDLCheck>
- <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ConformanceMode>true</ConformanceMode>
- </ClCompile>
- <Link>
- <SubSystem>Console</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <SDLCheck>true</SDLCheck>
- <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ConformanceMode>true</ConformanceMode>
- </ClCompile>
- <Link>
- <SubSystem>Console</SubSystem>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- </Link>
- </ItemDefinitionGroup>
-
- <ItemGroup></ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git "a/Server/\347\224\263\351\221\253/code/ISC4_server_project/ISC4_server_project.vcxproj.filters" "b/Server/\347\224\263\351\221\253/code/ISC4_server_project/ISC4_server_project.vcxproj.filters"
deleted file mode 100644
index afef69e..0000000
--- "a/Server/\347\224\263\351\221\253/code/ISC4_server_project/ISC4_server_project.vcxproj.filters"
+++ /dev/null
@@ -1,17 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="婧愭枃浠�">
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- <Filter Include="澶存枃浠�">
- <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
- <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
- </Filter>
- <Filter Include="璧勬簮鏂囦欢">
- <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
- </Filter>
- </ItemGroup>
-</Project>
\ No newline at end of file
diff --git "a/Server/\347\224\263\351\221\253/code/ISC4_server_project/ISC4_server_project.vcxproj.user" "b/Server/\347\224\263\351\221\253/code/ISC4_server_project/ISC4_server_project.vcxproj.user"
deleted file mode 100644
index 88a5509..0000000
--- "a/Server/\347\224\263\351\221\253/code/ISC4_server_project/ISC4_server_project.vcxproj.user"
+++ /dev/null
@@ -1,4 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup />
-</Project>
\ No newline at end of file
diff --git "a/Server/\347\224\263\351\221\253/log/\346\227\245\345\277\227_\347\224\263\351\221\253_20250505.doc" "b/Server/\347\224\263\351\221\253/log/\346\227\245\345\277\227_\347\224\263\351\221\253_20250505.doc"
new file mode 100644
index 0000000..043cdb3
--- /dev/null
+++ "b/Server/\347\224\263\351\221\253/log/\346\227\245\345\277\227_\347\224\263\351\221\253_20250505.doc"
Binary files differ
diff --git "a/Server/\351\231\210\346\235\276/log/\351\231\210\346\235\276_20250506.docx" "b/Server/\351\231\210\346\235\276/log/\351\231\210\346\235\276_20250506.docx"
new file mode 100644
index 0000000..c5725a0
--- /dev/null
+++ "b/Server/\351\231\210\346\235\276/log/\351\231\210\346\235\276_20250506.docx"
Binary files differ
diff --git "a/Server/\351\255\217\345\205\264\345\256\207/log/\346\227\245\345\277\227_\351\255\217\345\205\264\345\256\207_2025.5.6.doc" "b/Server/\351\255\217\345\205\264\345\256\207/log/\346\227\245\345\277\227_\351\255\217\345\205\264\345\256\207_2025.5.6.doc"
index e4253d0..bf30b76 100644
--- "a/Server/\351\255\217\345\205\264\345\256\207/log/\346\227\245\345\277\227_\351\255\217\345\205\264\345\256\207_2025.5.6.doc"
+++ "b/Server/\351\255\217\345\205\264\345\256\207/log/\346\227\245\345\277\227_\351\255\217\345\205\264\345\256\207_2025.5.6.doc"
Binary files differ
--
Gitblit v1.8.0