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
a58484da
Commit
a58484da
authored
Nov 19, 2024
by
宋祥
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://129.211.46.84:8800/platform/hg-smart
parents
289851c9
f744b188
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
28 deletions
+12
-28
ServiceHGSB010.java
.../java/com/baosight/hggp/hg/sb/service/ServiceHGSB010.java
+2
-1
HGSB010.xml
src/main/java/com/baosight/hggp/hg/sb/sql/HGSB010.xml
+6
-5
HGBI002.jsp
src/main/webapp/HG/BI/HGBI002.jsp
+3
-21
HGBI003.jsp
src/main/webapp/HG/BI/HGBI003.jsp
+0
-0
left-manage-device.vue
...n/webapp/HG/BI/components/hipi/001/left-manage-device.vue
+1
-1
No files found.
src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB010.java
View file @
a58484da
...
@@ -50,7 +50,8 @@ public class ServiceHGSB010 extends ServiceEPBase {
...
@@ -50,7 +50,8 @@ public class ServiceHGSB010 extends ServiceEPBase {
public
EiInfo
queryBySbStatus
(
EiInfo
inInfo
)
{
public
EiInfo
queryBySbStatus
(
EiInfo
inInfo
)
{
Map
params
=
EiInfoUtils
.
getFirstRow
(
inInfo
);
Map
params
=
EiInfoUtils
.
getFirstRow
(
inInfo
);
if
(
params
.
containsKey
(
"date"
)){
if
(
params
.
containsKey
(
"date"
)){
params
.
put
(
"date"
,
DateUtils
.
formatShort
(
params
.
get
(
"date"
)));
params
.
remove
(
"date"
);
//params.put("date", DateUtils.formatShort(params.get("date")));
}
}
List
<
Map
>
result
=
DaoBase
.
getInstance
().
query
(
"HGSB010.queryBySbStatus"
,
params
);
List
<
Map
>
result
=
DaoBase
.
getInstance
().
query
(
"HGSB010.queryBySbStatus"
,
params
);
inInfo
.
set
(
"result"
,
result
);
inInfo
.
set
(
"result"
,
result
);
...
...
src/main/java/com/baosight/hggp/hg/sb/sql/HGSB010.xml
View file @
a58484da
...
@@ -186,17 +186,18 @@
...
@@ -186,17 +186,18 @@
INNER join (
INNER join (
select EQUIPMENT_CODE, LOG_VALUE
select EQUIPMENT_CODE, LOG_VALUE
from ${hggpSchema}.HGSB010 where EQUIPMENT_TYPE = 'STARUS_TYPE'
from ${hggpSchema}.HGSB010 where EQUIPMENT_TYPE = 'STARUS_TYPE'
and CREATED_TIME =(
select MAX(CREATED_TIME) from ${hggpSchema}.HGSB010
where EQUIPMENT_TYPE = 'STARUS_TYPE'
<isNotEmpty
prepend=
" AND "
property=
"accountCode"
>
<isNotEmpty
prepend=
" AND "
property=
"accountCode"
>
ACCOUNT_CODE = #accountCode#
ACCOUNT_CODE = #accountCode#
</isNotEmpty>
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"date"
>
<isNotEmpty
prepend=
" AND "
property=
"date"
>
CREATED_TIME =(
left(CREATED_TIME,8) = #date#
select MAX(CREATED_TIME) from ${hggpSchema}.HGSB010
where EQUIPMENT_TYPE = 'STARUS_TYPE' and left(CREATED_TIME,8) = #date#
<isNotEmpty
prepend=
" AND "
property=
"accountCode"
>
ACCOUNT_CODE = #accountCode#
</isNotEmpty>
</isNotEmpty>
)
)
<isNotEmpty
prepend=
" AND "
property=
"accountCode"
>
ACCOUNT_CODE = #accountCode#
</isNotEmpty>
</isNotEmpty>
) c on a.DEVICE_CODE = c.EQUIPMENT_CODE
) c on a.DEVICE_CODE = c.EQUIPMENT_CODE
where a.DELETE_FLAG = 0 and a.DEVICE_STATUS = 1
where a.DELETE_FLAG = 0 and a.DEVICE_STATUS = 1
...
...
src/main/webapp/HG/BI/HGBI002.jsp
View file @
a58484da
...
@@ -211,7 +211,7 @@
...
@@ -211,7 +211,7 @@
},
},
mounted
()
{
mounted
()
{
setInterval
(()
=>
{
setInterval
(()
=>
{
this
.
date
=
new
Date
();
// 更新日期时间
this
.
currentTime
=
dayjs
().
format
(
"YYYY-MM-DD HH:mm:ss"
)
},
1000
);
},
1000
);
this
.
getYesterdayDateFormatted
();
this
.
getYesterdayDateFormatted
();
this
.
getRoleFactory
();
this
.
getRoleFactory
();
...
@@ -393,22 +393,7 @@
...
@@ -393,22 +393,7 @@
]
]
}
}
},
}
formatTime
(
currentTime
)
{
const
formattedTime
=
currentTime
.
getFullYear
()
+
"-"
+
(
currentTime
.
getMonth
()
+
1
)
+
"-"
+
currentTime
.
getDate
()
+
" "
+
currentTime
.
getHours
()
+
":"
+
currentTime
.
getMinutes
()
+
":"
+
currentTime
.
getSeconds
();
return
formattedTime
;
},
},
},
computed
:{
computed
:{
baroption
()
{
baroption
()
{
...
@@ -416,10 +401,7 @@
...
@@ -416,10 +401,7 @@
},
},
lineoption
()
{
lineoption
()
{
return
this
.
option2
;
return
this
.
option2
;
},
}
currentTime
()
{
return
this
.
formatTime
(
this
.
date
);
},
}
}
})
})
</script>
</script>
...
...
src/main/webapp/HG/BI/HGBI003.jsp
View file @
a58484da
This diff is collapsed.
Click to expand it.
src/main/webapp/HG/BI/components/hipi/001/left-manage-device.vue
View file @
a58484da
...
@@ -35,7 +35,7 @@
...
@@ -35,7 +35,7 @@
<img
:src=
"`$
{ctx}/common/img/device-img4-content.png`" class="device-img1-content img" style="margin: 0;" alt/>
<img
:src=
"`$
{ctx}/common/img/device-img4-content.png`" class="device-img1-content img" style="margin: 0;" alt/>
</div>
</div>
<div
style=
"width: 100%;height: 30%;display: flex;margin-top: 2vh;"
>
<div
style=
"width: 100%;height: 30%;display: flex;margin-top: 2vh;"
>
<div
class=
"content-content-title"
style=
"width: 40%;"
>
激光焊接机
</div>
<div
class=
"content-content-title"
style=
"width: 40%;"
>
龙门加工中心
</div>
<img
:src=
"`$
{ctx}/common/img/device-img5-content.png`" class="device-img1-content img" style="margin: 0;" alt/>
<img
:src=
"`$
{ctx}/common/img/device-img5-content.png`" class="device-img1-content img" style="margin: 0;" alt/>
</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