diff --git a/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/car_dealer_util.vcxproj b/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/car_dealer_util.vcxproj
index ee80c15..51cfdb0 100644
--- a/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/car_dealer_util.vcxproj
+++ b/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/car_dealer_util.vcxproj
@@ -126,11 +126,11 @@
- 5.13.1_msvc2017_x64
+ 5.14.2_msvc2017_x64
core;gui;widgets
- 5.13.1_msvc2017_x64
+ 5.14.2_msvc2017_x64
core;gui;widgets
diff --git a/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/Widgets/ContentWidget/QCarDealerAchievementWidget/moc_QCarDealerAchievementWidget.cpp b/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/Widgets/ContentWidget/QCarDealerAchievementWidget/moc_QCarDealerAchievementWidget.cpp
index c9c7ce2..895b74c 100644
--- a/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/Widgets/ContentWidget/QCarDealerAchievementWidget/moc_QCarDealerAchievementWidget.cpp
+++ b/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/Widgets/ContentWidget/QCarDealerAchievementWidget/moc_QCarDealerAchievementWidget.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'QCarDealerAchievementWidget.h'
**
-** Created by: The Qt Meta Object Compiler version 67 (Qt 5.13.1)
+** Created by: The Qt Meta Object Compiler version 67 (Qt 5.14.2)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
@@ -13,7 +13,7 @@
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'QCarDealerAchievementWidget.h' doesn't include ."
#elif Q_MOC_OUTPUT_REVISION != 67
-#error "This file was generated using the moc from 5.13.1. It"
+#error "This file was generated using the moc from 5.14.2. It"
#error "cannot be used with the include files from this version of Qt."
#error "(The moc has changed too much.)"
#endif
@@ -22,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE
QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED
struct qt_meta_stringdata_QCarDealerAchievementWidget_t {
- QByteArrayData data[1];
- char stringdata0[28];
+ QByteArrayData data[3];
+ char stringdata0[38];
};
#define QT_MOC_LITERAL(idx, ofs, len) \
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
@@ -32,10 +32,13 @@ struct qt_meta_stringdata_QCarDealerAchievementWidget_t {
)
static const qt_meta_stringdata_QCarDealerAchievementWidget_t qt_meta_stringdata_QCarDealerAchievementWidget = {
{
-QT_MOC_LITERAL(0, 0, 27) // "QCarDealerAchievementWidget"
+QT_MOC_LITERAL(0, 0, 27), // "QCarDealerAchievementWidget"
+QT_MOC_LITERAL(1, 28, 8), // "onImport"
+QT_MOC_LITERAL(2, 37, 0) // ""
},
- "QCarDealerAchievementWidget"
+ "QCarDealerAchievementWidget\0onImport\0"
+ ""
};
#undef QT_MOC_LITERAL
@@ -45,26 +48,37 @@ static const uint qt_meta_data_QCarDealerAchievementWidget[] = {
8, // revision
0, // classname
0, 0, // classinfo
- 0, 0, // methods
+ 1, 14, // methods
0, 0, // properties
0, 0, // enums/sets
0, 0, // constructors
0, // flags
0, // signalCount
+ // slots: name, argc, parameters, tag, flags
+ 1, 0, 19, 2, 0x09 /* Protected */,
+
+ // slots: parameters
+ QMetaType::Void,
+
0 // eod
};
void QCarDealerAchievementWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
{
- Q_UNUSED(_o);
- Q_UNUSED(_id);
- Q_UNUSED(_c);
+ if (_c == QMetaObject::InvokeMetaMethod) {
+ auto *_t = static_cast(_o);
+ Q_UNUSED(_t)
+ switch (_id) {
+ case 0: _t->onImport(); break;
+ default: ;
+ }
+ }
Q_UNUSED(_a);
}
QT_INIT_METAOBJECT const QMetaObject QCarDealerAchievementWidget::staticMetaObject = { {
- &QWidget::staticMetaObject,
+ QMetaObject::SuperData::link(),
qt_meta_stringdata_QCarDealerAchievementWidget.data,
qt_meta_data_QCarDealerAchievementWidget,
qt_static_metacall,
@@ -89,6 +103,17 @@ void *QCarDealerAchievementWidget::qt_metacast(const char *_clname)
int QCarDealerAchievementWidget::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
{
_id = QWidget::qt_metacall(_c, _id, _a);
+ if (_id < 0)
+ return _id;
+ if (_c == QMetaObject::InvokeMetaMethod) {
+ if (_id < 1)
+ qt_static_metacall(this, _c, _id, _a);
+ _id -= 1;
+ } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
+ if (_id < 1)
+ *reinterpret_cast(_a[0]) = -1;
+ _id -= 1;
+ }
return _id;
}
QT_WARNING_POP
diff --git a/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/Widgets/ContentWidget/QCarDealerSchemaWidget/moc_QCarDealerSchemaWidget.cpp b/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/Widgets/ContentWidget/QCarDealerSchemaWidget/moc_QCarDealerSchemaWidget.cpp
index a600d8c..6ac6bee 100644
--- a/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/Widgets/ContentWidget/QCarDealerSchemaWidget/moc_QCarDealerSchemaWidget.cpp
+++ b/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/Widgets/ContentWidget/QCarDealerSchemaWidget/moc_QCarDealerSchemaWidget.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'QCarDealerSchemaWidget.h'
**
-** Created by: The Qt Meta Object Compiler version 67 (Qt 5.13.1)
+** Created by: The Qt Meta Object Compiler version 67 (Qt 5.14.2)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
@@ -13,7 +13,7 @@
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'QCarDealerSchemaWidget.h' doesn't include ."
#elif Q_MOC_OUTPUT_REVISION != 67
-#error "This file was generated using the moc from 5.13.1. It"
+#error "This file was generated using the moc from 5.14.2. It"
#error "cannot be used with the include files from this version of Qt."
#error "(The moc has changed too much.)"
#endif
@@ -64,7 +64,7 @@ void QCarDealerSchemaWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _
}
QT_INIT_METAOBJECT const QMetaObject QCarDealerSchemaWidget::staticMetaObject = { {
- &QWidget::staticMetaObject,
+ QMetaObject::SuperData::link(),
qt_meta_stringdata_QCarDealerSchemaWidget.data,
qt_meta_data_QCarDealerSchemaWidget,
qt_static_metacall,
diff --git a/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/Widgets/ContentWidget/QDataManagementWidget/moc_QDataManagementWidget.cpp b/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/Widgets/ContentWidget/QDataManagementWidget/moc_QDataManagementWidget.cpp
index b658d34..454823e 100644
--- a/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/Widgets/ContentWidget/QDataManagementWidget/moc_QDataManagementWidget.cpp
+++ b/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/Widgets/ContentWidget/QDataManagementWidget/moc_QDataManagementWidget.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'QDataManagementWidget.h'
**
-** Created by: The Qt Meta Object Compiler version 67 (Qt 5.13.1)
+** Created by: The Qt Meta Object Compiler version 67 (Qt 5.14.2)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
@@ -13,7 +13,7 @@
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'QDataManagementWidget.h' doesn't include ."
#elif Q_MOC_OUTPUT_REVISION != 67
-#error "This file was generated using the moc from 5.13.1. It"
+#error "This file was generated using the moc from 5.14.2. It"
#error "cannot be used with the include files from this version of Qt."
#error "(The moc has changed too much.)"
#endif
@@ -64,7 +64,7 @@ void QDataManagementWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c
}
QT_INIT_METAOBJECT const QMetaObject QDataManagementWidget::staticMetaObject = { {
- &QWidget::staticMetaObject,
+ QMetaObject::SuperData::link(),
qt_meta_stringdata_QDataManagementWidget.data,
qt_meta_data_QDataManagementWidget,
qt_static_metacall,
diff --git a/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/Widgets/ContentWidget/QRepairOrderWidget/moc_QRepairOrderWidget.cpp b/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/Widgets/ContentWidget/QRepairOrderWidget/moc_QRepairOrderWidget.cpp
index 77b6390..438f4e4 100644
--- a/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/Widgets/ContentWidget/QRepairOrderWidget/moc_QRepairOrderWidget.cpp
+++ b/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/Widgets/ContentWidget/QRepairOrderWidget/moc_QRepairOrderWidget.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'QRepairOrderWidget.h'
**
-** Created by: The Qt Meta Object Compiler version 67 (Qt 5.13.1)
+** Created by: The Qt Meta Object Compiler version 67 (Qt 5.14.2)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
@@ -13,7 +13,7 @@
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'QRepairOrderWidget.h' doesn't include ."
#elif Q_MOC_OUTPUT_REVISION != 67
-#error "This file was generated using the moc from 5.13.1. It"
+#error "This file was generated using the moc from 5.14.2. It"
#error "cannot be used with the include files from this version of Qt."
#error "(The moc has changed too much.)"
#endif
@@ -64,7 +64,7 @@ void QRepairOrderWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, i
}
QT_INIT_METAOBJECT const QMetaObject QRepairOrderWidget::staticMetaObject = { {
- &QWidget::staticMetaObject,
+ QMetaObject::SuperData::link(),
qt_meta_stringdata_QRepairOrderWidget.data,
qt_meta_data_QRepairOrderWidget,
qt_static_metacall,
diff --git a/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/Widgets/LoginWidget/moc_QLoginDialog.cpp b/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/Widgets/LoginWidget/moc_QLoginDialog.cpp
index d9eb823..09e032f 100644
--- a/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/Widgets/LoginWidget/moc_QLoginDialog.cpp
+++ b/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/Widgets/LoginWidget/moc_QLoginDialog.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'QLoginDialog.h'
**
-** Created by: The Qt Meta Object Compiler version 67 (Qt 5.13.1)
+** Created by: The Qt Meta Object Compiler version 67 (Qt 5.14.2)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
@@ -13,7 +13,7 @@
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'QLoginDialog.h' doesn't include ."
#elif Q_MOC_OUTPUT_REVISION != 67
-#error "This file was generated using the moc from 5.13.1. It"
+#error "This file was generated using the moc from 5.14.2. It"
#error "cannot be used with the include files from this version of Qt."
#error "(The moc has changed too much.)"
#endif
@@ -98,7 +98,7 @@ void QLoginDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id
}
QT_INIT_METAOBJECT const QMetaObject QLoginDialog::staticMetaObject = { {
- &QDialog::staticMetaObject,
+ QMetaObject::SuperData::link(),
qt_meta_stringdata_QLoginDialog.data,
qt_meta_data_QLoginDialog,
qt_static_metacall,
diff --git a/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/Widgets/MainFrame/moc_QMainFrame.cpp b/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/Widgets/MainFrame/moc_QMainFrame.cpp
index fda724c..2f3ce8d 100644
--- a/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/Widgets/MainFrame/moc_QMainFrame.cpp
+++ b/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/Widgets/MainFrame/moc_QMainFrame.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
** Meta object code from reading C++ file 'QMainFrame.h'
**
-** Created by: The Qt Meta Object Compiler version 67 (Qt 5.13.1)
+** Created by: The Qt Meta Object Compiler version 67 (Qt 5.14.2)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
@@ -13,7 +13,7 @@
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'QMainFrame.h' doesn't include ."
#elif Q_MOC_OUTPUT_REVISION != 67
-#error "This file was generated using the moc from 5.13.1. It"
+#error "This file was generated using the moc from 5.14.2. It"
#error "cannot be used with the include files from this version of Qt."
#error "(The moc has changed too much.)"
#endif
@@ -64,7 +64,7 @@ void QMainFrame::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id,
}
QT_INIT_METAOBJECT const QMetaObject QMainFrame::staticMetaObject = { {
- &QMainWindow::staticMetaObject,
+ QMetaObject::SuperData::link(),
qt_meta_stringdata_QMainFrame.data,
qt_meta_data_QMainFrame,
qt_static_metacall,
diff --git a/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/qrc_resource.cpp b/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/qrc_resource.cpp
index 1fc4505..277dd1a 100644
--- a/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/qrc_resource.cpp
+++ b/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/qrc_resource.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
** Resource object code
**
-** Created by: The Resource Compiler for Qt version 5.13.1
+** Created by: The Resource Compiler for Qt version 5.14.2
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
diff --git a/code/cpp/car_dealer_util/proj/vs2019/车商渠道数据管理.sln b/code/cpp/car_dealer_util/proj/vs2019/车商渠道数据管理.sln
index d50029e..128a854 100644
--- a/code/cpp/car_dealer_util/proj/vs2019/车商渠道数据管理.sln
+++ b/code/cpp/car_dealer_util/proj/vs2019/车商渠道数据管理.sln
@@ -20,7 +20,7 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
+ Qt5Version = 5.14.2_msvc2017_x64
SolutionGuid = {7A1F667A-8FB5-4B18-8D74-E810D205DFA9}
- Qt5Version = 5.13.1_msvc2017_x64
EndGlobalSection
EndGlobal
diff --git a/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QCarDealerAchievementWidget/QCarDealerAchievementWidget.cpp b/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QCarDealerAchievementWidget/QCarDealerAchievementWidget.cpp
index 0753baf..8c4e253 100644
--- a/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QCarDealerAchievementWidget/QCarDealerAchievementWidget.cpp
+++ b/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QCarDealerAchievementWidget/QCarDealerAchievementWidget.cpp
@@ -1,9 +1,13 @@
-#include "QCarDealerAchievementWidget.h"
+#include
+#include "QCarDealerAchievementWidget.h"
+#include "../../Data/DataManipulation/Excel/LoadFromExcel.h"
-QCarDealerAchievementWidget::QCarDealerAchievementWidget(QWidget *parent)
- : QWidget(parent)
+using namespace std;
+
+QCarDealerAchievementWidget::QCarDealerAchievementWidget( QWidget * parent )
+ : QWidget( parent )
{
- ui.setupUi(this);
+ ui.setupUi( this );
init();
}
@@ -14,6 +18,26 @@ QCarDealerAchievementWidget::~QCarDealerAchievementWidget()
void QCarDealerAchievementWidget::onImport()
{
+ //选择文件
+ QString xlsxFilePath = QFileDialog::getOpenFileName( this,
+ "请选择要导入的数据文件",
+ ".", "xlsx文件(*.xlsx)" );
+ if ( xlsxFilePath.isEmpty() == true )
+ {
+ return;
+ }
+
+ achievementVector.clear();
+
+ LoadCarDealerAchievementFromXlsx( xlsxFilePath.toStdWString(),
+ 0,
+ 1,
+ achievementVector );
+
+ //以后要修改
+ string userName = "car_dealer";
+ string password = "cpic123456";
+ string tnsName = "xmcx1";
}
@@ -35,5 +59,5 @@ void QCarDealerAchievementWidget::initWidgets()
void QCarDealerAchievementWidget::initSignal()
{
- connect(ui.pButtonImport, SIGNAL(clicked()), this, SLOT(onImport()));
+ connect( ui.pButtonImport, SIGNAL( clicked() ), this, SLOT( onImport() ) );
}
diff --git a/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QCarDealerAchievementWidget/QCarDealerAchievementWidget.h b/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QCarDealerAchievementWidget/QCarDealerAchievementWidget.h
index 90e83a1..d3492b7 100644
--- a/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QCarDealerAchievementWidget/QCarDealerAchievementWidget.h
+++ b/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QCarDealerAchievementWidget/QCarDealerAchievementWidget.h
@@ -2,6 +2,7 @@
#include
#include "ui_QCarDealerAchievementWidget.h"
+#include "../../Data/Datastructure/CarDealerAchievement/CarDealerAchievement.h"
class QCarDealerAchievementWidget : public QWidget
{
@@ -24,4 +25,7 @@ private:
private:
Ui::QCarDealerAchievementWidget ui;
+
+ //数据
+ std::vector achievementVector;
};