Browse Source

移除进度条,审核

tags/6.1.9
xushubieli 7 months ago
parent
commit
e66a87e354
7 changed files with 18 additions and 34 deletions
  1. +3
    -12
      src/admin/article_description_main.php
  2. +4
    -11
      src/admin/makehtml_archives_action.php
  3. +2
    -2
      src/admin/makehtml_freelist_action.php
  4. +1
    -1
      src/admin/makehtml_js_action.php
  5. +3
    -3
      src/admin/makehtml_list_action.php
  6. +3
    -3
      src/admin/makehtml_rss_action.php
  7. +2
    -2
      src/admin/makehtml_taglist_action.php

+ 3
- 12
src/admin/article_description_main.php View File

@@ -79,10 +79,8 @@ if ($dojob == '') {
$tjlen = 100;
ShowMsg('完成所有任务', 'javascript:;');
exit();
}
$dvlen = $tjlen * 2;
$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 %,继续执行任务";
}
$tjsta .= "完成处理文档总数 $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();
@@ -135,14 +133,7 @@ if ($dojob == '') {
}
}//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 #28a745;text-align:left'><div style='width:$dvlen;height:16px;background:#28a745'></div></div>";
$tjsta .= "<br>完成处理文档总数的:$tjlen %,继续执行任务";
$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}";
ShowMsg($tjsta, $nurl, 0, 500);


+ 4
- 11
src/admin/makehtml_archives_action.php View File

@@ -1,5 +1,4 @@
<?php

/**
* 生成文档操作
*
@@ -74,15 +73,9 @@ while ($row = $dsql->GetObject('out')) {
$ac = new Archives($id);
$rurl = $ac->MakeHtml(0);
}
$t2 = ExecTime();
$t2 = ($t2 - $est1);
$ttime = time() - $sstime;
$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 #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 %,继续执行任务";
$tjsta .= "到达位置:".($startdd + $pagesize).",继续执行任务<br>完成创建文件总数 $tjlen %";
//速度测试
if ($tjnum < $totalnum) {
$nurl = "makehtml_archives_action.php?endid=$endid&startid=$startid&typeid=$typeid";
@@ -92,12 +85,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,现转向当前栏目更新", "makehtml_list_action.php?typeid=$typeid&uptype=all&maxpagesize=50&upnext=1");
} else {
if ($uptype == '') {
ShowMsg("完成所有创建任务,生成文件:$totalnum 总用时:{$ttime} 分钟", "javascript:;");
ShowMsg("完成所有任务", "javascript:;");
} else {
ShowMsg("完成文档HTML更新任务,现在开始进行主页更新", "makehtml_all.php?action=make&step=3&uptype=$uptype&mkvalue=$mkvalue");
ShowMsg("完成文档更新任务,现在开始进行主页更新", "makehtml_all.php?action=make&step=3&uptype=$uptype&mkvalue=$mkvalue");
}
}
}

+ 2
- 2
src/admin/makehtml_freelist_action.php View File

@@ -54,10 +54,10 @@ if ($nextpage == $totalpage) {
} else {
if ($finishType) {
$gourl = "makehtml_freelist_action.php?maxpagesize=$maxpagesize&startid=$startid&endid=$endid&pageno=$nextpage";
ShowMsg("成功创建列表:".$tid.",继续进行操作", $gourl, 0, 100);
ShowMsg("创建列表:".$tid.",继续执行任务", $gourl, 0, 100);
} else {
$gourl = "makehtml_freelist_action.php?mkpage=$mkpage&maxpagesize=$maxpagesize&startid=$startid&endid=$endid&pageno=$pageno";
ShowMsg("列表:".$tid.",继续进行操作", $gourl, 0, 100);
ShowMsg("创建列表:".$tid.",继续执行任务", $gourl, 0, 100);
}
}
$dsql->ExecuteNoneQuery("Update `#@__freelist` set nodefault='1' where aid='$startid';");

+ 1
- 1
src/admin/makehtml_js_action.php View File

@@ -25,7 +25,7 @@ if ($uptype == "all") {
$pv->SetTemplet($cfg_basedir.$cfg_templets_dir."/".$templet);
$pv->SaveToHtml($cfg_basedir.$cfg_cmspath."/static/js/".$row['id'].".js", 0);
$typeid = $row['id'];;
ShowMsg("成功更新".$cfg_cmspath."/static/js/".$row['id'].".js,继续进行操作", "makehtml_js_action.php?typeid=$typeid", 0, 100);
ShowMsg("成功更新".$cfg_cmspath."/static/js/".$row['id'].".js,继续执行任务", "makehtml_js_action.php?typeid=$typeid", 0, 100);
exit();
}
} else {


+ 3
- 3
src/admin/makehtml_list_action.php View File

@@ -95,7 +95,7 @@ if ($nextpage >= $totalpage && $finishType) {
if (empty($reurl)) {
$reurl = '../apps/list.php?tid='.$tid;
}
ShowMsg("完成所有栏目列表更新<a href='$reurl' target='_blank'>浏览栏目</a>", "javascript:;");
ShowMsg("完成所有栏目列表更新<a href='$reurl' target='_blank'>浏览栏目</a>", "javascript:;");
exit();
} else if ($gotype == 'mkall' || $gotype == 'mkallct') {
ShowMsg("完成所有栏目列表更新,现在作最后数据优化", "makehtml_all.php?action=make&step=10");
@@ -104,11 +104,11 @@ if ($nextpage >= $totalpage && $finishType) {
} else {
if ($finishType) {
$gourl = "makehtml_list_action.php?gotype={$gotype}&uppage=$uppage&maxpagesize=$maxpagesize&typeid=$typeid&pageno=$nextpage";
ShowMsg("成功创建栏目:".$tid.",继续进行操作", $gourl, 0, 100);
ShowMsg("创建栏目:".$tid.",继续执行任务", $gourl, 0, 100);
exit();
} else {
$gourl = "makehtml_list_action.php?gotype={$gotype}&uppage=$uppage&mkpage=$mkpage&maxpagesize=$maxpagesize&typeid=$typeid&pageno=$pageno";
ShowMsg("栏目:".$tid.",继续进行操作", $gourl, 0, 100);
ShowMsg("创建栏目:".$tid.",继续执行任务", $gourl, 0, 100);
exit();
}
}

+ 3
- 3
src/admin/makehtml_rss_action.php View File

@@ -15,11 +15,11 @@ if (empty($tid)) $tid = 0;
if (empty($maxrecord)) $maxrecord = 50;
$row = $dsql->GetOne("SELECT id FROM `#@__arctype` WHERE id>'$tid' AND ispart<>2 ORDER BY id ASC LIMIT 0,1;");
if (!is_array($row)) {
echo "<link rel=\"stylesheet\" href=\"{$cfg_cmsurl}/static/web/css/bootstrap.min.css\"><style>.modal {position: static;}</style>";
echo "<div class=\"alert alert-success\" role=\"alert\">完成所有文件更新</div>";
echo "<link rel=\"stylesheet\" href=\"{$cfg_cmsurl}/static/web/css/bootstrap.min.css\"><style>.modal {position: static}</style>";
echo "<div class=\"alert alert-success\">完成所有文件更新</div>";
} else {
$rv = new RssView($row['id'], $maxrecord);
$rssurl = $rv->MakeRss(0);
$tid = $row['id'];
ShowMsg("成功更新".$rssurl.",继续进行操作", "makehtml_rss_action.php?tid=$tid&maxrecord=$maxrecord", 0, 100);
ShowMsg("成功更新".$rssurl.",继续执行任务", "makehtml_rss_action.php?tid=$tid&maxrecord=$maxrecord", 0, 100);
}

+ 2
- 2
src/admin/makehtml_taglist_action.php View File

@@ -92,12 +92,12 @@ if (is_array($tag) && count($tag) > 0) {
$nextpage = 0;
}
$gourl = "makehtml_taglist_action.php?maxpagesize=$maxpagesize&tagid=$tagid&pageno=$nextpage&upall=$upall&ctagid=$ctagid&startid=$startid&endid=$endid&mktime=$mktime";
ShowMsg("成功生成TAG:".$tag['tag'].",继续进行操作", $gourl, 0, 100);
ShowMsg("成功生成TAG:".$tag['tag'].",继续执行任务", $gourl, 0, 100);
exit();
} else {
//继续当前这个
$gourl = "makehtml_taglist_action.php?mkpage=$mkpage&maxpagesize=$maxpagesize&tagid=$tagid&pageno=$pageno&upall=$upall&ctagid=$ctagid&startid=$startid&endid=$endid&mktime=$mktime";
ShowMsg("成功生成TAG:".$tag['tag'].",继续进行操作", $gourl, 0, 100);
ShowMsg("成功生成TAG:".$tag['tag'].",继续执行任务", $gourl, 0, 100);
exit();
}
}

Loading…
Cancel
Save