From 2b9b2c39faf20b69f463688256620868f6f88408 Mon Sep 17 00:00:00 2001
From: xushubieli <xushubieli@qq.com>
Date: Wed, 4 May 2022 14:42:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BF=9B=E5=BA=A6=E6=9D=A1?=
 =?UTF-8?q?=EF=BC=8C=E5=8A=A0=E5=BF=AB=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/article_description_main.php | 5 +++++
 src/admin/makehtml_archives_action.php | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/src/admin/article_description_main.php b/src/admin/article_description_main.php
index 198cba55..7445fb9b 100644
--- a/src/admin/article_description_main.php
+++ b/src/admin/article_description_main.php
@@ -133,6 +133,11 @@ if ($dojob == '') {
             }
         }//end if limit
         //返回进度提示
+        if ($totalnum > 0) {
+            $tjlen = ceil(($tjnum / $totalnum) * 100);
+        } else {
+            $tjlen = 100;
+        }
         $tjsta .= "完成处理文档总数 $tjlen %";
         if ($tjnum < $totalnum) {
             $nurl = "article_description_main.php?totalnum=$totalnum&startdd=".($startdd + $pagesize)."&pagesize=$pagesize&table={$table}&field={$field}&dsize={$dsize}&msize={$msize}&channel={$channel}&dojob={$dojob}";
diff --git a/src/admin/makehtml_archives_action.php b/src/admin/makehtml_archives_action.php
index e2bd8aad..e8ecc550 100644
--- a/src/admin/makehtml_archives_action.php
+++ b/src/admin/makehtml_archives_action.php
@@ -73,6 +73,8 @@ while ($row = $dsql->GetObject('out')) {
     $ac = new Archives($id);
     $rurl = $ac->MakeHtml(0);
 }
+$t2 = ExecTime();
+$t2 = ($t2 - $est1);
 //返回提示信息
 $tjlen = $totalnum > 0 ? ceil(($tjnum / $totalnum) * 100) : 100;
 $tjsta .= "到达位置：".($startdd + $pagesize)."，继续执行任务<br>完成创建文件总数 $tjlen %";