From a28da0a6b98cfca361942197b7c11c2ea41c99cb Mon Sep 17 00:00:00 2001 From: zhaoke Date: Fri, 30 Dec 2022 03:49:24 +0000 Subject: [PATCH] * Remove vnc. --- module/zahost/view/view.html.php | 2 +- module/zanode/control.php | 1 + module/zanode/css/view.css | 7 +- module/zanode/js/view.js | 46 +++++++++---- module/zanode/lang/de.php | 2 +- module/zanode/lang/en.php | 2 +- module/zanode/lang/fr.php | 2 +- module/zanode/lang/zh-cn.php | 2 +- module/zanode/view/view.html.php | 110 +++++++++++++++---------------- 9 files changed, 98 insertions(+), 76 deletions(-) diff --git a/module/zahost/view/view.html.php b/module/zahost/view/view.html.php index 4dc5e4c193..ccac973b2d 100644 --- a/module/zahost/view/view.html.php +++ b/module/zahost/view/view.html.php @@ -149,7 +149,7 @@ - name;?> + createLink('zanode', 'view', "id=$node->id"), $node->name, '', "");?> zanode->os->cpuCores, $node->cpuCores);?> memory . $this->lang->zahost->unitList['GB'];?> diskSize . $this->lang->zahost->unitList['GB'];?> diff --git a/module/zanode/control.php b/module/zanode/control.php index 6b50f0dd41..10346d95eb 100644 --- a/module/zanode/control.php +++ b/module/zanode/control.php @@ -402,6 +402,7 @@ class zanode extends control $serviceStatus['ZenAgent'] = "unknown"; $serviceStatus['ZTF'] = "unknown"; } + $serviceStatus['node'] = $node->status; return $this->send(array('result' => 'success', 'message' => '', 'data' => $serviceStatus)); } diff --git a/module/zanode/css/view.css b/module/zanode/css/view.css index 43ab0c1041..dbe31a9571 100644 --- a/module/zanode/css/view.css +++ b/module/zanode/css/view.css @@ -10,7 +10,8 @@ .status-notice a{color: #2463c7;} .service-status a{color: #2463c7;} .service-status{margin-top: 10px;} -.vnc-detail{min-height: 60vh;} -.vnc-mask{width: 100%;height:100%;background-color: rgba(0,0,0,0);position: absolute;} +.vnc-detail{height: 60vh;min-height: 550px;} +.vnc-mask{width: 100%;height:100%;background-color: rgba(0,0,0,0);position: absolute;z-index: 1;} #checkServiceStatus{background-color:unset;} -.checkStatus{color: #313c52;} \ No newline at end of file +.checkStatus{color: #313c52;} +.node-not-wrap{white-space: nowrap;} \ No newline at end of file diff --git a/module/zanode/js/view.js b/module/zanode/js/view.js index e3f41ef1a4..506fb161a3 100644 --- a/module/zanode/js/view.js +++ b/module/zanode/js/view.js @@ -1,11 +1,3 @@ -var ifm = document.getElementById("vncIframe"); -ifm.height=$('.vnc-detail').css('height') -$('.vnc-mask').click(function(){ - window.open(createLink('zanode', 'getVNC', "id=" + nodeID)) -}) -$('.vnc-mask').css('width', $('.vnc-detail').css('width')); -$('.vnc-mask').css('height', $('.vnc-detail').css('height')); - $('#checkServiceStatus').click(function(){ $.get(createLink('zanode', 'ajaxGetServiceStatus', 'nodeID=' + nodeID), function(response) @@ -45,6 +37,13 @@ $('#checkServiceStatus').click(function(){ $('.ztf-install').text(zanodeLang.install); } } + else if(key == "node") + { + if(nodeStatus != resultData.data[key]) + { + window.location.reload(); + } + } else { if(resultData.data[key] == 'ready') @@ -105,14 +104,36 @@ $('.node-init-install').on('click', function(){ }) }) -$('.btn-init-copy').live('click', function() +$('.btn-ssh-copy').live('click', function() { - var copyText = $('#initBash'); + var copyText = $('#ssh-copy'); copyText.show(); copyText .select(); document.execCommand("Copy"); copyText.hide(); - $('.btn-init-copy').tooltip({ + $('.btn-ssh-copy').tooltip({ + trigger: 'click', + placement: 'bottom', + title: zanodeLang.copied, + tipClass: 'tooltip-success' + }); + + $(this).tooltip('show'); + var that = this; + setTimeout(function() + { + $(that).tooltip('hide') + }, 2000) +}) + +$('.btn-pwd-copy').live('click', function() +{ + var copyText = $('#pwd-copy'); + copyText.show(); + copyText .select(); + document.execCommand("Copy"); + copyText.hide(); + $('.btn-pwd-copy').tooltip({ trigger: 'click', placement: 'bottom', title: zanodeLang.copied, @@ -129,4 +150,7 @@ $('.btn-init-copy').live('click', function() $(function(){ $('#checkServiceStatus').trigger("click") + setInterval(() => { + $('#checkServiceStatus').trigger("click") + }, 2000); }) \ No newline at end of file diff --git a/module/zanode/lang/de.php b/module/zanode/lang/de.php index 0c1543e21b..4fbaf3e9b4 100644 --- a/module/zanode/lang/de.php +++ b/module/zanode/lang/de.php @@ -96,7 +96,7 @@ $lang->zanode->statusList['destroy'] = 'Destroyed'; $lang->zanode->statusList['shutoff'] = 'Shutoff'; $lang->zanode->statusList['shutdown'] = 'shutdown'; $lang->zanode->statusList['destroy_fail'] = 'Destroy Fail'; -$lang->zanode->statusList['wait'] = 'Waiting For Init'; +$lang->zanode->statusList['wait'] = 'Initializing'; $lang->zanode->statusList['online'] = 'Online'; $lang->zanode->initNotice = "Succeeded. Please initialize the execution node or return to the list."; diff --git a/module/zanode/lang/en.php b/module/zanode/lang/en.php index 6a7d4f167a..05eb05ab04 100644 --- a/module/zanode/lang/en.php +++ b/module/zanode/lang/en.php @@ -96,7 +96,7 @@ $lang->zanode->statusList['destroy'] = 'Destroyed'; $lang->zanode->statusList['shutoff'] = 'Shutoff'; $lang->zanode->statusList['shutdown'] = 'shutdown'; $lang->zanode->statusList['destroy_fail'] = 'Destroy Fail'; -$lang->zanode->statusList['wait'] = 'Waiting For Init'; +$lang->zanode->statusList['wait'] = 'Initializing'; $lang->zanode->statusList['online'] = 'Online'; $lang->zanode->initNotice = "Succeeded. Please initialize the execution node or return to the list."; diff --git a/module/zanode/lang/fr.php b/module/zanode/lang/fr.php index 43ca2d5484..6402124550 100644 --- a/module/zanode/lang/fr.php +++ b/module/zanode/lang/fr.php @@ -96,7 +96,7 @@ $lang->zanode->statusList['destroy'] = 'Destroyed'; $lang->zanode->statusList['shutoff'] = 'Shutoff'; $lang->zanode->statusList['shutdown'] = 'shutdown'; $lang->zanode->statusList['destroy_fail'] = 'Destroy Fail'; -$lang->zanode->statusList['wait'] = 'Waiting For Init'; +$lang->zanode->statusList['wait'] = 'Initializing'; $lang->zanode->statusList['online'] = 'Online'; $lang->zanode->initNotice = "Succeeded. Please initialize the execution node or return to the list."; diff --git a/module/zanode/lang/zh-cn.php b/module/zanode/lang/zh-cn.php index d305128e0c..3f6bfc8f36 100644 --- a/module/zanode/lang/zh-cn.php +++ b/module/zanode/lang/zh-cn.php @@ -96,7 +96,7 @@ $lang->zanode->statusList['destroy'] = '已销毁'; $lang->zanode->statusList['shutoff'] = '已关机'; $lang->zanode->statusList['shutodown'] = '已关机'; $lang->zanode->statusList['destroy_fail'] = '销毁失败'; -$lang->zanode->statusList['wait'] = '待初始化'; +$lang->zanode->statusList['wait'] = '初始化中'; $lang->zanode->statusList['online'] = '已上架'; $lang->zanode->initNotice = "保存成功，请初始化执行节点或返回列表。"; diff --git a/module/zanode/view/view.html.php b/module/zanode/view/view.html.php index 5bcb0cf1bf..0f89e69f12 100644 --- a/module/zanode/view/view.html.php +++ b/module/zanode/view/view.html.php @@ -20,7 +20,7 @@ zanode->actionSuccess) ?> id) ?> zanode); ?> - +status); ?> session->zanodeList ? $this->session->zanodeList : $this->createLink('zanode', 'browse', ""); ?> id}&orderBy=%s"; @@ -55,13 +55,14 @@ $account = strpos($zanode->osName, "windows") ? $config->zanode->defaultWinAccou
zanode->sshAddress; ?>:
-
ssh ip . ' -p ' . $zanode->ssh; ?>
+
ssh ip . ' -p ' . $zanode->ssh; ?>   "; ?>
+
zanode->cpuCores; ?>:
-
cpuCores; ?>
+
cpuCores . ' ' . $lang->zahost->cpuUnit; ?>
@@ -81,7 +82,7 @@ $account = strpos($zanode->osName, "windows") ? $config->zanode->defaultWinAccou
zanode->memory; ?>:
-
memory; ?>GB
+
memory; ?> GB
@@ -95,13 +96,14 @@ $account = strpos($zanode->osName, "windows") ? $config->zanode->defaultWinAccou
zanode->defaultPwd; ?>:
-
zanode->defaultPwd; ?>
+
zanode->defaultPwd . ' ' . ""; ?>
+
zanode->diskSize; ?>:
-
diskSize; ?>GB
+
diskSize; ?> GB
@@ -115,57 +117,6 @@ $account = strpos($zanode->osName, "windows") ? $config->zanode->defaultWinAccou ?>
-
-
- ";?> -
-
- printExtendFields($zanode, 'div', "position=left&inForm=0&inCell=1"); ?> -
-
- ' . $lang->goback, '', 'btn btn-secondary'); ?> -
- deleted)) { - $suspendAttr = "title='{$lang->zanode->suspend}' target='hiddenwin'"; - $suspendAttr .= $zanode->status != 'running' && $zanode->status != 'wait' ? ' class="btn disabled"' : "class='btn' target='hiddenwin' onclick='if(confirm(\"{$lang->zanode->confirmSuspend}\")==false) return false;'"; - - $resumeAttr = "title='{$lang->zanode->resume}' target='hiddenwin'"; - $resumeAttr .= $zanode->status == 'running' || $zanode->status == 'wait' ? ' class="btn disabled"' : "class='btn' target='hiddenwin' onclick='if(confirm(\"{$lang->zanode->confirmResume}\")==false) return false;'"; - - $rebootAttr = "title='{$lang->zanode->reboot}' target='hiddenwin'"; - $rebootAttr .= $zanode->status == 'shutoff' ? ' class="btn disabled"' : "class='btn' target='hiddenwin' onclick='if(confirm(\"{$lang->zanode->confirmReboot}\")==false) return false;'"; - - if($zanode->status == "suspend") - { - common::printLink('zanode', 'resume', "zanodeID={$zanode->id}", " " . $lang->zanode->resumeNode, '', $resumeAttr); - } - else - { - common::printLink('zanode', 'suspend', "zanodeID={$zanode->id}", " " . $lang->zanode->suspendNode, '', $suspendAttr); - } - - if($zanode->status == "shutoff") - { - common::printLink('zanode', 'start', "zanodeID={$zanode->id}", " " . $lang->zanode->bootNode, '', "title='{$lang->zanode->boot}' class='btn '"); - } - else - { - common::printLink('zanode', 'close', "zanodeID={$zanode->id}", " " . $lang->zanode->shutdownNode, '', "title='{$lang->zanode->shutdown}' class='btn '"); - } - - common::printLink('zanode', 'reboot', "zanodeID={$zanode->id}", " " . $lang->zanode->rebootNode, '', $rebootAttr); - - common::printLink('zanode', 'getVNC', "id={$zanode->id}", " " . $lang->zanode->getVNC, '_blank', "title='{$lang->zanode->getVNC}' class='btn desktop " . (in_array($zanode->status ,array('running', 'launch', 'wait')) ? '':'disabled') . "'", ''); - } - ?> -
- zanode->buildOperateMenu($zanode, 'view'); ?> -
-
- -
-
zanode->init->statusTitle; ?> @@ -199,6 +150,51 @@ $account = strpos($zanode->osName, "windows") ? $config->zanode->defaultWinAccou
desc) ? htmlspecialchars_decode($zanode->desc) : $lang->noData; ?>
+ printExtendFields($zanode, 'div', "position=left&inForm=0&inCell=1"); ?> +
+
+ ' . $lang->goback, '', 'btn btn-secondary'); ?> +
+ deleted)) { + $suspendAttr = "title='{$lang->zanode->suspend}' target='hiddenwin'"; + $suspendAttr .= $zanode->status != 'running' && $zanode->status != 'wait' ? ' class="btn disabled"' : "class='btn' target='hiddenwin' onclick='if(confirm(\"{$lang->zanode->confirmSuspend}\")==false) return false;'"; + + $resumeAttr = "title='{$lang->zanode->resume}' target='hiddenwin'"; + $resumeAttr .= $zanode->status == 'running' || $zanode->status == 'wait' ? ' class="btn disabled"' : "class='btn' target='hiddenwin' onclick='if(confirm(\"{$lang->zanode->confirmResume}\")==false) return false;'"; + + $rebootAttr = "title='{$lang->zanode->reboot}' target='hiddenwin'"; + $rebootAttr .= $zanode->status == 'shutoff' ? ' class="btn disabled"' : "class='btn' target='hiddenwin' onclick='if(confirm(\"{$lang->zanode->confirmReboot}\")==false) return false;'"; + common::printLink('zanode', 'getVNC', "id={$zanode->id}", " " . $lang->zanode->getVNC, '_blank', "title='{$lang->zanode->getVNC}' class='btn desktop " . (in_array($zanode->status ,array('running', 'launch', 'wait')) ? '':'disabled') . "'", ''); + + if($zanode->status == "suspend") + { + common::printLink('zanode', 'resume', "zanodeID={$zanode->id}", " " . $lang->zanode->resumeNode, '', $resumeAttr); + } + else + { + common::printLink('zanode', 'suspend', "zanodeID={$zanode->id}", " " . $lang->zanode->suspendNode, '', $suspendAttr); + } + + if($zanode->status == "shutoff") + { + common::printLink('zanode', 'start', "zanodeID={$zanode->id}", " " . $lang->zanode->bootNode, '', "title='{$lang->zanode->boot}' class='btn '"); + } + else + { + common::printLink('zanode', 'close', "zanodeID={$zanode->id}", " " . $lang->zanode->shutdownNode, '', "title='{$lang->zanode->shutdown}' class='btn '"); + } + + common::printLink('zanode', 'reboot', "zanodeID={$zanode->id}", " " . $lang->zanode->rebootNode, '', $rebootAttr); + + } + ?> +
+ zanode->buildOperateMenu($zanode, 'view'); ?> +
+
+
+