diff --git a/NetMgr.cpp b/NetMgr.cpp index 3a603af..d29e624 100644 --- a/NetMgr.cpp +++ b/NetMgr.cpp @@ -80,7 +80,7 @@ void NetMgr::RequestFileInfo(const QString &sAddr) void NetMgr::RequestDownload(const QString &sAddr, const QString& sFileName,const QString &sFileSavePath) { - QString sUrl = QString("http://%1%2%3").arg(sAddr).arg("/cidwdat/").arg(sFileName); + QString sUrl = QString("http://%1%2%3").arg(sAddr).arg("/CIDW/config/").arg(sFileName); //qDebug()<<"url[RequestDownload]:"< #include #include +#include #include "ftpclient.h" COtherConfig::COtherConfig(QWidget *parent) : @@ -315,12 +316,29 @@ void COtherConfig::slotNetMgr(QString sAddr, const QVariant &msg) ui->pushButton_open_close->setText("打开"); } get_status = false; + }else if(arrays_value.toString() == "61850"){ + bool Status = objec.take("success").toBool(); + QString strMessage = objec.take("message").toString(); + if(Status){ + QMessageBox::information(this, QStringLiteral("提示"), strMessage); + QString filepath = QFileDialog::getExistingDirectory(this, tr("选择文件夹"), tr("")); + if(filepath == "") + return; + QString fileName = "SJ90C_IEC61850.icd"; + g_NetMgr->RequestDownload(IP, fileName, filepath); + QFileInfo file(filepath + fileName); + qDebug()<PostJson(req,sendData); + connect(g_NetMgr,SIGNAL(sigNetMgr(QString, const QVariant&)), this, SLOT(slotNetMgr(QString,const QVariant&))); + +} + diff --git a/OtherConfig.h b/OtherConfig.h index 9711745..5076dad 100644 --- a/OtherConfig.h +++ b/OtherConfig.h @@ -40,6 +40,8 @@ private slots: void on_pushButton_open_close_clicked(); + void on_pushButton_generate_clicked(); + private: Ui::COtherConfig *ui; diff --git a/OtherConfig.ui b/OtherConfig.ui index 98672fc..513a0c3 100644 --- a/OtherConfig.ui +++ b/OtherConfig.ui @@ -562,6 +562,41 @@ + + + + 20 + 430 + 96 + 28 + + + + + 96 + 28 + + + + + 96 + 28 + + + + #pushButton_generate { border-image: url(:/image/Btn/normal_Btn.png); + color:#1f5188 } +#pushButton_generate:hover { border-image: url(:/image/Btn/normal_Btn_p.png); + color:#ffffff} +#pushButton_generate:pressed { border-image: url(:/image/Btn/normal_Btn_p.png); + color:#ffffff} +#pushButton_generate:checked { border-image: url(:/image/Btn/normal_Btn_p.png); + color:#ffffff} + + + 生成ICD文件 + + diff --git a/mainwindow.cpp b/mainwindow.cpp index 35980ea..ebb2a97 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -771,15 +771,6 @@ void MainWindow::slotNetMgr(QString sAddr, const QVariant &msg) }else{ QMessageBox::information(this, QStringLiteral("提示"), strMessage); } - }else if(cmd == "61850"){ - bool Status = objec.take("success").toBool(); - QString strMessage = objec.take("message").toString(); - if(Status){ - QMessageBox::information(this, QStringLiteral("提示"), strMessage); - - }else{ - QMessageBox::question(this, QStringLiteral("提示"), strMessage); - } } } disconnect(g_NetMgr,SIGNAL(sigNetMgr(QString, const QVariant&)), this, SLOT(slotNetMgr(QString,const QVariant&))); @@ -799,15 +790,3 @@ void MainWindow::on_pushButton_detail_clicked() } -void MainWindow::on_pushButton_generate_clicked() -{ - QJsonObject sendData; - sendData["cmd"] = "61850"; - QNetworkRequest req; - QString sUrl = QString("http://%1/cgi-bin/General.cgi/").arg(IP); - req.setUrl(sUrl); - g_NetMgr->PostJson(req,sendData); - connect(g_NetMgr,SIGNAL(sigNetMgr(QString, const QVariant&)), this, SLOT(slotNetMgr(QString,const QVariant&))); - -} - diff --git a/mainwindow.h b/mainwindow.h index 4e7bbb5..63e6113 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -65,7 +65,6 @@ private slots: void on_pushButton_detail_clicked(); void slotNetMgr(QString sAddr,const QVariant& msg); - void on_pushButton_generate_clicked(); private: Ui::MainWindow *ui; diff --git a/mainwindow.ui b/mainwindow.ui index 47ef266..ded1314 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -6,7 +6,7 @@ 0 0 - 678 + 698 737 @@ -1788,35 +1788,6 @@ background-image: url(:/image/bj.jpg); - - - - - 96 - 28 - - - - - 96 - 28 - - - - #pushButton_generate { border-image: url(:/image/Btn/normal_Btn.png); - color:#1f5188 } -#pushButton_generate:hover { border-image: url(:/image/Btn/normal_Btn_p.png); - color:#ffffff} -#pushButton_generate:pressed { border-image: url(:/image/Btn/normal_Btn_p.png); - color:#ffffff} -#pushButton_generate:checked { border-image: url(:/image/Btn/normal_Btn_p.png); - color:#ffffff} - - - 生成ICD文件 - - -