From 3d0a3c85be86015617f34701bc10614587b0f8aa Mon Sep 17 00:00:00 2001
From: xushubieli <xushubieli@qq.com>
Date: Wed, 4 May 2022 18:17:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9D=A1=E8=87=AA=E9=80=82?=
 =?UTF-8?q?=E5=BA=94=EF=BC=8C=E6=96=87=E5=AD=97=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/admin/article_description_main.php b/src/admin/article_description_main.php
index 3f6cdeda..d77ae1ad 100644
--- a/src/admin/article_description_main.php
+++ b/src/admin/article_description_main.php
@@ -80,9 +80,9 @@ if ($dojob == '') {
                 ShowMsg('完成所有任务', 'javascript:;');
                 exit();
             }
-            $dvlen = $tjlen * 2;
-            $tjsta = "<div style='width:260px;height:16px;border:1px solid #28a745;text-align:left'><div style='width:$dvlen%;height:16px;background:#28a745'></div></div>";           
-            $tjsta .= "<br>完成处理文档总数的 $tjlen %";
+            $dvlen = $tjlen * 1;
+            $tjsta = "<div style='width:260px;height:16px;border:1px solid #28a745;text-align:left'><div style='max-width:260px;width:$dvlen%;height:16px;background:#28a745'></div></div>";  
+            $tjsta .= "<br>完成处理文档总数 $tjlen %";
             $nurl = "article_description_main.php?totalnum=$totalnum&startdd={$startdd}&pagesize=$pagesize&table={$table}&field={$field}&dsize={$dsize}&msize={$msize}&channel={$channel}&dojob={$dojob}";
             ShowMsg($tjsta, $nurl, 0, 500);
             exit();
@@ -140,9 +140,9 @@ if ($dojob == '') {
         } else {
             $tjlen = 100;
         }
-        $dvlen = $tjlen * 2;
-        $tjsta = "<div style='width:260px;height:16px;border:1px solid #28a745;text-align:left'><div style='width:$dvlen%;height:16px;background:#28a745'></div></div>";
-        $tjsta .= "<br>完成处理文档总数的 $tjlen %";
+        $dvlen = $tjlen * 1;
+        $tjsta = "<div style='width:260px;height:16px;border:1px solid #28a745;text-align:left'><div style='max-width:260px;width:$dvlen%;height:16px;background:#28a745'></div></div>";
+        $tjsta .= "<br>完成处理文档总数 $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}";
             ShowMsg($tjsta, $nurl, 0, 500);
diff --git a/src/admin/makehtml_archives_action.php b/src/admin/makehtml_archives_action.php
index 987cb67e..60671e84 100644
--- a/src/admin/makehtml_archives_action.php
+++ b/src/admin/makehtml_archives_action.php
@@ -79,9 +79,9 @@ $ttime = time() - $sstime;
 $ttime = number_format(($ttime / 60), 2);
 //返回提示信息
 $tjlen = $totalnum > 0 ? ceil(($tjnum / $totalnum) * 100) : 100;
-$dvlen = $tjlen * 2;
-$tjsta = "<div style='width:260px;height:16px;border:1px solid #28a745;text-align:left'><div style='width:$dvlen%;height:16px;background:#28a745'></div></div>";
-$tjsta .= "<br>本次用时：".number_format($t2, 2)."，总用时：$ttime 分钟，到达位置：".($startdd + $pagesize)."<br>完成创建文件总数的 $tjlen %";
+$dvlen = $tjlen * 1;
+$tjsta = "<div style='width:260px;height:16px;border:1px solid #28a745;text-align:left'><div style='max-width:260px;width:$dvlen%;height:16px;background:#28a745'></div></div>";
+$tjsta .= "<br>到达位置：".($startdd + $pagesize)."，用时：$ttime 分钟<br>完成更新文档总数 $tjlen %";
 //速度测试
 if ($tjnum < $totalnum) {
     $nurl  = "makehtml_archives_action.php?endid=$endid&startid=$startid&typeid=$typeid";
@@ -91,12 +91,12 @@ if ($tjnum < $totalnum) {
     exit();
 } else {
     if ($typeid != '') {
-        ShowMsg("生成文件：$totalnum，总用时：{$ttime} 分钟，现转向当前栏目更新", "makehtml_list_action.php?typeid=$typeid&uptype=all&maxpagesize=50&upnext=1");
+        ShowMsg("更新文档：$totalnum，用时：{$ttime} 分钟，现转向当前栏目更新", "makehtml_list_action.php?typeid=$typeid&uptype=all&maxpagesize=50&upnext=1");
     } else {
         if ($uptype == '') {
-            ShowMsg("生成文件：$totalnum，总用时：{$ttime} 分钟，完成所有所有任务", "javascript:;");
+            ShowMsg("更新文档：$totalnum，用时：{$ttime} 分钟，完成所有所有任务", "javascript:;");
         } else {
-            ShowMsg("完成文档更新任务，现在开始进行主页更新", "makehtml_all.php?action=make&step=3&uptype=$uptype&mkvalue=$mkvalue");
+            ShowMsg("完成更新文档任务，现在开始进行主页更新", "makehtml_all.php?action=make&step=3&uptype=$uptype&mkvalue=$mkvalue");
         }
     }
 }
\ No newline at end of file