提交信息!

This commit is contained in:
Kane Wang 2020-10-12 17:39:34 +08:00
parent 1c1989931a
commit 3b52e2cbc8
5 changed files with 41 additions and 37 deletions

View File

@ -80,9 +80,9 @@
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{B12702AD-ABFB-343A-A199-8E24837244A3}</ProjectGuid> <ProjectGuid>{B12702AD-ABFB-343A-A199-8E24837244A3}</ProjectGuid>
<Keyword>QtVS_v301</Keyword> <Keyword>QtVS_v303</Keyword>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup> <QtMsBuild Condition="'$(QtMsBuild)'=='' or !Exists('$(QtMsBuild)\qt.targets')">$(MSBuildProjectDirectory)\QtMsBuild</QtMsBuild></PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
@ -93,19 +93,9 @@
<PlatformToolset>v142</PlatformToolset> <PlatformToolset>v142</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<PropertyGroup Condition="'$(QtMsBuild)'=='' or !Exists('$(QtMsBuild)\qt.targets')">
<QtMsBuild>$(MSBuildProjectDirectory)\QtMsBuild</QtMsBuild>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<SourcePath>.\source\;vs2019\car_dealer_util\source\;$(SourcePath)</SourcePath>
<IncludePath>vs2019\car_dealer_util\source\;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<SourcePath>.\source\;vs2019\car_dealer_util\source\;$(SourcePath)</SourcePath>
<IncludePath>vs2019\car_dealer_util\source\;$(IncludePath)</IncludePath>
</PropertyGroup>
<Target Name="QtMsBuildNotFound" BeforeTargets="CustomBuild;ClCompile" Condition="!Exists('$(QtMsBuild)\qt.targets') or !Exists('$(QtMsBuild)\qt.props')"> <Target Name="QtMsBuildNotFound" BeforeTargets="CustomBuild;ClCompile" Condition="!Exists('$(QtMsBuild)\qt.targets') or !Exists('$(QtMsBuild)\qt.props')">
<Message Importance="High" Text="QtMsBuild: could not locate qt.targets, qt.props; project may not build correctly." /> <Message Importance="High" Text="QtMsBuild: could not locate qt.targets, qt.props; project may not build correctly." />
</Target> </Target>
@ -124,7 +114,7 @@
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<ImportGroup Condition="Exists('$(QtMsBuild)\qt_defaults.props')"> <ImportGroup Condition="Exists('$(QtMsBuild)\qt_defaults.props')">
<Import Project="$(QtMsBuild)\qt_defaults.props" /> <Import Project="$(QtMsBuild)\qt_defaults.props" />
</ImportGroup> </ImportGroup><PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"><OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir><SourcePath>.\source\;vs2019\car_dealer_util\source\;$(SourcePath)</SourcePath><IncludePath>vs2019\car_dealer_util\source\;$(IncludePath)</IncludePath></PropertyGroup><PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"><OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir><SourcePath>.\source\;vs2019\car_dealer_util\source\;$(SourcePath)</SourcePath><IncludePath>vs2019\car_dealer_util\source\;$(IncludePath)</IncludePath></PropertyGroup>
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<QtInstall>5.14.2_msvc2017_x64</QtInstall> <QtInstall>5.14.2_msvc2017_x64</QtInstall>
<QtModules>core;gui;widgets</QtModules> <QtModules>core;gui;widgets</QtModules>
@ -152,8 +142,8 @@
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile> <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
<AdditionalIncludeDirectories>..\..\..\source\widgets\LoginWidget;..\..\..\source\widgets\ContentWidget\QDataManagementWidget;..\..\..\source\Widgets\ContentWidget\QCarDealerSchemaWidget;..\..\..\source\Widgets\ContentWidget\QCarDealerAchievementWidget;..\..\..\source\Widgets\ContentWidget\QRepairOrderWidget;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>.\GeneratedFiles\$(ConfigurationName);.\GeneratedFiles;..\..\..\source\widgets\LoginWidget;..\..\..\source\widgets\ContentWidget\QDataManagementWidget;..\..\..\source\Widgets\ContentWidget\QCarDealerSchemaWidget;..\..\..\source\Widgets\ContentWidget\QCarDealerAchievementWidget;..\..\..\source\Widgets\ContentWidget\QRepairOrderWidget;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> <MultiProcessorCompilation>true</MultiProcessorCompilation></ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile> <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
@ -180,8 +170,8 @@
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile> <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
<AdditionalIncludeDirectories>..\..\..\source\widgets\LoginWidget;..\..\..\source\widgets\ContentWidget\QDataManagementWidget;..\..\..\source\Widgets\ContentWidget\QCarDealerSchemaWidget;..\..\..\source\Widgets\ContentWidget\QCarDealerAchievementWidget;..\..\..\source\Widgets\ContentWidget\QRepairOrderWidget;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>.\GeneratedFiles\$(ConfigurationName);.\GeneratedFiles;..\..\..\source\widgets\LoginWidget;..\..\..\source\widgets\ContentWidget\QDataManagementWidget;..\..\..\source\Widgets\ContentWidget\QCarDealerSchemaWidget;..\..\..\source\Widgets\ContentWidget\QCarDealerAchievementWidget;..\..\..\source\Widgets\ContentWidget\QRepairOrderWidget;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> <MultiProcessorCompilation>true</MultiProcessorCompilation></ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile> <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>

View File

@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE
QT_WARNING_PUSH QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED QT_WARNING_DISABLE_DEPRECATED
struct qt_meta_stringdata_QCarDealerAchievementWidget_t { struct qt_meta_stringdata_QCarDealerAchievementWidget_t {
QByteArrayData data[3]; QByteArrayData data[4];
char stringdata0[38]; char stringdata0[65];
}; };
#define QT_MOC_LITERAL(idx, ofs, len) \ #define QT_MOC_LITERAL(idx, ofs, len) \
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
@ -34,11 +34,12 @@ static const qt_meta_stringdata_QCarDealerAchievementWidget_t qt_meta_stringdata
{ {
QT_MOC_LITERAL(0, 0, 27), // "QCarDealerAchievementWidget" QT_MOC_LITERAL(0, 0, 27), // "QCarDealerAchievementWidget"
QT_MOC_LITERAL(1, 28, 8), // "onImport" QT_MOC_LITERAL(1, 28, 8), // "onImport"
QT_MOC_LITERAL(2, 37, 0) // "" QT_MOC_LITERAL(2, 37, 0), // ""
QT_MOC_LITERAL(3, 38, 26) // "onShowCarDealerAchievement"
}, },
"QCarDealerAchievementWidget\0onImport\0" "QCarDealerAchievementWidget\0onImport\0"
"" "\0onShowCarDealerAchievement"
}; };
#undef QT_MOC_LITERAL #undef QT_MOC_LITERAL
@ -48,7 +49,7 @@ static const uint qt_meta_data_QCarDealerAchievementWidget[] = {
8, // revision 8, // revision
0, // classname 0, // classname
0, 0, // classinfo 0, 0, // classinfo
1, 14, // methods 2, 14, // methods
0, 0, // properties 0, 0, // properties
0, 0, // enums/sets 0, 0, // enums/sets
0, 0, // constructors 0, 0, // constructors
@ -56,9 +57,11 @@ static const uint qt_meta_data_QCarDealerAchievementWidget[] = {
0, // signalCount 0, // signalCount
// slots: name, argc, parameters, tag, flags // slots: name, argc, parameters, tag, flags
1, 0, 19, 2, 0x09 /* Protected */, 1, 0, 24, 2, 0x09 /* Protected */,
3, 0, 25, 2, 0x09 /* Protected */,
// slots: parameters // slots: parameters
QMetaType::Void,
QMetaType::Void, QMetaType::Void,
0 // eod 0 // eod
@ -71,6 +74,7 @@ void QCarDealerAchievementWidget::qt_static_metacall(QObject *_o, QMetaObject::C
Q_UNUSED(_t) Q_UNUSED(_t)
switch (_id) { switch (_id) {
case 0: _t->onImport(); break; case 0: _t->onImport(); break;
case 1: _t->onShowCarDealerAchievement(); break;
default: ; default: ;
} }
} }
@ -106,13 +110,13 @@ int QCarDealerAchievementWidget::qt_metacall(QMetaObject::Call _c, int _id, void
if (_id < 0) if (_id < 0)
return _id; return _id;
if (_c == QMetaObject::InvokeMetaMethod) { if (_c == QMetaObject::InvokeMetaMethod) {
if (_id < 1) if (_id < 2)
qt_static_metacall(this, _c, _id, _a); qt_static_metacall(this, _c, _id, _a);
_id -= 1; _id -= 2;
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
if (_id < 1) if (_id < 2)
*reinterpret_cast<int*>(_a[0]) = -1; *reinterpret_cast<int*>(_a[0]) = -1;
_id -= 1; _id -= 2;
} }
return _id; return _id;
} }

View File

@ -1,6 +1,8 @@
#include <QFileDialog> #include <QFileDialog>
#include "QCarDealerAchievementWidget.h" #include "QCarDealerAchievementWidget.h"
#include <QMessageBox>
#include <stdexcept> #include <stdexcept>
@ -50,12 +52,21 @@ void QCarDealerAchievementWidget::onImport()
} }
catch ( runtime_error & error ) catch ( runtime_error & error )
{ {
QMessageBox::critical( this,
"错误",
error.what() );
return;
} }
} }
void QCarDealerAchievementWidget::onShowCarDealerAchievement()
{
ui.pTableWidgetAchievement->clearContents();
}
void QCarDealerAchievementWidget::init() void QCarDealerAchievementWidget::init()
{ {
initData(); initData();

View File

@ -14,6 +14,7 @@ public:
protected Q_SLOTS: protected Q_SLOTS:
void onImport(); void onImport();
void onShowCarDealerAchievement();
private: private:
void init(); void init();
@ -21,8 +22,6 @@ private:
void initWidgets(); void initWidgets();
void initSignal(); void initSignal();
private: private:
Ui::QCarDealerAchievementWidget ui; Ui::QCarDealerAchievementWidget ui;

View File

@ -71,7 +71,7 @@
</layout> </layout>
</item> </item>
<item> <item>
<widget class="QTableWidget" name="tableWidget"> <widget class="QTableWidget" name="pTableWidgetAchievement">
<column> <column>
<property name="text"> <property name="text">
<string>年度</string> <string>年度</string>