diff --git a/src/views/iot/project/profileV2/ESceneManage/ELogging.vue b/src/views/iot/project/profileV2/ESceneManage/ELogging.vue index 957b48a6..4e2afe85 100644 --- a/src/views/iot/project/profileV2/ESceneManage/ELogging.vue +++ b/src/views/iot/project/profileV2/ESceneManage/ELogging.vue @@ -13,11 +13,11 @@
@@ -51,49 +51,49 @@ :height="total > 0 ? '470px' : '510px'" > @@ -102,9 +102,9 @@
@@ -154,7 +154,7 @@ export default { methods: { newTime() { const startTime = this.parseTime(new Date(), "{y}-{m}-{d} 00:00:00"); - const endTime = this.parseTime(new Date(), "{y}-{m}-{d} {h}:{i}:{s}"); + const endTime = this.parseTime(new Date(), "{y}-{m}-{d} 23:59:59"); this.time = [startTime, endTime]; this.queryParams.startDate = startTime; this.queryParams.endDate = endTime; diff --git a/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/ECronForm.vue b/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/ECronForm.vue index 8ce1d8e3..81ae25d2 100644 --- a/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/ECronForm.vue +++ b/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/ECronForm.vue @@ -1,12 +1,12 @@ @@ -44,6 +44,9 @@ export default { stateValue: '' } }, + created() { + this.stateValue = this.value || '* * * * * ? *'; + }, } diff --git a/src/views/iot/project/profileV2/ESceneManage/index.vue b/src/views/iot/project/profileV2/ESceneManage/index.vue index 67acc580..0535d6c8 100644 --- a/src/views/iot/project/profileV2/ESceneManage/index.vue +++ b/src/views/iot/project/profileV2/ESceneManage/index.vue @@ -213,7 +213,7 @@
@@ -260,7 +260,7 @@
@@ -431,6 +431,7 @@ export default { }, handleAddAction() { let obj = { + guid: this.getGuid(), orderBy: this.form.actions.length + 1 || 1, recordStatus: 0, actionId: null, @@ -446,6 +447,7 @@ export default { handleAddTrigger() { let triggersPop = [...this.form.triggers].pop(); let obj = { + guid: this.getGuid(), orderBy: triggersPop ? triggersPop.orderBy + 1 : 1, method: "", conditions: [],