From cafe6ca2703e717aa47842fbb1448d6e576248f9 Mon Sep 17 00:00:00 2001
From: sa <1843361571@qq.com>
Date: 星期五, 25 七月 2025 10:21:03 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/天开景运_0405_250719
---
Server/韩启轩/log/日志_韩启轩_0724.doc | 0
Server/李晨飞/log/日志_李晨飞_0724.doc | 0
Server/韩启轩/document/数据库搭建与日志封装功能分析.docx | 0
Server/杜国庆/log/日志_Dgq_250724 .docx | 0
Server/杜国庆/code/BG_Mon_Subsystem/BG_Mon_Subsystem.pro.user | 17 +++++---
Server/杜国庆/code/BG_Mon_Subsystem/gb_mon_subsystem_mainwindow.ui | 86 +++++++++++++++++++++++++++++++++++++-----
6 files changed, 85 insertions(+), 18 deletions(-)
diff --git "a/Server/\346\235\216\346\231\250\351\243\236/log/\346\227\245\345\277\227_\346\235\216\346\231\250\351\243\236_0724.doc" "b/Server/\346\235\216\346\231\250\351\243\236/log/\346\227\245\345\277\227_\346\235\216\346\231\250\351\243\236_0724.doc"
new file mode 100644
index 0000000..e2aad96
--- /dev/null
+++ "b/Server/\346\235\216\346\231\250\351\243\236/log/\346\227\245\345\277\227_\346\235\216\346\231\250\351\243\236_0724.doc"
Binary files differ
diff --git "a/Server/\346\235\234\345\233\275\345\272\206/code/BG_Mon_Subsystem/BG_Mon_Subsystem.pro.user" "b/Server/\346\235\234\345\233\275\345\272\206/code/BG_Mon_Subsystem/BG_Mon_Subsystem.pro.user"
index 2d4b7ee..c5ea373 100644
--- "a/Server/\346\235\234\345\233\275\345\272\206/code/BG_Mon_Subsystem/BG_Mon_Subsystem.pro.user"
+++ "b/Server/\346\235\234\345\233\275\345\272\206/code/BG_Mon_Subsystem/BG_Mon_Subsystem.pro.user"
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.5.0, 2025-07-24T09:25:08. -->
+<!-- Written by QtCreator 4.5.0, 2025-07-24T15:02:24. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
@@ -282,14 +282,17 @@
<value type="int">13</value>
<value type="int">14</value>
</valuelist>
- <value type="int" key="PE.EnvironmentAspect.Base">-1</value>
+ <value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
- <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Arguments"></value>
- <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable"></value>
- <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.WorkingDirectory">%{buildDir}</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Custom Executable</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">BG_Mon_Subsystem</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:F:/Git/澶╁紑鏅繍_0405_250719/Server/鏉滃浗搴�/code/BG_Mon_Subsystem/BG_Mon_Subsystem.pro</value>
+ <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
+ <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
+ <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">BG_Mon_Subsystem.pro</value>
+ <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
+ <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
+ <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">F:/Git/澶╁紑鏅繍_0405_250719/Server/鏉滃浗搴�/code/build-BG_Mon_Subsystem-Desktop_Qt_5_9_4_MinGW_32bit-Debug</value>
<value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
diff --git "a/Server/\346\235\234\345\233\275\345\272\206/code/BG_Mon_Subsystem/gb_mon_subsystem_mainwindow.ui" "b/Server/\346\235\234\345\233\275\345\272\206/code/BG_Mon_Subsystem/gb_mon_subsystem_mainwindow.ui"
index d6c0505..e788bbf 100644
--- "a/Server/\346\235\234\345\233\275\345\272\206/code/BG_Mon_Subsystem/gb_mon_subsystem_mainwindow.ui"
+++ "b/Server/\346\235\234\345\233\275\345\272\206/code/BG_Mon_Subsystem/gb_mon_subsystem_mainwindow.ui"
@@ -1,24 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>GB_Mon_Subsystem_MainWindow</class>
- <widget class="QMainWindow" name="GB_Mon_Subsystem_MainWindow" >
- <property name="geometry" >
+ <widget class="QMainWindow" name="GB_Mon_Subsystem_MainWindow">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>400</width>
- <height>300</height>
+ <width>1001</width>
+ <height>585</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>GB_Mon_Subsystem_MainWindow</string>
</property>
- <widget class="QMenuBar" name="menuBar" />
- <widget class="QToolBar" name="mainToolBar" />
- <widget class="QWidget" name="centralWidget" />
- <widget class="QStatusBar" name="statusBar" />
+ <widget class="QWidget" name="centralWidget">
+ <widget class="QPushButton" name="pushButton">
+ <property name="geometry">
+ <rect>
+ <x>150</x>
+ <y>310</y>
+ <width>93</width>
+ <height>28</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>PushButton</string>
+ </property>
+ </widget>
+ <widget class="QPushButton" name="pushButton_2">
+ <property name="geometry">
+ <rect>
+ <x>640</x>
+ <y>310</y>
+ <width>93</width>
+ <height>28</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>PushButton</string>
+ </property>
+ </widget>
+ <widget class="QTableWidget" name="tableWidget">
+ <property name="geometry">
+ <rect>
+ <x>150</x>
+ <y>60</y>
+ <width>581</width>
+ <height>211</height>
+ </rect>
+ </property>
+ <row>
+ <property name="text">
+ <string>鏂板缓琛�</string>
+ </property>
+ </row>
+ <row>
+ <property name="text">
+ <string>鏂板缓琛�</string>
+ </property>
+ </row>
+ <row>
+ <property name="text">
+ <string>鏂板缓琛�</string>
+ </property>
+ </row>
+ <column>
+ <property name="text">
+ <string>纾佺洏璇诲叆</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>纾佺洏鍐�</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>cpu浣跨敤鐜�</string>
+ </property>
+ </column>
+ </widget>
+ </widget>
</widget>
- <layoutDefault spacing="6" margin="11" />
- <pixmapfunction></pixmapfunction>
+ <layoutdefault spacing="6" margin="11"/>
<resources/>
<connections/>
</ui>
diff --git "a/Server/\346\235\234\345\233\275\345\272\206/log/\346\227\245\345\277\227_Dgq_250724 .docx" "b/Server/\346\235\234\345\233\275\345\272\206/log/\346\227\245\345\277\227_Dgq_250724 .docx"
index 2e7ec67..688d87f 100644
--- "a/Server/\346\235\234\345\233\275\345\272\206/log/\346\227\245\345\277\227_Dgq_250724 .docx"
+++ "b/Server/\346\235\234\345\233\275\345\272\206/log/\346\227\245\345\277\227_Dgq_250724 .docx"
Binary files differ
diff --git "a/Server/\351\237\251\345\220\257\350\275\251/document/\346\225\260\346\215\256\345\272\223\346\220\255\345\273\272\344\270\216\346\227\245\345\277\227\345\260\201\350\243\205\345\212\237\350\203\275\345\210\206\346\236\220.docx" "b/Server/\351\237\251\345\220\257\350\275\251/document/\346\225\260\346\215\256\345\272\223\346\220\255\345\273\272\344\270\216\346\227\245\345\277\227\345\260\201\350\243\205\345\212\237\350\203\275\345\210\206\346\236\220.docx"
index dd082a1..e14bd98 100644
--- "a/Server/\351\237\251\345\220\257\350\275\251/document/\346\225\260\346\215\256\345\272\223\346\220\255\345\273\272\344\270\216\346\227\245\345\277\227\345\260\201\350\243\205\345\212\237\350\203\275\345\210\206\346\236\220.docx"
+++ "b/Server/\351\237\251\345\220\257\350\275\251/document/\346\225\260\346\215\256\345\272\223\346\220\255\345\273\272\344\270\216\346\227\245\345\277\227\345\260\201\350\243\205\345\212\237\350\203\275\345\210\206\346\236\220.docx"
Binary files differ
diff --git "a/Server/\351\237\251\345\220\257\350\275\251/log/\346\227\245\345\277\227_\351\237\251\345\220\257\350\275\251_0724.doc" "b/Server/\351\237\251\345\220\257\350\275\251/log/\346\227\245\345\277\227_\351\237\251\345\220\257\350\275\251_0724.doc"
new file mode 100644
index 0000000..40929f3
--- /dev/null
+++ "b/Server/\351\237\251\345\220\257\350\275\251/log/\346\227\245\345\277\227_\351\237\251\345\220\257\350\275\251_0724.doc"
Binary files differ
--
Gitblit v1.8.0