|
@@ -75,9 +75,10 @@ bool ReportWoker::make_report(Tanker& tanker, QString word_path, QString pic_dir
|
|
|
QTextCodec *codec = QTextCodec::codecForName("UTF-8");
|
|
|
|
|
|
QString text_progress1 = codec->toUnicode("正在生成Word报告,请耐心等待");
|
|
|
+ QString text_progresspdf = codec->toUnicode("正在生成PDF报告,请耐心等待");
|
|
|
QString text_progress2 = codec->toUnicode("正在保存中...");
|
|
|
QString text_progress3 = codec->toUnicode("报告已完成");
|
|
|
- QString text_progress4 = codec->toUnicode("打开word失败");
|
|
|
+ QString text_progress4 = codec->toUnicode("打开word应用失败");
|
|
|
QString text_progress5 = codec->toUnicode("报告模板无法使用");
|
|
|
|
|
|
//新建一个word应用程序
|
|
@@ -100,7 +101,13 @@ bool ReportWoker::make_report(Tanker& tanker, QString word_path, QString pic_dir
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
- emit onProgress(text_progress1);
|
|
|
+ if(word_path.contains(".pdf")){
|
|
|
+ emit onProgress(text_progresspdf);
|
|
|
+ }else{
|
|
|
+ emit onProgress(text_progress1);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
QThread::msleep(1000);
|
|
|
|
|
|
//填写全局信息
|