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 277dd1a..8b1cdde 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 @@ -36909,94 +36909,94 @@ static const unsigned char qt_resource_struct[] = { 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, // :/QMainFrame/Resources/8218_box1.png 0x0,0x0,0x1,0x2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0x3f,0xef, -0x0,0x0,0x1,0x72,0x96,0xa9,0x44,0x6a, +0x0,0x0,0x1,0x73,0xb3,0x4d,0xb3,0x87, // :/QMainFrame/Resources/find.png 0x0,0x0,0x1,0x22,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0xaa,0x5f, -0x0,0x0,0x1,0x72,0x96,0xa9,0x44,0x75, +0x0,0x0,0x1,0x73,0xb3,0x4d,0xb3,0x8c, // :/QMainFrame/Resources/print.png 0x0,0x0,0x1,0x62,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x2,0x47,0x63, -0x0,0x0,0x1,0x72,0x96,0xa9,0x44,0x7c, +0x0,0x0,0x1,0x73,0xb3,0x4d,0xb3,0x8f, // :/QMainFrame/Resources/option.png 0x0,0x0,0x2,0x94,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x7,0x6,0xb8, -0x0,0x0,0x1,0x72,0x96,0xa9,0x44,0x7b, +0x0,0x0,0x1,0x73,0xb3,0x4d,0xb3,0x8e, // :/QMainFrame/Resources/x.png 0x0,0x0,0x2,0x2c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5,0x6a,0x2d, -0x0,0x0,0x1,0x72,0x96,0xa9,0x44,0x80, +0x0,0x0,0x1,0x73,0xb3,0x4d,0xb3,0x91, // :/QMainFrame/Resources/telephone.png 0x0,0x0,0x2,0xc4,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x7,0xb2,0x8, -0x0,0x0,0x1,0x72,0x96,0xa9,0x44,0x7e, +0x0,0x0,0x1,0x73,0xb3,0x4d,0xb3,0x90, // :/QMainFrame/Resources/plus.png 0x0,0x0,0x2,0x52,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x6,0x5d,0x5f, -0x0,0x0,0x1,0x72,0x96,0xa9,0x44,0x7b, +0x0,0x0,0x1,0x73,0xb3,0x4d,0xb3,0x8f, // :/QMainFrame/Resources/20121016085311441_easyicon_cn_128.png 0x0,0x0,0x0,0x82,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x77,0x17, -0x0,0x0,0x1,0x72,0x96,0xa9,0x44,0x69, +0x0,0x0,0x1,0x73,0xb3,0x4d,0xb3,0x86, // :/QMainFrame/Resources/new.png 0x0,0x0,0x2,0xe4,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x7,0xcc,0x61, -0x0,0x0,0x1,0x72,0x96,0xa9,0x44,0x7a, +0x0,0x0,0x1,0x73,0xb3,0x4d,0xb3,0x8e, // :/QMainFrame/Resources/CPIC.png 0x0,0x0,0x2,0x3c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5,0xc9,0x50, -0x0,0x0,0x1,0x72,0x96,0xa9,0x44,0x6c, +0x0,0x0,0x1,0x73,0xb3,0x4d,0xb3,0x88, // :/QMainFrame/Resources/ok.png 0x0,0x0,0x1,0x38,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0xe8,0x27, -0x0,0x0,0x1,0x72,0x96,0xa9,0x44,0x7a, +0x0,0x0,0x1,0x73,0xb3,0x4d,0xb3,0x8e, // :/QMainFrame/Resources/face.png 0x0,0x0,0x1,0xc8,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4,0x29,0xa6, -0x0,0x0,0x1,0x72,0x96,0xa9,0x44,0x75, +0x0,0x0,0x1,0x73,0xb3,0x4d,0xb3,0x8c, // :/QMainFrame/Resources/CNY_Red.png 0x0,0x0,0x1,0xf8,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4,0xfc,0xe0, -0x0,0x0,0x1,0x72,0x96,0xa9,0x44,0x6b, +0x0,0x0,0x1,0x73,0xb3,0x4d,0xb3,0x88, // :/QMainFrame/Resources/car2.png 0x0,0x0,0x3,0x10,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x8,0x69,0x71, -0x0,0x0,0x1,0x72,0x96,0xa9,0x44,0x71, +0x0,0x0,0x1,0x73,0xb3,0x4d,0xb3,0x8a, // :/QMainFrame/Resources/app.ico 0x0,0x0,0x0,0x46,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x2,0x22, -0x0,0x0,0x1,0x72,0x96,0xa9,0x44,0x6f, +0x0,0x0,0x1,0x73,0xb3,0x4d,0xb3,0x89, // :/QMainFrame/Resources/save.png 0x0,0x0,0x2,0x7e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x6,0xcf,0x1, -0x0,0x0,0x1,0x72,0x96,0xa9,0x44,0x7d, +0x0,0x0,0x1,0x73,0xb3,0x4d,0xb3,0x90, // :/QMainFrame/Resources/car.png 0x0,0x0,0x0,0x5a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1f,0x7e, -0x0,0x0,0x1,0x72,0x96,0xa9,0x44,0x70, +0x0,0x0,0x1,0x73,0xb3,0x4d,0xb3,0x89, // :/QMainFrame/Resources/cat.png 0x0,0x0,0x0,0x6e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x55,0x58, -0x0,0x0,0x1,0x72,0x96,0xa9,0x44,0x72, +0x0,0x0,0x1,0x73,0xb3,0x4d,0xb3,0x8a, // :/QMainFrame/Resources/excel.png 0x0,0x0,0x2,0x14,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x5,0x51,0x43, -0x0,0x0,0x1,0x72,0x96,0xa9,0x44,0x74, +0x0,0x0,0x1,0x73,0xb3,0x4d,0xb3,0x8c, // :/QMainFrame/Resources/CPIC??.png 0x0,0x0,0x1,0x7a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x2,0x9e,0xab, -0x0,0x0,0x1,0x72,0x96,0xa9,0x44,0x6d, +0x0,0x0,0x1,0x73,0xb3,0x4d,0xb3,0x89, // :/QMainFrame/Resources/dec.png 0x0,0x0,0x0,0x32,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0, -0x0,0x0,0x1,0x72,0x96,0xa9,0x44,0x73, +0x0,0x0,0x1,0x73,0xb3,0x4d,0xb3,0x8b, // :/QMainFrame/Resources/folder.png 0x0,0x0,0x0,0xd2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0xcc,0x2a, -0x0,0x0,0x1,0x72,0x96,0xa9,0x44,0x76, +0x0,0x0,0x1,0x73,0xb3,0x4d,0xb3,0x8c, // :/QMainFrame/Resources/edit.png 0x0,0x0,0x2,0x68,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x6,0x61,0x1b, -0x0,0x0,0x1,0x72,0x96,0xa9,0x44,0x74, +0x0,0x0,0x1,0x73,0xb3,0x4d,0xb3,0x8b, // :/QMainFrame/Resources/clean.png 0x0,0x0,0x2,0xf8,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x8,0x3a,0x47, -0x0,0x0,0x1,0x72,0x96,0xa9,0x44,0x73, +0x0,0x0,0x1,0x73,0xb3,0x4d,0xb3,0x8a, // :/QMainFrame/Resources/gear.png 0x0,0x0,0x2,0xae,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x7,0x5c,0x60, -0x0,0x0,0x1,0x72,0x96,0xa9,0x44,0x78, +0x0,0x0,0x1,0x73,0xb3,0x4d,0xb3,0x8d, // :/QMainFrame/Resources/quit.png 0x0,0x0,0x0,0xec,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0xe0,0xcc, -0x0,0x0,0x1,0x72,0x96,0xa9,0x44,0x7c, +0x0,0x0,0x1,0x73,0xb3,0x4d,0xb3,0x8f, // :/QMainFrame/Resources/save2.png 0x0,0x0,0x1,0x4a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x2,0x29,0x5d, -0x0,0x0,0x1,0x72,0x96,0xa9,0x44,0x7e, +0x0,0x0,0x1,0x73,0xb3,0x4d,0xb3,0x90, // :/QMainFrame/Resources/manager.png 0x0,0x0,0x1,0x94,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x3,0x55,0x8f, -0x0,0x0,0x1,0x72,0x96,0xa9,0x44,0x79, +0x0,0x0,0x1,0x73,0xb3,0x4d,0xb3,0x8d, // :/QMainFrame/Resources/login.png 0x0,0x0,0x1,0xb0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x3,0xb9,0xe4, -0x0,0x0,0x1,0x72,0x96,0xa9,0x44,0x79, +0x0,0x0,0x1,0x73,0xb3,0x4d,0xb3,0x8d, // :/QMainFrame/Resources/tongji.png 0x0,0x0,0x1,0xde,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4,0x8a,0x1, -0x0,0x0,0x1,0x72,0x96,0xa9,0x44,0x7f, +0x0,0x0,0x1,0x73,0xb3,0x4d,0xb3,0x90, }; diff --git a/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QNewRepairMonitorWidget/QNewRepairMonitorWidget.cpp b/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QNewRepairMonitorWidget/QNewRepairMonitorWidget.cpp index eb31a74..dc84d33 100644 --- a/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QNewRepairMonitorWidget/QNewRepairMonitorWidget.cpp +++ b/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QNewRepairMonitorWidget/QNewRepairMonitorWidget.cpp @@ -1,9 +1,17 @@ -#include "QNewRepairMonitorWidget.h" +#include +#include +#include "QNewRepairMonitorWidget.h" -QNewRepairMonitorWidget::QNewRepairMonitorWidget(QWidget *parent) - : QWidget(parent) +#include + +#include "../../Data/DataManipulation/Excel/LoadFromExcel.h" + +using namespace std; + +QNewRepairMonitorWidget::QNewRepairMonitorWidget( QWidget * parent ) + : QWidget( parent ) { - ui.setupUi(this); + ui.setupUi( this ); init(); } @@ -14,6 +22,41 @@ QNewRepairMonitorWidget::~QNewRepairMonitorWidget() void QNewRepairMonitorWidget::onImport() { + QString caption = "选择要导入的文件"; + QString dir = "."; + QString filter = "Excel文件 (.xlsx)"; + + QStringList files = QFileDialog::getOpenFileNames( nullptr, + caption, + dir, + filter ); + + if ( files.count() == 0 ) + { + return; + } + + //清理旧数据 + recordVector.clear(); + + try + { + //遍历，逐个导入 + for ( auto iterFile = files.begin(); + iterFile != files.end(); + ++iterFile ) + { + LoadNewRepairMonitorReportFromXlsx( iterFile->toStdWString(), 0, 1, recordVector ); + } + } + catch ( std::runtime_error& error ) + { + QMessageBox::critical( nullptr, + "读取失败！", + error.what() ); + + return; + } } void QNewRepairMonitorWidget::init() @@ -29,12 +72,12 @@ void QNewRepairMonitorWidget::initData() void QNewRepairMonitorWidget::initWidgets() { - setLayout(ui.pLayoutMain); + setLayout( ui.pLayoutMain ); } void QNewRepairMonitorWidget::initSignal() { - connect(ui.pButtonImport, SIGNAL(clicked()), this, SLOT(onImport())); + connect( ui.pButtonImport, SIGNAL( clicked() ), this, SLOT( onImport() ) ); } void QNewRepairMonitorWidget::showNewRepairMonitorRecords() diff --git a/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QNewRepairMonitorWidget/QNewRepairMonitorWidget.h b/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QNewRepairMonitorWidget/QNewRepairMonitorWidget.h index 537a2e3..1a11c45 100644 --- a/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QNewRepairMonitorWidget/QNewRepairMonitorWidget.h +++ b/code/cpp/car_dealer_util/source/Widgets/ContentWidget/QNewRepairMonitorWidget/QNewRepairMonitorWidget.h @@ -2,6 +2,7 @@ #include #include "ui_QNewRepairMonitorWidget.h" +#include "../../Data/Datastructure/新送返修监控报表/新送返修监控报表.h" class QNewRepairMonitorWidget : public QWidget { @@ -24,4 +25,7 @@ private: private: Ui::QNewRepairMonitorWidget ui; + + //数据 + std::vector recordVector; };