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
98c9bbb9
Commit
98c9bbb9
authored
Jul 17, 2020
by
张俊
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复禅道bug
parent
af236805
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
16 deletions
+17
-16
src/pages/authority/role/addroles.vue
src/pages/authority/role/addroles.vue
+1
-1
src/pages/authority/user/organizationuser.vue
src/pages/authority/user/organizationuser.vue
+5
-5
src/pages/workbench/fwgl/serviceDetail.vue
src/pages/workbench/fwgl/serviceDetail.vue
+1
-1
src/pages/workbench/fwgl/serviceEdit.vue
src/pages/workbench/fwgl/serviceEdit.vue
+7
-6
src/pages/workbench/workPlace.vue
src/pages/workbench/workPlace.vue
+3
-3
No files found.
src/pages/authority/role/addroles.vue
View file @
98c9bbb9
...
@@ -84,7 +84,7 @@ export default {
...
@@ -84,7 +84,7 @@ export default {
rules
:
{
rules
:
{
name
:
[
name
:
[
{
required
:
true
,
message
:
"
请输入角色名称
"
,
trigger
:
"
blur
"
},
{
required
:
true
,
message
:
"
请输入角色名称
"
,
trigger
:
"
blur
"
},
{
max
:
8
,
message
:
"
长度小于8个字符
"
,
trigger
:
"
blur
"
},
{
max
:
8
,
message
:
"
长度
应
小于8个字符
"
,
trigger
:
"
blur
"
},
],
],
desc
:
[
desc
:
[
{
required
:
true
,
message
:
"
请输入角色描述
"
,
trigger
:
"
blur
"
},
{
required
:
true
,
message
:
"
请输入角色描述
"
,
trigger
:
"
blur
"
},
...
...
src/pages/authority/user/organizationuser.vue
View file @
98c9bbb9
...
@@ -261,26 +261,26 @@ export default {
...
@@ -261,26 +261,26 @@ export default {
rules
:
{
rules
:
{
account
:
[
account
:
[
{
required
:
true
,
message
:
"
请输入账号
"
,
trigger
:
"
blur
"
},
{
required
:
true
,
message
:
"
请输入账号
"
,
trigger
:
"
blur
"
},
{
max
:
8
,
message
:
"
长度小于8个字符
"
,
trigger
:
"
blur
"
},
{
max
:
8
,
message
:
"
长度
应
小于8个字符
"
,
trigger
:
"
blur
"
},
],
],
password
:
[
password
:
[
{
required
:
true
,
message
:
"
请输入密码
"
,
trigger
:
"
blur
"
},
{
required
:
true
,
message
:
"
请输入密码
"
,
trigger
:
"
blur
"
},
{
max
:
20
,
message
:
"
长度小于20个字符
"
,
trigger
:
"
blur
"
},
{
max
:
20
,
message
:
"
长度
应
小于20个字符
"
,
trigger
:
"
blur
"
},
],
],
nickname
:
[
nickname
:
[
{
required
:
true
,
message
:
"
请输入昵称
"
,
trigger
:
"
blur
"
},
{
required
:
true
,
message
:
"
请输入昵称
"
,
trigger
:
"
blur
"
},
{
max
:
8
,
message
:
"
长度小于8个字符
"
,
trigger
:
"
blur
"
},
{
max
:
8
,
message
:
"
长度
应
小于8个字符
"
,
trigger
:
"
blur
"
},
],
],
type
:
[
type
:
[
{
required
:
true
,
message
:
"
请选择用户类型
"
,
trigger
:
"
change
"
},
{
required
:
true
,
message
:
"
请选择用户类型
"
,
trigger
:
"
change
"
},
],
],
systemname
:
[
systemname
:
[
{
required
:
true
,
message
:
"
请输入系统名称
"
,
trigger
:
"
blur
"
},
{
required
:
true
,
message
:
"
请输入系统名称
"
,
trigger
:
"
blur
"
},
{
max
:
16
,
message
:
"
长度小于16个字符
"
,
trigger
:
"
blur
"
},
{
max
:
16
,
message
:
"
长度
应
小于16个字符
"
,
trigger
:
"
blur
"
},
],
],
contact
:
[
contact
:
[
{
required
:
true
,
message
:
"
请输入联系人
"
,
trigger
:
"
blur
"
},
{
required
:
true
,
message
:
"
请输入联系人
"
,
trigger
:
"
blur
"
},
{
max
:
6
,
message
:
"
长度小于6个字符
"
,
trigger
:
"
blur
"
},
{
max
:
6
,
message
:
"
长度
应
小于6个字符
"
,
trigger
:
"
blur
"
},
],
],
phone
:
[
phone
:
[
{
required
:
true
,
message
:
"
请输入电话号码
"
,
trigger
:
"
blur
"
},
{
required
:
true
,
message
:
"
请输入电话号码
"
,
trigger
:
"
blur
"
},
...
...
src/pages/workbench/fwgl/serviceDetail.vue
View file @
98c9bbb9
<
template
>
<
template
>
<div
class=
"detail_contain"
>
<div
class=
"detail_contain"
>
<p
class=
"now_page_title"
>
<p
class=
"now_page_title"
>
我的服务 /
注册发布的服务
/
我的服务 /
{{
now_user
==
0
||
now_user
==
4
?
'
注册发布的服务
'
:
now_user
==
1
?
'
组织服务管理
'
:
'
平台服务管理
'
}}
/
<span>
服务详情
</span>
<span>
服务详情
</span>
</p>
</p>
<div
class=
"info_contain"
>
<div
class=
"info_contain"
>
...
...
src/pages/workbench/fwgl/serviceEdit.vue
View file @
98c9bbb9
...
@@ -177,23 +177,23 @@ export default {
...
@@ -177,23 +177,23 @@ export default {
now_edit
:
0
,
//信息和安全切换
now_edit
:
0
,
//信息和安全切换
now_safe
:
0
,
//切换安全
now_safe
:
0
,
//切换安全
imgList
:
[],
imgList
:
[],
timevalue
:
1
,
timevalue
:
''
,
timeoptions
:[
timeoptions
:[
{
{
label
:
'
day(天)
'
,
label
:
'
day(天)
'
,
value
:
0
,
value
:
3
,
},
},
{
{
label
:
'
hour(小时)
'
,
label
:
'
hour(小时)
'
,
value
:
1
,
value
:
2
,
},
},
{
{
label
:
'
min(分钟)
'
,
label
:
'
min(分钟)
'
,
value
:
2
,
value
:
1
,
},
},
{
{
label
:
'
second(秒)
'
,
label
:
'
second(秒)
'
,
value
:
3
,
value
:
0
,
},
},
],
],
safe_arr
:[
'
熔断管理
'
,
'
速率限制
'
,
'
TLS加密
'
,
'
敏感字段追踪
'
],
safe_arr
:[
'
熔断管理
'
,
'
速率限制
'
,
'
TLS加密
'
,
'
敏感字段追踪
'
],
...
@@ -319,7 +319,8 @@ export default {
...
@@ -319,7 +319,8 @@ export default {
}
}
}
}
if
(
this
.
open1
){
if
(
this
.
open1
){
if
(
this
.
maxline1
&&
this
.
usetime1
&&
(
this
.
timevalue
||
this
.
timevalue
==
0
)){
debugger
if
(
this
.
maxline1
&&
this
.
usetime1
&&
(
this
.
timevalue
!==
''
)){
}
else
{
}
else
{
this
.
$message
.
error
(
'
请输入所需参数
'
)
this
.
$message
.
error
(
'
请输入所需参数
'
)
...
...
src/pages/workbench/workPlace.vue
View file @
98c9bbb9
...
@@ -82,12 +82,12 @@
...
@@ -82,12 +82,12 @@
<div
style=
"width:142px;float:left;height:180px;margin-right:30px;"
>
<div
style=
"width:142px;float:left;height:180px;margin-right:30px;"
>
<dash-board
:data=
"cpu_data"
dangerousValue=
'workplace'
style=
"height:140px;"
></dash-board>
<dash-board
:data=
"cpu_data"
dangerousValue=
'workplace'
style=
"height:140px;"
></dash-board>
<p><span>
物理总量
</span><span>
{{
cpu_data
.
all
}}
核
</span></p>
<p><span>
物理总量
</span><span>
{{
cpu_data
.
all
}}
核
</span></p>
<p><span>
剩余量
</span><span>
{{
cpu_data
.
remaining
}}
核
</span></p>
<p><span>
剩余量
</span><span>
{{
cpu_data
.
remaining
.
toFixed
(
2
)
}}
核
</span></p>
</div>
</div>
<div
style=
"width:142px;float:left;height:180px;margin-right:30px;"
>
<div
style=
"width:142px;float:left;height:180px;margin-right:30px;"
>
<dash-board
:data=
"memory_data"
dangerousValue=
'workplace'
style=
"height:140px;"
></dash-board>
<dash-board
:data=
"memory_data"
dangerousValue=
'workplace'
style=
"height:140px;"
></dash-board>
<p><span>
物理总量
</span><span>
{{
memory_data
.
all
}}
GB
</span></p>
<p><span>
物理总量
</span><span>
{{
memory_data
.
all
}}
GB
</span></p>
<p><span>
剩余量
</span><span>
{{
memory_data
.
remaining
}}
GB
</span></p>
<p><span>
剩余量
</span><span>
{{
memory_data
.
remaining
.
toFixed
(
2
)
}}
GB
</span></p>
</div>
</div>
<div
style=
"width:142px;float:left;height:180px;margin-right:30px;"
>
<div
style=
"width:142px;float:left;height:180px;margin-right:30px;"
>
<dash-board
:data=
"pan_data"
dangerousValue=
'workplace'
style=
"height:140px;"
></dash-board>
<dash-board
:data=
"pan_data"
dangerousValue=
'workplace'
style=
"height:140px;"
></dash-board>
...
@@ -97,7 +97,7 @@
...
@@ -97,7 +97,7 @@
<div
style=
"width:142px;float:left;height:180px;"
>
<div
style=
"width:142px;float:left;height:180px;"
>
<dash-board
:data=
"pod_data"
dangerousValue=
'workplace'
style=
"height:140px;"
></dash-board>
<dash-board
:data=
"pod_data"
dangerousValue=
'workplace'
style=
"height:140px;"
></dash-board>
<p><span>
物理总量
</span><span>
{{
pod_data
.
all
}}
</span></p>
<p><span>
物理总量
</span><span>
{{
pod_data
.
all
}}
</span></p>
<p><span>
剩余量
</span><span>
{{
pod_data
.
remaining
}}
</span></p>
<p><span>
剩余量
</span><span>
{{
pod_data
.
remaining
.
toFixed
(
2
)
}}
</span></p>
</div>
</div>
</div>
</div>
</div>
</div>
...
...
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