Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Fix issue

Browse Source
This commit is contained in:
zhaoke
2022-12-09 05:57:49 +00:00
parent 6a65a41eef
commit c45cc99854
14 changed files with 47 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/zahost/control.php
+1 -1
View File
@@ -69,7 +69,7 @@ class zahost extends control
$this->view->zahost = $this->zahost->getById($id);
$this->view->orderBy = $orderBy;
$this->view->nodeList = $this->loadModel("zanode")->getListByHost($this->view->zahost->parent, $orderBy);
$this->view->nodeList = $this->loadModel("zanode")->getListByHost($this->view->zahost->id, $orderBy);
$this->view->actions = $this->loadModel('action')->getList('zahost', $id);
$this->view->users = $this->loadModel('user')->getPairs('noletter|nodeleted');
$this->display();
module/zahost/css/browse.css
+1 -1
View File
@@ -1,5 +1,5 @@
.c-ip {width: 100px;}
.c-memory, .c-diskSize, .c-status, .c-cpuCores, .c-software, .c-instanceNum {width: 90px;}
.c-memory, .c-diskSize, .c-status, .c-cpu, .c-software, .c-instanceNum {width: 90px;}
.c-datetime {width: 150px;}
.status-wait {color: #f00;}
.c-actions {overflow: visible!important;}
module/zahost/css/init.css
+6 -19
View File
@@ -1,19 +1,6 @@
.dot-symbol{
margin-right: 10px;
}
#statusContainer h5{
line-height: 20px;
}
.host-desc-container{
margin-top: 20px;
}
.host-action{
margin-top: 60px;
}
.host-action .btn{
margin-left: 20px;
min-width: 100px;
}
.zahost-init-desc{
display: inline-block;
}
.dot-symbol {margin-right: 10px;}
#statusContainer h5 {line-height: 20px;}
.host-desc-container {margin-top: 20px;}
.host-action {margin-top: 60px;}
.host-action .btn {margin-left: 20px;min-width: 100px;}
.zahost-init-desc {display: inline-block;}
module/zahost/css/view.css
+8 -2
View File
@@ -1,5 +1,11 @@
.zahost-detail .text-right{text-align: right;}
.zahost-detail .col-8{padding-left: 10px;}
.zahost-detail .detail-content{color: #838a9d;}
.table.has-sort-head thead tr th a:after{line-height: 22px;}
.table.has-sort-head thead tr th a:before{line-height: 22px;}
.table.has-sort-head thead tr th a:before{line-height: 22px;}
.c-cpu {width: 100px;}
.c-os {width: 200px;}
.c-memory, .c-diskSize, .c-status, .c-software, .c-instanceNum {width: 90px;}
.c-datetime {width: 150px;}
.status-wait {color: #f00;}
.c-actions {overflow: visible!important;}
.zanode-mt-8{margin-top: 8px;}
module/zahost/lang/zh-cn.php
+1 -1
View File
@@ -66,7 +66,7 @@ $lang->zahost->init->statusTitle = "服务状态";
$lang->zahost->image = new stdclass;
$lang->zahost->image->list = '镜像仓库';
$lang->zahost->image->browseImage = '镜像列表';
$lang->zahost->image->browseImage = '镜像仓库';
$lang->zahost->image->createImage = '创建镜像';
$lang->zahost->image->choseImage = '选择镜像';
$lang->zahost->image->downloadImage = '下载镜像';
module/zahost/view/browse.html.php
+1 -1
View File
@@ -38,7 +38,7 @@
</p>
</div>
<?php else:?>
<table class='table has-sort-head table-fixed' id='hostTable'>
<table class='table has-sort-head' id='hostTable'>
<thead>
<tr>
<?php $vars = "browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";?>
module/zahost/view/view.html.php
+2 -2
View File
@@ -33,7 +33,7 @@
<div class="detail zahost-detail">
<div class="detail-title"><?php echo $lang->zahost->view;?></div>
<div class="detail-content article-content">
<div class="main-row">
<div class="main-row zanode-mt-8">
<div class="col-4">
<div class="main-row">
<div class="col-4 text-right"><?php echo $lang->zahost->zaHostType;?>:</div>
@@ -53,7 +53,7 @@
</div>
</div>
</div>
<div class="main-row">
<div class="main-row zanode-mt-8">
<div class="col-4">
<div class="main-row">
<div class="col-4 text-right"><?php echo $lang->zahost->vsoft;?>:</div>
module/zanode/css/init.css
+6 -19
View File
@@ -1,19 +1,6 @@
.dot-symbol{
margin-right: 10px;
}
#statusContainer h5{
line-height: 20px;
}
.host-desc-container{
margin-top: 20px;
}
.host-action{
margin-top: 60px;
}
.host-action .btn{
margin-left: 20px;
min-width: 100px;
}
.zahost-init-desc{
display: inline-block;
}
.dot-symbol{margin-right: 10px;}
#statusContainer h5{line-height: 20px;}
.host-desc-container{margin-top: 20px;}
.host-action{margin-top: 60px;}
.host-action .btn{margin-left: 20px;min-width: 100px;}
.zahost-init-desc{display: inline-block;}
module/zanode/css/view.css
+3 -2
View File
@@ -1,5 +1,6 @@
.zanode-detail .text-right{text-align: right;}
.zanode-detail .col-8{padding-left: 10px;}
.zanode-detail .detail-content{color: #838a9d;}
.table.has-sort-head thead tr th a:after{line-height: 22px;}
.table.has-sort-head thead tr th a:before{line-height: 22px;}
.table.has-sort-head thead tr th a:before{line-height: 22px;}
.main-row-last{table-layout: auto;}
.zanode-mt-8{margin-top: 8px;}
module/zanode/lang/de.php
+2
View File
@@ -81,6 +81,8 @@ $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['online'] = 'Online';
$lang->zanode->init = new stdclass;
$lang->zanode->init->checkStatus = "Check Service Status";
module/zanode/lang/en.php
+2
View File
@@ -81,6 +81,8 @@ $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['online'] = 'Online';
$lang->zanode->init = new stdclass;
$lang->zanode->init->checkStatus = "Check Service Status";
module/zanode/lang/fr.php
+2
View File
@@ -81,6 +81,8 @@ $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['online'] = 'Online';
$lang->zanode->init = new stdclass;
$lang->zanode->init->checkStatus = "Check Service Status";
module/zanode/lang/zh-cn.php
+4 -2
View File
@@ -18,7 +18,7 @@ $lang->zanode->byQuery = '搜索';
$lang->zanode->osName = '操作系统';
$lang->zanode->image = '镜像';
$lang->zanode->imageName = '镜像名称';
$lang->zanode->name = '执行节点名称';
$lang->zanode->name = '名称';
$lang->zanode->start = '创建后自动开启';
$lang->zanode->hostName = '所属宿主机';
$lang->zanode->host = $lang->zanode->hostName;
@@ -81,6 +81,8 @@ $lang->zanode->statusList['destroy'] = '已销毁';
$lang->zanode->statusList['shutoff'] = '已关机';
$lang->zanode->statusList['shutodown'] = '已关机';
$lang->zanode->statusList['destroy_fail'] = '销毁失败';
$lang->zanode->statusList['wait'] = '待初始化';
$lang->zanode->statusList['online'] = '已上架';
$lang->zanode->init = new stdclass;
$lang->zanode->init->statusTitle = "服务状态";
@@ -100,4 +102,4 @@ $lang->zanode->init->serviceStatus = [
];
$lang->zanode->init->title = "初始化执行节点";
$lang->zanode->init->descTitle = "请根据引导完成执行节点上的初始化: ";
$lang->zanode->init->initDesc = "- 在执行节点上执行命令：bash <(curl -s -S -L https://pkg.qucheng.com/zenagent/zagent.sh) -s zvm -k %s<br>- 点击检测服务状态。";$lang->zanode->init->statusTitle = "Service Status";
$lang->zanode->init->initDesc = "- 在执行节点上执行命令：bash <(curl -s -S -L https://pkg.qucheng.com/zenagent/zagent.sh) -s zvm -k %s<br>- 点击检测服务状态。";$lang->zanode->init->statusTitle = "服务状态";
module/zanode/view/view.html.php
+8 -8
View File
@@ -39,7 +39,7 @@
<div class="detail zanode-detail">
<div class="detail-title"><?php echo $lang->zanode->view; ?></div>
<div class="detail-content article-content">
<div class="main-row">
<div class="main-row zanode-mt-8">
<div class="col-4">
<div class="main-row">
<div class="col-4 text-right">IP:</div>
@@ -59,11 +59,11 @@
</div>
</div>
</div>
<div class="main-row">
<div class="main-row zanode-mt-8">
<div class="col-4">
<div class="main-row">
<div class="col-4 text-right"><?php echo $lang->zanode->hostName; ?>:</div>
<div class="col-8"><?php echo $zanode->hostName; ?></div>
<div class="col-4 text-right"><?php echo $lang->zanode->status; ?>:</div>
<div class="col-8"><?php echo zget($lang->zanode->statusList, $zanode->status); ?></div>
</div>
</div>
<div class="col-4">
@@ -79,11 +79,11 @@
</div>
</div>
</div>
<div class="main-row">
<div class="main-row main-row-last zanode-mt-8">
<div class="col-4">
<div class="main-row">
<div class="col-4 text-right"><?php echo $lang->zanode->status; ?>:</div>
<div class="col-8"><?php echo zget($lang->zanode->statusList, $zanode->status); ?></div>
<div class="col-4 text-right"><?php echo $lang->zanode->hostName; ?>:</div>
<div class="col-8"><?php echo $zanode->hostName; ?></div>
</div>
</div>
<div class="col-4"></div>
@@ -114,7 +114,7 @@
}
elseif($zanode->status == "suspend")
{
common::printLink('zanode', 'resume', "id={$zanode->id}", "<i class='icon icon-restart'></i> " . $lang->zanode->resume, '', "title='{$lang->zanode->resume}' class='btn' target='hiddenwin' onclick='if(confirm(\"{$lang->zanode->confirmResume}\")==false) return false;'");
common::printLink('zanode', 'resume', "id={$zanode->id}", "<i class='icon icon-pause'></i> " . $lang->zanode->resume, '', "title='{$lang->zanode->resume}' class='btn' target='hiddenwin' onclick='if(confirm(\"{$lang->zanode->confirmResume}\")==false) return false;'");
}
common::printLink('zanode', 'getVNC', "id={$zanode->id}", "<i class='icon icon-desktop'></i> " . $lang->zanode->getVNC, '', "title='{$lang->zanode->getVNC}' class='btn iframe " . (common::hasPriv('zahost', 'getVNC') && $zanode->status == 'running' ? '':'disabled') . "'", '', true);
}