diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java
index 506a0e6..9ee1f03 100644
--- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java
+++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java
@@ -457,7 +457,9 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService {
BeanUtils.copyProperties(wxMode, wxModeRet);
if (wxMode.getInstrumentType() == 2) {
// IOT仪器才可以设置模式时长
- wxModeRet.setModeTime(LocalTime.of(0, wxMode.getModeTime()));
+ if(wxMode.getModeTime() != null) {
+ wxModeRet.setModeTime(LocalTime.ofSecondOfDay(wxMode.getModeTime()));
+ }
}
Boolean isLock = false;
if (wxModeTagList != null && wxModeTagList.size() > 0) {
diff --git a/flossom-ui/src/views/system/mode/index.vue b/flossom-ui/src/views/system/mode/index.vue
index 3ed1c0d..469d434 100644
--- a/flossom-ui/src/views/system/mode/index.vue
+++ b/flossom-ui/src/views/system/mode/index.vue
@@ -38,7 +38,11 @@
-
+
+
+ {{ convertToHMS(scope.row.modeTime) }}
+
+
@@ -215,7 +219,14 @@
-
+
+
0) {
this.form.technologyInfo = this.form.technologyArrayMode.join(",");
@@ -1419,7 +1430,35 @@ export default {
this.combineData = this.combineData.filter(x => x.id != row.id);
}
},
- }
+ // 处理时间组件
+ pickedTimeComponentChange() {
+ console.log(this.form.modeTimeStr)
+ if(this.form.modeTimeStr == null) {
+ this.form.modeTimeStr = '00:00:00'
+ this.form.modeTime = 0;
+ } else {
+ this.form.modeTime = this.convertToSeconds(this.form.modeTimeStr);
+ this.$forceUpdate();
+ }
+ },
+ convertToSeconds(timeStr) {
+ let hms = timeStr.split(':'); // split it at the colons
+ return (+hms[0]) * 60 * 60 + (+hms[1]) * 60 + (+hms[2]);
+ },
+ convertToHMS(seconds) {
+ var hours = Math.floor(seconds / 3600);
+ seconds %= 3600;
+ var minutes = Math.floor(seconds / 60);
+ var seconds = seconds % 60;
+ // Pad the time values if they are less than 10
+ hours = hours < 10 ? '0' + hours : hours;
+ minutes = minutes < 10 ? '0' + minutes : minutes;
+ seconds = seconds < 10 ? '0' + seconds : seconds;
+ return hours + ':' + minutes + ':' + seconds;
+ }
+
+
+}
};