mirror of
https://gitee.com/zoujingli/ThinkAdmin.git
synced 2025-04-06 03:58:04 +08:00
优化异步任务消息显示
This commit is contained in:
Anyon
parent
cafdf3abdf
commit
a7a5317473
@ -820,27 +820,27 @@ $(function () {
|
||||
(function loadprocess(code, that) {
|
||||
that = this, this.$box = $('[data-queue-load=' + code + ']');
|
||||
if (doAjax === false || that.$box.length < 1) return false;
|
||||
this.$code = that.$box.find('code'), this.$title = that.$box.find('[data-message-title]');
|
||||
this.$code = that.$box.find('code'), this.$name = that.$box.find('[data-message-title]');
|
||||
this.$percent = that.$box.find('.layui-progress div'), this.runCache = function (code, index, value) {
|
||||
this.ckey = code + '_' + index, this.ctype = 'admin-queue-script';
|
||||
return value !== undefined ? layui.data(this.ctype, {key: this.ckey, value: value}) : layui.data(this.ctype)[this.ckey] || 0;
|
||||
};
|
||||
this.setState = function (status, message) {
|
||||
if (message.indexOf('javascript:') === -1) if (status === 1) {
|
||||
that.$title.html('<b class="color-text">' + message + '</b>').addClass('text-center');
|
||||
that.$name.html('<b class="color-text">' + message + '</b>').addClass('text-center');
|
||||
that.$percent.addClass('layui-bg-blue').removeClass('layui-bg-green layui-bg-red');
|
||||
} else if (status === 2) {
|
||||
if (message.indexOf('>>>') > -1) {
|
||||
that.$title.html('<b class="color-blue">' + message + '</b>').addClass('text-center');
|
||||
that.$name.html('<b class="color-blue">' + message + '</b>').addClass('text-center');
|
||||
} else {
|
||||
that.$title.html('<b class="color-blue">正在处理：</b>' + message).removeClass('text-center');
|
||||
that.$name.html('<b class="color-blue">正在处理：</b>' + message).removeClass('text-center');
|
||||
}
|
||||
that.$percent.addClass('layui-bg-blue').removeClass('layui-bg-green layui-bg-red');
|
||||
} else if (status === 3) {
|
||||
that.$title.html('<b class="color-green">' + message + '</b>').addClass('text-center');
|
||||
that.$name.html('<b class="color-green">' + message + '</b>').addClass('text-center');
|
||||
that.$percent.addClass('layui-bg-green').removeClass('layui-bg-blue layui-bg-red');
|
||||
} else if (status === 4) {
|
||||
that.$title.html('<b class="color-red">' + message + '</b>').addClass('text-center');
|
||||
that.$name.html('<b class="color-red">' + message + '</b>').addClass('text-center');
|
||||
that.$percent.addClass('layui-bg-red').removeClass('layui-bg-blue layui-bg-green');
|
||||
}
|
||||
};
|
||||
@ -855,12 +855,12 @@ $(function () {
|
||||
that.runCache(code, this.lineIndex, 1), location.href = this.line.message;
|
||||
}
|
||||
}
|
||||
that.$code.html(that.lines.join("<br>")), that.$code.animate({scrollTop: that.$code[0].scrollHeight + 'px'}, 200);
|
||||
that.$code.html('<p>' + that.lines.join('</p><p>') + '</p>'), that.$code.animate({scrollTop: that.$code[0].scrollHeight + 'px'}, 200);
|
||||
that.$percent.attr('lay-percent', (parseFloat(ret.data.progress || '0.00').toFixed(2)) + '%'), layui.element.render();
|
||||
if (ret.data.status > 0) that.setState(parseInt(ret.data.status), ret.data.message);
|
||||
else return that.setState(4, '获取任务详情失败！'), false;
|
||||
if (parseInt(ret.data.status) === 3 || parseInt(ret.data.status) === 4) return false;
|
||||
return setTimeout(function () {
|
||||
if (ret.data.status > 0) that.setState(parseInt(ret.data.status), ret.data.message); else return setTimeout(function () {
|
||||
loadprocess(code);
|
||||
}, Math.floor(Math.random() * 500) + 200), false;
|
||||
if (parseInt(ret.data.status) === 3 || parseInt(ret.data.status) === 4) return false; else return setTimeout(function () {
|
||||
loadprocess(code);
|
||||
}, Math.floor(Math.random() * 200)), false;
|
||||
}
|
||||
|
||||
2
vendor/composer/autoload_classmap.php
vendored
2
vendor/composer/autoload_classmap.php
vendored
@ -236,7 +236,7 @@ return array(
|
||||
'app\\data\\service\\PaymentService' => $baseDir . '/app/data/service/PaymentService.php',
|
||||
'app\\data\\service\\TruckService' => $baseDir . '/app/data/service/TruckService.php',
|
||||
'app\\data\\service\\UserService' => $baseDir . '/app/data/service/UserService.php',
|
||||
'app\\data\\service\\payment\\AliPaymentService' => $baseDir . '/app/data/service/payment/AliPaymentService.php',
|
||||
'app\\data\\service\\payment\\AlipayPaymentService' => $baseDir . '/app/data/service/payment/AlipayPaymentService.php',
|
||||
'app\\data\\service\\payment\\JoinPaymentService' => $baseDir . '/app/data/service/payment/JoinPaymentService.php',
|
||||
'app\\data\\service\\payment\\WechatPaymentService' => $baseDir . '/app/data/service/payment/WechatPaymentService.php',
|
||||
'app\\index\\controller\\Index' => $baseDir . '/app/index/controller/Index.php',
|
||||
|
||||
2
vendor/composer/autoload_static.php
vendored
2
vendor/composer/autoload_static.php
vendored
@ -364,7 +364,7 @@ class ComposerStaticInit4f89fd0e0503ccf740f2fa5757825d7b
|
||||
'app\\data\\service\\PaymentService' => __DIR__ . '/../..' . '/app/data/service/PaymentService.php',
|
||||
'app\\data\\service\\TruckService' => __DIR__ . '/../..' . '/app/data/service/TruckService.php',
|
||||
'app\\data\\service\\UserService' => __DIR__ . '/../..' . '/app/data/service/UserService.php',
|
||||
'app\\data\\service\\payment\\AliPaymentService' => __DIR__ . '/../..' . '/app/data/service/payment/AliPaymentService.php',
|
||||
'app\\data\\service\\payment\\AlipayPaymentService' => __DIR__ . '/../..' . '/app/data/service/payment/AlipayPaymentService.php',
|
||||
'app\\data\\service\\payment\\JoinPaymentService' => __DIR__ . '/../..' . '/app/data/service/payment/JoinPaymentService.php',
|
||||
'app\\data\\service\\payment\\WechatPaymentService' => __DIR__ . '/../..' . '/app/data/service/payment/WechatPaymentService.php',
|
||||
'app\\index\\controller\\Index' => __DIR__ . '/../..' . '/app/index/controller/Index.php',
|
||||
|
||||
8
vendor/composer/installed.json
vendored
8
vendor/composer/installed.json
vendored
@ -937,12 +937,12 @@
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/zoujingli/ThinkLibrary.git",
|
||||
"reference": "e36a26234c88c85d48ebc69beab9e953c6d79dd5"
|
||||
"reference": "1fe6534d9075bcd3c421e6ef7399ac32341ac7f4"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/e36a26234c88c85d48ebc69beab9e953c6d79dd5",
|
||||
"reference": "e36a26234c88c85d48ebc69beab9e953c6d79dd5",
|
||||
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/1fe6534d9075bcd3c421e6ef7399ac32341ac7f4",
|
||||
"reference": "1fe6534d9075bcd3c421e6ef7399ac32341ac7f4",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
@ -959,7 +959,7 @@
|
||||
"ext-mbstring": "*",
|
||||
"topthink/framework": "^6.0"
|
||||
},
|
||||
"time": "2020-12-15T10:37:34+00:00",
|
||||
"time": "2020-12-16T07:15:01+00:00",
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"think": {
|
||||
|
||||
2
vendor/services.php
vendored
2
vendor/services.php
vendored
@ -1,5 +1,5 @@
|
||||
<?php
|
||||
// This file is automatically generated at:2020-12-15 18:46:36
|
||||
// This file is automatically generated at:2020-12-17 10:58:31
|
||||
declare (strict_types = 1);
|
||||
return array (
|
||||
0 => 'think\\admin\\Library',
|
||||
|
||||
@ -66,6 +66,7 @@ class Database extends Command
|
||||
foreach ($tables as $table) {
|
||||
$this->queue->message($total, ++$used, "正在修复数据表 {$table}");
|
||||
$this->app->db->query("REPAIR TABLE `{$table}`");
|
||||
$this->queue->message($total, $used, "完成修复数据表 {$table}", 1);
|
||||
}
|
||||
$this->queue->success("已完成对 {$total} 张数据表修复操作");
|
||||
}
|
||||
@ -85,6 +86,7 @@ class Database extends Command
|
||||
foreach ($tables as $table) {
|
||||
$this->queue->message($total, ++$used, "正在优化数据表 {$table}");
|
||||
$this->app->db->query("OPTIMIZE TABLE `{$table}`");
|
||||
$this->queue->message($total, $used, "完成优化数据表 {$table}", 1);
|
||||
}
|
||||
$this->queue->success("已完成对 {$total} 张数据表优化操作");
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user