Merge branch 'dev' of http://129.211.46.84:8800/platform/hg-smart

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB010.java

@@ -50,7 +50,8 @@ public class ServiceHGSB010 extends ServiceEPBase {
     public EiInfo queryBySbStatus(EiInfo inInfo) {
         Map params = EiInfoUtils.getFirstRow(inInfo);
         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);
         inInfo.set("result",result);

src/main/java/com/baosight/hggp/hg/sb/sql/HGSB010.xml

@@ -186,17 +186,18 @@
         INNER join (
             select EQUIPMENT_CODE, LOG_VALUE
             from ${hggpSchema}.HGSB010 where EQUIPMENT_TYPE = 'STARUS_TYPE'
-            <isNotEmpty prepend=" AND " property="accountCode">
-                ACCOUNT_CODE = #accountCode#
-            </isNotEmpty>
-            <isNotEmpty prepend=" AND " property="date">
-                CREATED_TIME =(
+            and CREATED_TIME =(
                     select MAX(CREATED_TIME) from ${hggpSchema}.HGSB010
-                    where EQUIPMENT_TYPE = 'STARUS_TYPE' and left(CREATED_TIME,8) = #date#
+                    where EQUIPMENT_TYPE = 'STARUS_TYPE'
                     <isNotEmpty prepend=" AND " property="accountCode">
                         ACCOUNT_CODE = #accountCode#
                     </isNotEmpty>
+                    <isNotEmpty prepend=" AND " property="date">
+                        left(CREATED_TIME,8) = #date#
+                    </isNotEmpty>
                 )
+            <isNotEmpty prepend=" AND " property="accountCode">
+                ACCOUNT_CODE = #accountCode#
             </isNotEmpty>
         ) c on a.DEVICE_CODE = c.EQUIPMENT_CODE
         where a.DELETE_FLAG = 0  and a.DEVICE_STATUS = 1

src/main/webapp/HG/BI/HGBI002.jsp

@@ -211,7 +211,7 @@
         },
         mounted() {
             setInterval(() => {
-                this.date = new Date(); // 更新日期时间
+                this.currentTime = dayjs().format("YYYY-MM-DD HH:mm:ss")
             }, 1000);
             this.getYesterdayDateFormatted();
             this.getRoleFactory();
@@ -393,22 +393,7 @@
 
                     ]
                 }
-            },
-            formatTime(currentTime) {
-                const formattedTime =
-                    currentTime.getFullYear() +
-                    "-" +
-                    (currentTime.getMonth() + 1) +
-                    "-" +
-                    currentTime.getDate() +
-                    " " +
-                    currentTime.getHours() +
-                    ":" +
-                    currentTime.getMinutes() +
-                    ":" +
-                    currentTime.getSeconds();
-                return formattedTime;
-            },
+            }
         },
         computed:{
             baroption() {
@@ -416,10 +401,7 @@
             },
             lineoption() {
                 return this.option2;
-            },
-            currentTime() {
-                return this.formatTime(this.date);
-            },
+            }
         }
     })
 </script>

src/main/webapp/HG/BI/components/hipi/001/left-manage-device.vue

@@ -35,7 +35,7 @@
           <img  :src="`${ctx}/common/img/device-img4-content.png`" class="device-img1-content img" style="margin: 0;" alt/>
         </div>
         <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/>
         </div>
       </div>