Commit a58484da by 宋祥
parents 289851c9 f744b188
...@@ -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);
......
...@@ -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
......
...@@ -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>
......
...@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment