From 71c27f9ead97e52e50a59495c6955756e21004cf Mon Sep 17 00:00:00 2001
From: wumu <mayi@mayi.com>
Date: 星期五, 01 十一月 2024 00:16:13 +0800
Subject: [PATCH] 1101
---
internal_system_v1/threemergeproblemlist.cpp | 121 +++++++++++++++++++++++++++++++++++-----
1 files changed, 106 insertions(+), 15 deletions(-)
diff --git a/internal_system_v1/threemergeproblemlist.cpp b/internal_system_v1/threemergeproblemlist.cpp
index e3ecf7f..d1d5289 100644
--- a/internal_system_v1/threemergeproblemlist.cpp
+++ b/internal_system_v1/threemergeproblemlist.cpp
@@ -7,6 +7,8 @@
#include <QDir>
#include <QFileDevice>
+#pragma execution_character_set("utf-8")
+
ThreeMergeProblemList::ThreeMergeProblemList(QWidget *parent) :
QMainWindow(parent),
ui(new Ui::ThreeMergeProblemList)
@@ -37,6 +39,12 @@
ui->line->hide();
ui->line_2->hide();
+
+ ui->groupBox->hide(); // 棣栨鍏堥殣钘�
+
+ // pdf鏂囦欢鐩稿叧
+ //m_pdfView = new QWebEngineView();
+
}
@@ -93,6 +101,15 @@
qDebug()<<"褰撳墠琛岄涓虹┖"<<row;
return 0;
}
+ // 澶勭悊涓虹┖鐨勯潪棣栧垪鍗曞厓锛岃嚜鍔ㄨˉ闆�
+ for(int i=1;i<ui->tableWidget->columnCount();++i){
+ if(ui->tableWidget->item(row,i) == nullptr){
+ qDebug()<<"鍙戠幇绌洪」:"<<row<<i;
+ ui->tableWidget->setItem(row,i,new QTableWidgetItem(" "));
+ }
+ }
+
+
// 鍙栧嚭绱㈠紩鍙锋潵鍒ゆ柇涓�涓�
QString sql = QString("select id from standing_book_info where id=%1").arg(ui->tableWidget->item(row,0)->text());
qDebug()<<"id sql:"<<sql;
@@ -155,7 +172,7 @@
// path 涓烘枃浠跺畬鏁磋矾寰�
// id涓哄瓙鐩綍鍚嶅瓧
-int ThreeMergeProblemList::saveFile(QString path, QString id,QString &absSavePath)
+int ThreeMergeProblemList::saveFile(QString path, QString id,QString &absSavePath,QString proName)
{
// 鏍规嵁id鏉ユ寚瀹氬瓙鐩綍杩涜鏂囦欢鐨勬嫹璐濆拰瀛樺偍
// 榛樿淇濆瓨鍒板綋鍓峞vidence鐩綍涓嬬殑id瀛愮洰褰曚腑
@@ -165,7 +182,7 @@
return -1;
}
- QString curPath = QString("./evidence/%1/").arg(id);
+ QString curPath = QString("./evidence/%1_%2/").arg(id).arg(proName);
QDir dir;
if(!dir.exists(curPath)){
// 鍒欑洿鎺ュ垱寤�
@@ -187,6 +204,22 @@
return -2;
}
+}
+
+// 浣跨敤web鎶�鏈� 鍔犺浇pdf鏂囦欢
+int ThreeMergeProblemList::loadPdfFile(QString path)
+{
+// QString dirPath = QApplication::applicationDirPath();
+// qDebug()<<"pdf:"<<path<<dirPath;
+// qDebug()<<QDir::currentPath();
+// qDebug()<<path.mid(1);
+// QString pdfJS = "file://"+QDir::currentPath()+"/web/viewer.html";
+// QString link = "?file=";
+// QString fullPath = pdfJS+link+QDir::currentPath()+path.mid(1);
+// qDebug()<<"fullPath"<<fullPath;
+// m_pdfView->page()->load(QUrl::fromUserInput(fullPath));
+
+ return 0;
}
void ThreeMergeProblemList::initUi()
{
@@ -431,12 +464,14 @@
m_menuRectBook = new QMenu(this);
m_menuRectBook->addAction("鍒犻櫎褰撳墠琛�");
m_menuRectBook->addAction("淇濆瓨褰撳墠琛�");
+ m_menuRectBook->addAction("鏌ョ湅宸插瓨浣愯瘉");
ui->tableWidget->setContextMenuPolicy(Qt::CustomContextMenu);
connect(ui->tableWidget,SIGNAL(customContextMenuRequested(QPoint)),this,SLOT(showMenuSlotRectBook(QPoint)));
connect(m_menuRectBook->actions().at(0),SIGNAL(triggered(bool)),this,SLOT(deleteActionRectBook()));
connect(m_menuRectBook->actions().at(1),SIGNAL(triggered(bool)),this,SLOT(saveActionRectBook()));
+ connect(m_menuRectBook->actions().at(2),SIGNAL(triggered(bool)),this,SLOT(showSaveFile()));
}
@@ -585,19 +620,20 @@
QString spath = ui->tableWidget->item(row,17)->text();
QString tpath = ui->tableWidget->item(row,23)->text();
QString fid = ui->tableWidget->item(row,0)->text();
- qDebug()<<"鎷疯礉鏂囦欢:"<<fid<<fpath;
+ QString proName = ui->tableWidget->item(row,7)->text(); // 椤圭洰鍚嶇О
+ qDebug()<<"鎷疯礉鏂囦欢:"<<fid<<proName<<fpath;
QString absSavePath1,absSavePath2,absSavePath3;
- int sflag1 = saveFile(fpath,fid,absSavePath1); // 淇濆瓨绗竴涓�
+ int sflag1 = saveFile(fpath,fid,absSavePath1,proName); // 淇濆瓨绗竴涓�
if(sflag1==1){
ui->tableWidget->setItem(row,13,new QTableWidgetItem(absSavePath1));
}
- int sflag2 = saveFile(spath,fid,absSavePath2); // 淇濆瓨绗簩涓�
+ int sflag2 = saveFile(spath,fid,absSavePath2,proName); // 淇濆瓨绗簩涓�
if(sflag2==1){
ui->tableWidget->setItem(row,17,new QTableWidgetItem(absSavePath2));
}
- int sflag3 = saveFile(tpath,fid,absSavePath3); // 淇濆瓨绗笁涓�
+ int sflag3 = saveFile(tpath,fid,absSavePath3,proName); // 淇濆瓨绗笁涓�
if(sflag3==1){
ui->tableWidget->setItem(row,23,new QTableWidgetItem(absSavePath3));
}
@@ -765,11 +801,11 @@
}else if(curText == "娑夊強閲戦" || strcmp(curText.toLocal8Bit().data(),"娑夊強閲戦")==0){
qDebug()<<"娑夊強閲戦";
- condition = QString(" where 娑夊強閲戦='%1'").arg(ui->lineEdit_sbook_condition->text());
+ condition = QString(" where 娑夊強閲戦 <=%1").arg(ui->lineEdit_sbook_condition->text());
}else if(curText == "鏁撮】閲戦" || strcmp(curText.toLocal8Bit().data(),"鏁撮】閲戦")==0){
qDebug()<<"鏁撮】閲戦";
- condition = QString(" where 鏁撮】閲戦='%1'").arg(ui->lineEdit_sbook_condition->text());
+ condition = QString(" where 鏁撮】閲戦 <=%1").arg(ui->lineEdit_sbook_condition->text());
}
@@ -804,19 +840,20 @@
QString spath = ui->tableWidget->item(i,17)->text();
QString tpath = ui->tableWidget->item(i,23)->text();
QString fid = ui->tableWidget->item(i,0)->text();
- qDebug()<<"鎷疯礉鏂囦欢:"<<fid<<fpath;
+ QString proName = ui->tableWidget->item(i,7)->text(); // 椤圭洰鍚嶇О
+ qDebug()<<"鎷疯礉鏂囦欢:"<<fid<<proName<<fpath;
QString absSavePath1,absSavePath2,absSavePath3;
- int sflag1 = saveFile(fpath,fid,absSavePath1); // 淇濆瓨绗竴涓�
+ int sflag1 = saveFile(fpath,fid,absSavePath1,proName); // 淇濆瓨绗竴涓�
if(sflag1==1){
ui->tableWidget->setItem(i,13,new QTableWidgetItem(absSavePath1));
}
- int sflag2 = saveFile(spath,fid,absSavePath2); // 淇濆瓨绗簩涓�
+ int sflag2 = saveFile(spath,fid,absSavePath2,proName); // 淇濆瓨绗簩涓�
if(sflag2==1){
ui->tableWidget->setItem(i,17,new QTableWidgetItem(absSavePath2));
}
- int sflag3 = saveFile(tpath,fid,absSavePath3); // 淇濆瓨绗笁涓�
+ int sflag3 = saveFile(tpath,fid,absSavePath3,proName); // 淇濆瓨绗笁涓�
if(sflag3==1){
ui->tableWidget->setItem(i,23,new QTableWidgetItem(absSavePath3));
}
@@ -870,15 +907,15 @@
vecCon.append(condition);
}
if(ui->checkBox_qdx->isChecked()){
- QString condition= QString(" 闂瀹氭��='%1' ").arg(ui->comboBox_qdx->currentText());
+ QString condition= QString(" 闂瀹氭��='%1'").arg(ui->comboBox_qdx->currentText());
vecCon.append(condition);
}
if(ui->checkBox_about_money->isChecked()){
- QString condition= QString(" 娑夊強閲戦>='%1' and 娑夊強閲戦<='%2' ").arg(ui->comboBox_about_bgMonney->currentText()).arg(ui->comboBox_about_edMoney->currentText());
+ QString condition= QString(" 娑夊強閲戦 >= %1 and 娑夊強閲戦 <= %2").arg(ui->comboBox_about_bgMonney->currentText()).arg(ui->comboBox_about_edMoney->currentText());
vecCon.append(condition);
}
if(ui->checkBox_changeMoney->isChecked()){
- QString condition= QString(" 鏁存敼閲戦>='%1' and 鏁存敼閲戦<='%2' ").arg(ui->comboBox_change_bgMoney->currentText()).arg(ui->comboBox_change_edMoney->currentText());
+ QString condition= QString(" 鏁存敼閲戦>=%1 and 鏁存敼閲戦<=%2").arg(ui->comboBox_change_bgMoney->currentText()).arg(ui->comboBox_change_edMoney->currentText());
vecCon.append(condition);
}
if(ui->checkBox_change_over_time->isChecked()){
@@ -915,3 +952,57 @@
}
}
+
+void ThreeMergeProblemList::on_pushButton_multiSearch_clicked()
+{
+ static int cnt=0;
+ if(cnt%2 == 1){
+ ui->groupBox->hide();
+ ui->pushButton_multiSearch->setText("澶氱淮搴︽暟鎹煡璇煈�");
+ }else{
+ ui->groupBox->show();
+ ui->pushButton_multiSearch->setText("澶氱淮搴︽暟鎹煡璇煈�");
+ }
+ cnt++;
+}
+
+void ThreeMergeProblemList::showSaveFile()
+{
+ int row = ui->tableWidget->currentRow();
+ auto item = ui->tableWidget->currentItem();
+ if(row>=0 && item){
+ qDebug()<<"row"<<row;
+ // 鍙栦笅鏍� 13 17 23
+ auto item_13 = ui->tableWidget->item(row,13);
+ auto item_17 = ui->tableWidget->item(row,17);
+ auto item_23 = ui->tableWidget->item(row,23);
+ if(item_13){
+ qDebug()<<item_13->text();
+ QString text = item_13->text();
+ QStringList listPath = text.split("/");
+ if(listPath.size() > 2){
+ qDebug()<<"鍙戠幇鏂囦欢"<<listPath.back();
+ QString type = listPath.back().split(".").back();
+ qDebug()<<"type"<<type;
+ if(type == "pdf"){
+ loadPdfFile(text);
+ }
+ }
+ }
+ if(item_17){
+ qDebug()<<item_17->text();
+ }
+ if(item_23){
+ qDebug()<<item_23->text();
+ }
+ }
+}
+
+void ThreeMergeProblemList::updateComboList(QMap<QString, ComInfo> & nameAndComInfos)
+{
+ ui->comboBox_company->clear();
+
+ for(auto it = nameAndComInfos.begin();it != nameAndComInfos.end();++it){
+ ui->comboBox_company->addItem(it.key());
+ }
+}
--
Gitblit v1.8.0