diff --git a/plugins/migration_api/js/app.js b/plugins/migration_api/js/app.js index 7226bf4fb..7333a1bfa 100755 --- a/plugins/migration_api/js/app.js +++ b/plugins/migration_api/js/app.js @@ -200,10 +200,25 @@ function renderMigrationProgress(){ console.log('sss:',rdata); if (rdata.status){ - $('.psync_migrate .action').text(rdata['data']['action']); - $('.psync_migrate .done').text(rdata['data']['done']); - $('.psync_migrate pre').text(rdata['data']['log']); - renderMigrationProgress(); + + + if (rdata['data']['action'] == 'True'){ + var end = '
\ +
\ +

传输大小: 4.92 KB,耗时: 0分6秒,平均速度: 840 B/s

\ +

\ + \ + 迁移日志\ +

\ +
\ +
'; + $('.psync_migrate').html(end); + } else{ + $('.psync_migrate .action').text(rdata['data']['action']); + $('.psync_migrate .done').text(rdata['data']['done']); + $('.psync_migrate pre').text(rdata['data']['log']); + renderMigrationProgress(); + } } else{ layer.msg(rdata.msg,{icon:1}); } @@ -239,16 +254,6 @@ function initStep4(){ '; - // var end = '
\ - //
\ - //

传输大小: 4.92 KB,耗时: 0分6秒,平均速度: 840 B/s

\ - //

\ - // \ - // 迁移日志\ - //

\ - //
\ - //
'; - $('.psync_data').hide(); $('.psync_migrate').html(progress); $('.psync_migrate').show(); @@ -265,12 +270,6 @@ function initStep(){ $('input[name="sync_token"]').val(rdata.data['token']); }); - var step = $('.step_head .active span').text(); - $('.infoNext').click(function(){ - initStep1(); - }); - - $('.infoNext').click(function(){ initStep1(); }); @@ -300,6 +299,12 @@ function initStep(){ $('.psync_data').on('click', '.dataMigrate', function(){ initStep4(); }); + + $('.psync_migrate').on('click', '.okBtn', function(){ + $('.psync_migrate').hide(); + $('.psync_info').show(); + selectProgress(1); + }); }