修改进度条

src/admin/article_description_main.php

@@ -81,8 +81,8 @@ if ($dojob == '') {
                 exit();
             }
             $dvlen = $tjlen * 2;
-            $tjsta = "<div style='width:200px;height:16px;border:1px solid #898989;text-align:left'><div style='width:200px;height:16px;background-color:#829D83'></div></div>";
-            $tjsta .= "<br>完成处理文档总数的：$tjlen %，继续执行任务";
+            $tjsta = "<div style='width:200px;height:16px;border:1px solid #28a745;text-align:left'><div style='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();
@@ -90,11 +90,10 @@ if ($dojob == '') {
             ShowMsg('完成所有任务', 'javascript:;');
             exit();
         }
-    } //获取自动摘要代码结束
+    }//获取自动摘要代码结束
     //更新自动分页
     if ($dojob == 'page') {
         require_once(DEDEADMIN."/inc/inc_archives_functions.php");
-
         $addquery  = "";
         if ($sid != 0) {
             $addquery  .= " and aid>='$sid' ";
@@ -134,7 +133,7 @@ if ($dojob == '') {
                     $dsql->ExecuteNoneQuery("UPDATE $table SET $field='$body' WHERE aid='$aid' ; ");
                 }
             }
-        } //end if limit
+        }//end if limit
         //返回进度提示
         if ($totalnum > 0) {
             $tjlen = ceil(($tjnum / $totalnum) * 100);
@@ -142,9 +141,8 @@ if ($dojob == '') {
             $tjlen = 100;
         }
         $dvlen = $tjlen * 2;
-        $tjsta = "<div style='width:200px;height:16px;border:1px solid #898989;text-align:left'><div style='width:200px;height:16px;background-color:#829D83'></div></div>";
+        $tjsta = "<div style='width:200px;height:16px;border:1px solid #28a745;text-align:left'><div style='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);

src/admin/article_keywords_make.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * 文档关键词生成
  *
@@ -15,7 +16,7 @@ CheckPurview('sys_Keyword');
 if (empty($dopost)) $dopost = '';
 //分析已存在的关键词（适用于默认的文章模型）
 if ($dopost == 'analyse') {
-    echo "正在读取关键词数据库<br>\r\n";
+    echo "正在读取关键词数据库...<br>\r\n";
     flush();
     $ws = $wserr = $wsnew = "";
     $dsql->SetQuery("SELECT * FROM `#@__keywords`");
@@ -26,7 +27,7 @@ if ($dopost == 'analyse') {
     }
     echo "完成关键词数据库的载入<br>\r\n";
     flush();
-    echo "读取档案数据库，并对禁用的关键词和生字进行处理<br>\r\n";
+    echo "读取档案数据库，并对禁用的关键词和生字进行处理...<br>\r\n";
     flush();
     $dsql->SetQuery("SELECT id,keywords FROM `#@__archives`");
     $dsql->Execute();
@@ -57,10 +58,10 @@ if ($dopost == 'analyse') {
     echo "完成档案数据库的处理<br>\r\n";
     flush();
     if (is_array($wsnew)) {
-        echo "对关键词进行排序<br>\r\n";
+        echo "对关键词进行排序...<br>\r\n";
         flush();
         arsort($wsnew);
-        echo "把关键词保存到数据库<br>\r\n";
+        echo "把关键词保存到数据库...<br>\r\n";
         flush();
         foreach ($wsnew as $k => $v) {
             if (strlen($k) > 20) {
@@ -92,13 +93,11 @@ else if ($dopost == 'fetch') {
     if (empty($totalnum)) {
         $totalnum = 0;
     }
-
     //统计记录总数
     if ($totalnum == 0) {
         $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__archives` WHERE channel='1' ");
         $totalnum = $row['dd'];
     }
-
     //获取记录，并分析关键词
     if ($totalnum > $startdd + $pagesize) {
         $limitSql = " LIMIT $startdd,$pagesize";
@@ -110,10 +109,9 @@ else if ($dopost == 'fetch') {
     $tjnum = $startdd;
     if ($limitSql != '') {
         $fquery = "SELECT arc.id,arc.title,arc.keywords,addon.body FROM `#@__archives` arc
-              LEFT JOIN `#@__addonarticle` addon ON addon.aid=arc.id WHERE arc.channel='1' $limitSql ";
+            LEFT JOIN `#@__addonarticle` addon ON addon.aid=arc.id WHERE arc.channel='1' $limitSql ";
         $dsql->SetQuery($fquery);
         $dsql->Execute();
-
         if (!empty($cfg_bizcore_appid) && !empty($cfg_bizcore_key)) {
             $client = new DedeBizClient($cfg_bizcore_hostname, $cfg_bizcore_port);
             $client->appid = $cfg_bizcore_appid;
@@ -143,13 +141,10 @@ else if ($dopost == 'fetch') {
                 $tjnum++;
                 $id = $row->id;
                 $keywords = "";
-
                 $sp->SetSource($row->title, $cfg_soft_lang, $cfg_soft_lang);
                 $sp->SetResultType(2);
                 $sp->StartAnalysis(TRUE);
-
                 $titleindexs = $sp->GetFinallyIndex();
-
                 $sp->SetSource(Html2Text($row->body), $cfg_soft_lang, $cfg_soft_lang);
                 $sp->SetResultType(2);
                 $sp->StartAnalysis(TRUE);
@@ -180,17 +175,13 @@ else if ($dopost == 'fetch') {
             }
             unset($sp);
         }
-    } //end if limit
-
-
+    }//end if limit
     //返回提示信息
     if ($totalnum > 0) $tjlen = ceil(($tjnum / $totalnum) * 100);
     else $tjlen = 100;
-
     $dvlen = $tjlen * 2;
-    $tjsta = "<div style='width:200px;height:16px;border:1px solid #898989;text-align:left'><div style='width:200px;height:16px;background-color:#829D83'></div></div>";
+    $tjsta = "<div style='width:200px;height:16px;border:1px solid #28a745;text-align:left'><div style='width:$dvlen;height:16px;background:#28a745'></div></div>";
     $tjsta .= "<br>完成处理文档总数的：$tjlen %，位置：{$startdd}，继续执行任务";
-
     if ($tjnum < $totalnum) {
         $nurl = "article_keywords_make.php?dopost=fetch&totalnum=$totalnum&startdd=".($startdd + $pagesize)."&pagesize=$pagesize";
         ShowMsg($tjsta, $nurl, 0, 500);
@@ -199,4 +190,4 @@ else if ($dopost == 'fetch') {
     }
     exit();
 }
-include DedeInclude('templets/article_keywords_make.htm');
+include DedeInclude('templets/article_keywords_make.htm');

src/admin/makehtml_archives_action.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * 生成文档操作
  *
@@ -80,8 +81,9 @@ $ttime = number_format(($ttime / 60), 2);
 //返回提示信息
 $tjlen = $totalnum > 0 ? ceil(($tjnum / $totalnum) * 100) : 100;
 $dvlen = $tjlen * 2;
-$tjsta = "<div style='width:200px;height:16px;border:1px solid #898989;text-align:left'><div style='width:200px;height:16px;background-color:#829D83'></div></div>";
+$tjsta = "<div style='width:200px;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 %，继续执行任务";
+//速度测试
 if ($tjnum < $totalnum) {
     $nurl  = "makehtml_archives_action.php?endid=$endid&startid=$startid&typeid=$typeid";
     $nurl .= "&totalnum=$totalnum&startdd=".($startdd + $pagesize)."&pagesize=$pagesize";
@@ -90,7 +92,7 @@ if ($tjnum < $totalnum) {
     exit();
 } else {
     if ($typeid != '') {
-        ShowMsg("生成文件：$totalnum 总用时：{$ttime} 分钟，现转向当前栏目更新&gt;", "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:;");