From 32be59053e1c1e541539b95e814c6513c51f244e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?=
 <93301500+xushubieli@users.noreply.github.com>
Date: Fri, 9 Dec 2022 10:55:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9B=B4=E6=96=B0=E8=BF=9B?=
 =?UTF-8?q?=E5=BA=A6=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/article_description_main.php | 8 ++++----
 src/admin/makehtml_archives_action.php | 4 ++--
 src/admin/sys_data_done.php            | 2 +-
 src/system/common.func.php             | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/admin/article_description_main.php b/src/admin/article_description_main.php
index ea7e124d..b7f4a5d5 100644
--- a/src/admin/article_description_main.php
+++ b/src/admin/article_description_main.php
@@ -79,8 +79,8 @@ if ($dojob == '') {
                 exit();
             }
             $dvlen = $tjlen * 1;
-            $tjsta = "<div style='width:260px;height:16px;text-align:left;border:1px solid #1eb867;border-radius:.2rem'><div style='max-width:260px;width:$dvlen%;height:16px;background:#1eb867'></div></div>";  
-            $tjsta .= "<br>完成处理文档总数<span class='text-primary'>$tjlen</span>%";
+            $tjsta = "<div style='margin-bottom:18px;width:260px;height:18px;text-align:left;border:1px solid #1eb867;border-radius:.2rem'><div style='max-width:260px;width:$dvlen%;height:18px;background:#1eb867'></div></div>";  
+            $tjsta .= "完成更新文档总数<span class='text-primary'>$tjlen</span>%";
             $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();
@@ -139,8 +139,8 @@ if ($dojob == '') {
             $tjlen = 100;
         }
         $dvlen = $tjlen * 1;
-        $tjsta = "<div style='width:260px;height:16px;text-align:left;border:1px solid #1eb867;border-radius:.2rem'><div style='max-width:260px;width:$dvlen%;height:16px;background:#1eb867'></div></div>";
-        $tjsta .= "<br>完成处理文档总数<span class='text-primary'>$tjlen</span>%";
+        $tjsta = "<div style='margin-bottom:18px;width:260px;height:18px;text-align:left;border:1px solid #1eb867;border-radius:.2rem'><div style='max-width:260px;width:$dvlen%;height:18px;background:#1eb867'></div></div>";
+        $tjsta .= "完成更新文档总数<span class='text-primary'>$tjlen</span>%";
         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 4983bc47..b83cce5f 100644
--- a/src/admin/makehtml_archives_action.php
+++ b/src/admin/makehtml_archives_action.php
@@ -79,8 +79,8 @@ $ttime = time() - $sstime;
 $ttime = number_format(($ttime / 60), 2);
 //返回提示信息
 $tjlen = $totalnum > 0 ? ceil(($tjnum / $totalnum) * 100) : 100;
-$tjsta = "<div style='width:260px;height:16px;text-align:left;border:1px solid #1eb867;border-radius:.2rem'><div style='max-width:260px;width:$tjlen%;height:16px;background:#1eb867'></div></div>";
-$tjsta .= "<br>到达位置<span class='text-primary'>".($startdd + $pagesize)."</span>，用时<span class='text-primary'>{$ttime}</span>分钟<br>完成更新文档总数<span class='text-primary'>$tjlen</span>%";
+$tjsta = "<div style='margin-bottom:18px;margin-bottom:18px;width:260px;height:18px;text-align:left;border:1px solid #1eb867;border-radius:.2rem'><div style='max-width:260px;width:$tjlen%;height:18px;background:#1eb867'></div></div>";
+$tjsta .= "到达位置<span class='text-primary'>".($startdd + $pagesize)."</span>，用时<span class='text-primary'>{$ttime}</span>分钟，完成更新文档总数<span class='text-primary'>$tjlen</span>%";
 //速度测试
 if ($tjnum < $totalnum) {
     $nurl  = "makehtml_archives_action.php?endid=$endid&startid=$startid&typeid=$typeid";
diff --git a/src/admin/sys_data_done.php b/src/admin/sys_data_done.php
index 2f9015fc..c83124dc 100644
--- a/src/admin/sys_data_done.php
+++ b/src/admin/sys_data_done.php
@@ -257,7 +257,7 @@ else if ($dopost == 'redat') {
 function PutInfo($msg1, $msg2)
 {
     global $cfg_soft_lang;
-    $msginfo = "<!DOCTYPE html><html><head><meta charset='utf-8'><meta http-equiv='X-UA-Compatible' content='IE=Edge,chrome=1'><title>提示信息</title><style>body{margin:0;line-height:1.5;font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f5f5f5}a{color:#1eb867;text-decoration:none}.tips{margin:70px auto 0;padding:0;width:500px;height:auto;background:#fff;border-radius:.2rem;box-shadow:0 .125rem .25rem rgba(0,0,0,.075)}.tips-head{margin:0 20px;padding:16px 0;border-bottom:1px solid #f5f5f5}.tips-head p{margin:0;padding-left:10px;line-height:16px;text-align:left;border-left:3px solid #dc3545}.tips-box{padding:20px;min-height:130px;color:#545b62}.btn a{display:inline-block;margin:20px auto 0;padding:.375rem .75rem;font-size:12px;color:#fff;background:#1eb867;border-radius:.2rem;text-align:center;transition:all .6s}.btn a:focus{background:#006829;border-color:#005b24;box-shadow:0 0 0 0.2rem rgba(38,159,86,.5)}.text-primary{color:#007bff!important}@media (max-width:768px){body{padding:0 15px}.tips{width:100%}}</style></head><body><center><div class='tips'><div class='tips-head'><p>提示信息</p></div><div class='tips-box'>{$msg1}{$msg2}</div></div>";
+    $msginfo = "<!DOCTYPE html><html><head><meta charset='utf-8'><meta http-equiv='X-UA-Compatible' content='IE=Edge,chrome=1'><title>提示信息</title><style>body{margin:0;line-height:1.5;font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f5f5f5}a{color:#1eb867;text-decoration:none}.tips{margin:70px auto 0;padding:0;width:500px;height:auto;background:#fff;border-radius:.2rem;box-shadow:0 .125rem .25rem rgba(0,0,0,.075)}.tips-head{margin:0 20px;padding:18px 0;border-bottom:1px solid #f5f5f5}.tips-head p{margin:0;padding-left:10px;line-height:18px;text-align:left;border-left:3px solid #dc3545}.tips-box{padding:20px;min-height:130px;color:#545b62}.btn a{display:inline-block;margin:18px auto 0;padding:.375rem .75rem;font-size:12px;color:#fff;background:#1eb867;border-radius:.2rem;text-align:center;transition:all .3s}.btn a:focus{background:#006829;border-color:#005b24;box-shadow:0 0 0 0.2rem rgba(38,159,86,.5)}.text-primary{color:#007bff!important}@media (max-width:768px){body{padding:0 15px}.tips{width:100%}}</style></head><body><center><div class='tips'><div class='tips-head'><p>提示信息</p></div><div class='tips-box'>{$msg1}{$msg2}</div></div>";
     echo $msginfo."</center></body></html>";
 }
 function RpLine($str)
diff --git a/src/system/common.func.php b/src/system/common.func.php
index 34396c9a..ee919382 100755
--- a/src/system/common.func.php
+++ b/src/system/common.func.php
@@ -352,7 +352,7 @@ function ShowMsg($msg, $gourl, $onlymsg = 0, $limittime = 0)
         }
         $func .= "var pgo=0;function JumpUrl(){if (pgo==0){location='$gourl'; pgo=1;}}";
         $rmsg = $func;
-        $rmsg .= "document.write(\"<style>body{margin:0;line-height:1.5;font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f5f5f5}a{color:#1eb867;text-decoration:none}.tips{margin:70px auto 0;padding:0;width:500px;height:auto;background:#fff;border-radius:.2rem;box-shadow:0 .125rem .25rem rgba(0,0,0,.075)}.tips-head{margin:0 20px;padding:16px 0;border-bottom:1px solid #f5f5f5}.tips-head p{margin:0;padding-left:10px;line-height:16px;text-align:left;border-left:3px solid #dc3545}.tips-box{padding:20px;min-height:130px;color:#545b62}.btn a{display:inline-block;margin:20px auto 0;padding:.375rem .75rem;font-size:12px;color:#fff;background:#1eb867;border-radius:.2rem;text-align:center;transition:all .6s}.btn a:focus{background:#006829;border-color:#005b24;box-shadow:0 0 0 0.2rem rgba(38,159,86,.5)}.text-primary{color:#007bff!important}@media (max-width:768px){body{padding:0 15px}.tips{width:100%}}</style>\");";
+        $rmsg .= "document.write(\"<style>body{margin:0;line-height:1.5;font:14px Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f5f5f5}a{color:#1eb867;text-decoration:none}.tips{margin:70px auto 0;padding:0;width:500px;height:auto;background:#fff;border-radius:.2rem;box-shadow:0 .125rem .25rem rgba(0,0,0,.075)}.tips-head{margin:0 20px;padding:18px 0;border-bottom:1px solid #f5f5f5}.tips-head p{margin:0;padding-left:10px;line-height:18px;text-align:left;border-left:3px solid #dc3545}.tips-box{padding:20px;min-height:130px;color:#545b62}.btn a{display:inline-block;margin:18px auto 0;padding:.375rem .75rem;font-size:12px;color:#fff;background:#1eb867;border-radius:.2rem;text-align:center;transition:all .3s}.btn a:focus{background:#006829;border-color:#005b24;box-shadow:0 0 0 0.2rem rgba(38,159,86,.5)}.text-primary{color:#007bff!important}@media (max-width:768px){body{padding:0 15px}.tips{width:100%}}</style>\");";
         $rmsg .= "document.write(\"<div class='tips'>";
         $rmsg .= "<div class='tips-head'><p>提示信息</p></div>\");";
         $rmsg .= "document.write(\"<div class='tips-box'>\");";