Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
hg-smart
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
platform
hg-smart
Commits
89fd5457
Commit
89fd5457
authored
Nov 22, 2024
by
liuyang
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://git.pseer.com:8800/platform/hg-smart
into dev-ly
parents
97c98d21
7e3db567
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
ServiceHGWD001D.java
...java/com/baosight/hggp/hg/wd/service/ServiceHGWD001D.java
+5
-4
HGBI003.jsp
src/main/webapp/HG/BI/HGBI003.jsp
+1
-1
No files found.
src/main/java/com/baosight/hggp/hg/wd/service/ServiceHGWD001D.java
View file @
89fd5457
...
@@ -374,13 +374,14 @@ public class ServiceHGWD001D extends TreeService {
...
@@ -374,13 +374,14 @@ public class ServiceHGWD001D extends TreeService {
leafMap
.
put
(
"filePath"
,
dbWd001
.
getFilePath
());
leafMap
.
put
(
"filePath"
,
dbWd001
.
getFilePath
());
if
(!
isManager
&&
!
isSpare
)
{
if
(!
isManager
&&
!
isSpare
)
{
leafMap
.
put
(
"isAuth"
,
"1"
);
leafMap
.
put
(
"isAuth"
,
"1"
);
}
else
{
// 从已授权的信息中查找出自己
leafMap
.
put
(
"isAuth"
,
"0"
);
}
// 从已授权的信息中查找出自己
HGWD003
dbWd003
=
dbWd003s
==
null
?
null
:
dbWd003s
.
stream
().
filter
(
item
HGWD003
dbWd003
=
dbWd003s
==
null
?
null
:
dbWd003s
.
stream
().
filter
(
item
->
item
.
getUserId
().
equals
(
userId
)).
findFirst
().
orElse
(
null
);
->
item
.
getUserId
().
equals
(
userId
)).
findFirst
().
orElse
(
null
);
leafMap
.
put
(
"downloadFlag"
,
dbWd003
==
null
?
"0"
:
dbWd003
.
getDownloadFlag
());
leafMap
.
put
(
"downloadFlag"
,
dbWd003
==
null
?
"0"
:
dbWd003
.
getDownloadFlag
());
}
else
{
leafMap
.
put
(
"isAuth"
,
"0"
);
leafMap
.
put
(
"downloadFlag"
,
"1"
);
}
results
.
add
(
leafMap
);
results
.
add
(
leafMap
);
}
}
// 设置叶子节点
// 设置叶子节点
...
...
src/main/webapp/HG/BI/HGBI003.jsp
View file @
89fd5457
...
@@ -536,7 +536,7 @@
...
@@ -536,7 +536,7 @@
},
},
grid
:
{
grid
:
{
top
:
'1
3
%'
,
// 图表距离容器顶部的距离
top
:
'1
7
%'
,
// 图表距离容器顶部的距离
bottom
:
'2%'
,
// 图表距离容器底部的距离,为下方的文字留出空间
bottom
:
'2%'
,
// 图表距离容器底部的距离,为下方的文字留出空间
left
:
'2%'
,
left
:
'2%'
,
right
:
'2%'
,
right
:
'2%'
,
...
...
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