Toggle navigation
Toggle navigation
This project
Loading...
Sign in
monitor_v3
/
hg-monitor-web
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
鲁尚清
3 years ago
Commit
32574c60ebe9f92369bab8f08f3a487abddf6623
2 parents
184c6516
b675d6bf
Merge branch 'master' of
http://192.168.1.136:82/monitor_v3/hg-monitor-web
into …
…master-v32-lushangqing
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
96 additions
and
39 deletions
hg-monitor-web-base/src/main/resources/static/src/controller/bizreslist.js
hg-monitor-web-base/src/main/resources/static/src/controller/main-biz-card.js
hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/document/index.html
hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/document/index.js
hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/table-page/index.js
hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/userright/index.js
hg-monitor-web-zj/src/main/resources/static/vue3/public/css/operationMaintenance.css
hg-monitor-web-zj/src/main/resources/static/vue3/src/views/operationMaintenance/index.js
hg-monitor-web-base/src/main/resources/static/src/controller/bizreslist.js
View file @
32574c6
...
...
@@ -142,7 +142,6 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
,
done
:
function
(
res
)
{
soulTable
.
render
(
this
);
getResCount
(
bizId
,
newResType
)
commonCols
.
colsClickEvent
();
table
.
on
(
'sort(bizResListTable)'
,
function
(
obj
)
{
...
...
@@ -173,7 +172,6 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
//树表格
function
renderTreeTable
(
bizId
,
resType
,
reloadFlag
)
{
$
(
".biz_reslist_search"
).
hide
();
$
(
".biz_reslist_treetable_search"
).
show
();
$
(
"#bizResListTableContent"
).
hide
();
...
...
@@ -518,6 +516,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
}
if
(
resType
==
'MIDDLEWARE_WEBLOGIC'
)
{
$
(
"#biz_reslist_res_colony_id"
).
hide
();
$
(
"#biz_reslist_link_state_id"
).
hide
();
$
(
'#biz_reslist_server_state_id'
).
show
();
}
else
{
...
...
@@ -527,7 +526,8 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
if
(
targetId
&&
searchType
)
{
var
url
=
"/api-web/home/res-list/"
+
searchType
+
"?page=1&limit=50&busId="
+
bizId
;
if
(
searchType
==
'MIDDLEWARE_WEBLOGIC'
)
{
url
+=
'&parentId=null'
//增加parentType=parent,解决sql查询中问题 joke add 20211130
url
+=
'&parentId=null&parentType=parent'
;
}
admin
.
req
({
url
:
common
.
domainName
+
url
...
...
hg-monitor-web-base/src/main/resources/static/src/controller/main-biz-card.js
View file @
32574c6
...
...
@@ -334,6 +334,10 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
//点击告警数字,跳转至告警页面
$
(
"#indexbizhealth [data-index-banner-item='resType'] .index-banner-item-tips "
).
unbind
(
'click'
).
on
(
"click"
,
function
()
{
var
restype
=
$
(
this
).
data
(
'restype'
);
//不以资源类型不包括父节点的资源类型 包括阿里云、华为云
if
(
"ALI_CLOUD_PLAT"
==
restype
||
"HUAWEI_CLOUD_PLAT"
==
restype
){
restype
=
restype
.
substring
(
0
,
restype
.
lastIndexOf
(
"_"
));
}
var
alink
=
document
.
createElement
(
'a'
);
alink
.
setAttribute
(
"lay-href"
,
"/alarm/activewarning/restype="
+
restype
);
document
.
body
.
appendChild
(
alink
);
...
...
hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/document/index.html
View file @
32574c6
...
...
@@ -20,7 +20,7 @@
<a
@
click=
"editType(data)"
style=
"margin-right: 10px;"
>
<i
class=
"el-icon-edit"
></i>
</a>
<a
@
click=
"showFolder(true,false
)
"
style=
"margin-right: 10px;"
>
<a
@
click=
"showFolder(true,false
,node)
"
style=
"margin-right: 10px;"
>
<i
class=
"el-icon-plus"
></i>
</a>
<a
@
click=
"deleteDocument(data.id,'folder')"
>
...
...
@@ -166,7 +166,7 @@
</template>
</cm-dialog>
<cm-userright
:showDialogVisible=
"showUserDialogVisible"
:selectedArr=
"userFileRight"
@
callback=
"selectUser"
<cm-userright
:showDialogVisible=
"showUserDialogVisible"
:selectedArr=
"userFileRight"
:userArr=
"userList"
:isUser=
"false"
:showOrg=
"false"
@
callback=
"selectUser"
@
hideDialog=
"showUserDialog"
></cm-userright>
<cm-upload
:showDialogVisible=
"showUploadDialogVisible"
@
callback=
"uploadCallBack"
@
hideDialog=
"showUploadFile"
...
...
hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/document/index.js
View file @
32574c6
...
...
@@ -289,7 +289,7 @@ export default {
*/
let
nodeClick
=
(
node
,
data
)
=>
{
let
id
=
data
.
id
;
//currentNodeData.value =
data;
currentNodeData
.
value
=
node
.
data
;
let
arr
=
[];
arr
.
push
(
id
);
...
...
@@ -367,6 +367,8 @@ export default {
proxy
.
$global
.
showMsg
(
res
.
msg
,
'warning'
);
}
else
{
proxy
.
$global
.
showMsg
(
'放入回收站成功!'
);
let
isUser
=
!
isUserFolder
.
value
;
reload
(
isUser
);
}
if
(
props
.
isRecycle
)
{
...
...
@@ -378,6 +380,7 @@ export default {
reload
(
isUser
);
}
}
})
...
...
@@ -440,7 +443,13 @@ export default {
type
:
''
,
sort
:
100
});
let
showFolder
=
(
flg
,
isUser
)
=>
{
let
showFolder
=
(
flg
,
isUser
,
node
)
=>
{
let
title
=
""
;
if
(
node
){
currentNodeData
.
value
=
node
.
data
;
title
=
`修改树节点“
$
{
currentNodeData
.
value
.
name
}
“子文件夹`
;
}
docForm
.
value
=
{
id
:
''
,
name
:
''
,
...
...
@@ -450,7 +459,7 @@ export default {
};
isUserFolder
.
value
=
isUser
;
addDialogVisible
.
value
=
flg
;
let
title
=
`修改树节点“
$
{
currentNodeData
.
value
.
name
}
“子文件夹`
;
if
(
addDialogVisible
.
value
)
{
title
=
`新建自定义文件夹`
;
}
...
...
@@ -516,6 +525,9 @@ export default {
// 用户授权
let
showUserDialogVisible
=
Vue
.
ref
(
false
);
let
userFileRight
=
Vue
.
ref
([]);
//获取用户
let
userList
=
Vue
.
ref
([]);
let
isUser
=
Vue
.
ref
(
"false"
);
let
getCheckedFile
=
()
=>
{
let
arr
=
dataList
.
value
.
filter
(
function
(
v
)
{
if
(
v
.
checked
!=
undefined
&&
v
.
checked
==
true
)
{
...
...
@@ -696,6 +708,7 @@ export default {
* 挂载完
*/
Vue
.
onMounted
(()
=>
{
getUserList
();
// 预览模式 不展示左侧树
if
(
!
props
.
isView
)
{
getTree
();
...
...
@@ -734,6 +747,35 @@ export default {
}
}
//获取用户数据
let
getUserList
=
()
=>
{
proxy
.
userList
=
[];
// 查询信息中心的用户
proxy
.
$http
.
get
(
"/api-user/org/getOrgUserList?orgCode=xxzx"
,
{},
function
(
res
)
{
if
(
res
&&
res
.
data
)
{
res
.
data
.
map
(
function
(
v
)
{
let
desc
=
[];
let
orgName
=
v
.
orgName
;
let
nickname
=
v
.
nickname
;
if
(
orgName
)
{
desc
.
push
(
orgName
);
}
if
(
nickname
)
{
desc
.
push
(
nickname
);
}
proxy
.
userList
.
push
({
value
:
v
.
username
,
type
:
'USER'
,
desc
:
`
$
{
desc
.
join
(
' / '
)}
`
,
props
:
v
})
});
}
},
function
(){},
false
)
}
return
{
/* viewEdit,*/
...
...
@@ -771,6 +813,8 @@ export default {
userFileRight
,
selectUser
,
showUserDialog
,
userList
,
isUser
,
showUploadDialogVisible
,
historyNode
,
...
...
hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/table-page/index.js
View file @
32574c6
...
...
@@ -113,7 +113,6 @@ export default {
return
props
.
maxWidth
/
w
*
width
;
}
}
console
.
log
(
'width:'
+
width
);
return
width
;
})();
...
...
hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/userright/index.js
View file @
32574c6
...
...
@@ -43,6 +43,16 @@ export default {
type
:
Array
,
default
:
[
'取消'
,
'授权'
]
},
//用户数据
userArr
:{
type
:
Array
,
default
:[],
},
//是否获取所有用户数据
isUser
:{
type
:
Boolean
,
default
:
true
}
},
data
()
{
return
{
...
...
@@ -53,8 +63,11 @@ export default {
const
{
proxy
}
=
Vue
.
getCurrentInstance
();
let
allArr
=
Vue
.
ref
([]);
let
userArr
=
Vue
.
ref
([]);
let
isUser
=
props
.
isUser
;
if
(
!
isUser
){
userArr
.
value
=
props
.
userArr
;
}
let
roleArr
=
Vue
.
ref
([]);
let
orgArr
=
Vue
.
ref
([]);
let
activeName
=
Vue
.
ref
(
'user'
);
...
...
@@ -71,33 +84,30 @@ export default {
}
const
getAllUser
=
()
=>
{
if
(
userArr
.
value
.
length
!=
0
){
return
;
if
(
isUser
){
// 查询全部用户
proxy
.
$http
.
get
(
"/api-user/users?page=1&limit=10000&username=&nickname=&enabled=&orgId=&roles="
,
{},
function
(
res
)
{
if
(
res
&&
res
.
data
)
{
res
.
data
.
map
(
function
(
v
)
{
let
desc
=
[];
let
orgName
=
v
.
orgName
;
let
nickname
=
v
.
nickname
;
if
(
orgName
)
{
desc
.
push
(
orgName
);
}
if
(
nickname
)
{
desc
.
push
(
nickname
);
}
userArr
.
value
.
push
({
value
:
v
.
username
,
type
:
'USER'
,
desc
:
`
$
{
desc
.
join
(
' / '
)}
`
,
props
:
v
})
});
}
},
function
(){},
false
)
}
// 查询全部用户
proxy
.
$http
.
get
(
"/api-user/users?page=1&limit=10000&username=&nickname=&enabled=&orgId=&roles="
,
{},
function
(
res
)
{
if
(
res
&&
res
.
data
)
{
res
.
data
.
map
(
function
(
v
)
{
let
desc
=
[];
let
orgName
=
v
.
orgName
;
let
nickname
=
v
.
nickname
;
if
(
orgName
)
{
desc
.
push
(
orgName
);
}
if
(
nickname
)
{
desc
.
push
(
nickname
);
}
userArr
.
value
.
push
({
value
:
v
.
username
,
type
:
'USER'
,
desc
:
`
$
{
desc
.
join
(
' / '
)}
`
,
props
:
v
})
});
}
},
function
(){},
false
)
}
const
getAllRole
=
()
=>
{
...
...
@@ -266,7 +276,7 @@ export default {
hidedialog
,
activeName
,
userArr
,
//
userArr,
roleArr
,
orgArr
,
...
...
hg-monitor-web-zj/src/main/resources/static/vue3/public/css/operationMaintenance.css
View file @
32574c6
...
...
@@ -108,6 +108,6 @@
padding-top
:
1px
;
position
:
absolute
;
top
:
58%
;
left
:
7
0%
;
left
:
6
0%
;
}
...
...
hg-monitor-web-zj/src/main/resources/static/vue3/src/views/operationMaintenance/index.js
View file @
32574c6
...
...
@@ -59,7 +59,7 @@ export default {
var
params
=
{
// page: pageInfo.page,
// limit: pageInfo.limit,
username
:
'1'
,
username
:
localStorage
.
getItem
(
"lgn"
)
,
};
proxy
.
$http
.
get
(
"/api-web/bOpsProject/getTree"
,
params
,
function
(
res
)
{
if
(
res
&&
res
.
data
)
{
...
...
Please
register
or
login
to post a comment