Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
apaas-ui
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gzga-jzapi
apaas-ui
Commits
a06c733a
Commit
a06c733a
authored
Jul 25, 2020
by
徐一鸣
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
分配信息确认fixed
parent
3a2e1c44
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
5 deletions
+27
-5
src/assets/css/index.css
src/assets/css/index.css
+1
-1
src/components/allot-info-confirm.vue
src/components/allot-info-confirm.vue
+26
-4
No files found.
src/assets/css/index.css
View file @
a06c733a
...
...
@@ -668,7 +668,7 @@ width: 620px!important;
}
.apaas_detail_container
.main_contaner.locked_height
{
height
:
calc
(
100vh
-
84px
-
83px
);
min-height
:
8
00px
;
min-height
:
4
00px
;
}
.apaas_detail_container
.detail_action
{
text-align
:
right
;
...
...
src/components/allot-info-confirm.vue
View file @
a06c733a
...
...
@@ -59,6 +59,25 @@
<span
class=
"text_grey"
>
内存:
</span>
<span
v-text=
"(detail && detail['memory']) || '-'"
></span>
</p>
<p
class=
"info_text info_cell"
>
<span
class=
"text_grey"
>
容器组:
</span>
<span
v-text=
"(detail && detail['containers']) || '-'"
></span>
</p>
<p
class=
"info_text info_cell"
>
<span
class=
"text_grey"
>
数据盘:
</span>
<span
v-text=
"(detail && detail['disk']) || '-'"
></span>
</p>
</div>
<div
class=
"detail_list"
>
<p
class=
"info_text"
>
单个容器组规格:
</p>
<p
class=
"info_text info_cell"
>
<span
class=
"text_grey"
>
CPU:
</span>
<span
v-text=
"(detail && detail['one_cpu']) || '-'"
></span>
</p>
<p
class=
"info_text info_cell"
>
<span
class=
"text_grey"
>
内存:
</span>
<span
v-text=
"(detail && detail['one_memory']) || '-'"
></span>
</p>
</div>
<div
class=
"detail_list"
>
<p
class=
"info_text"
>
申请时长:
</p>
...
...
@@ -110,7 +129,7 @@ export default {
this
.
$http
.
get
(
"
/apaas/service/v3/resource/apply/distributionDisplay
"
,
{
params
:
{
apply_id
:
apply_id
apply_id
:
apply_id
,
},
})
.
then
(({
data
})
=>
{
...
...
@@ -119,8 +138,11 @@ export default {
this
.
detail
=
{
...
datas
,
cpu
:
`最高
${
datas
.
max_cpu
}
核,默认
${
datas
.
min_cpu
}
核`
,
memory
:
`最高
${
datas
.
max_memory
}
GB,默认
${
datas
.
min_memory
}
GB`
,
cpu
:
`
${
datas
.
cpu
}
核`
,
memory
:
`
${
datas
.
memory
}
G`
,
containers
:
`
${
datas
.
containers
}
个`
,
one_cpu
:
`最高
${
datas
.
max_cpu
}
核,默认
${
datas
.
min_cpu
}
核`
,
one_memory
:
`最高
${
datas
.
max_memory
}
GB,默认
${
datas
.
min_memory
}
GB`
,
};
}
else
{
this
.
$message
({
...
...
@@ -146,7 +168,7 @@ export default {
params
:
{
id
:
this
.
detail
.
id
,
user_id
:
this
.
detail
.
user_id
,
namespace
:
this
.
detail
.
namespace
namespace
:
this
.
detail
.
namespace
,
},
})
.
then
(({
data
})
=>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment