From ae692ce7bf387b9894bf6900cb7312769b971b66 Mon Sep 17 00:00:00 2001
From: fhysy <1149505133@qq.com>
Date: Mon, 17 Feb 2025 17:29:47 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(compiler):=20=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E5=9C=BA=E6=99=AF=E6=8E=A7=E5=88=B6cron=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BEbug=E3=80=81=E7=BC=96=E8=BE=91=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=88=B7=E6=96=B0bug=E3=80=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E6=8C=87=E4=BB=A4=E5=8E=86=E5=8F=B2=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=B6=E9=97=B4=E4=B8=BA23.59.59?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../profileV2/ESceneManage/ELogging.vue       | 46 +++++++++----------
 .../ESceneTriggers/src/ECronForm.vue          | 11 +++--
 .../project/profileV2/ESceneManage/index.vue  |  6 ++-
 3 files changed, 34 insertions(+), 29 deletions(-)

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 @@
       <div class="right-operate">
         <el-select
           v-model="queryParams.method"
-          size="small"
-          width="300"
-          style="margin-right: 10px"
-          placeholder="触发方式"
           clearable
+          placeholder="触发方式"
+          size="small"
+          style="margin-right: 10px"
+          width="300"
         >
           <el-option
             v-for="(value, keys) in triggerMethod"
@@ -29,15 +29,15 @@
 
         <el-date-picker
           v-model="time"
-          size="small"
-          @change="queryTimeChange"
           :clearable="false"
-          type="datetimerange"
           :default-time="['00:00:00', '23:59:59']"
-          range-separator="至"
-          start-placeholder="开始日期"
           end-placeholder="结束日期"
+          range-separator="至"
+          size="small"
+          start-placeholder="开始日期"
           style="margin-right: 10px"
+          type="datetimerange"
+          @change="queryTimeChange"
         >
         </el-date-picker>
 
@@ -51,49 +51,49 @@
         :height="total > 0 ? '470px' : '510px'"
       >
         <el-table-column
-          type="index"
-          label="序号"
-          align="center"
           :index="
             (idx) => {
               return idx + 1 + (queryParams.pageNum - 1) * queryParams.pageSize;
             }
           "
+          align="center"
+          label="序号"
+          type="index"
           width="80px"
         ></el-table-column>
 
         <el-table-column
-          label="触发方式"
-          width="150px"
           align="center"
+          label="触发方式"
           prop="method"
+          width="150px"
         >
           <template slot-scope="scope">
-            <span class="lay-table-textarea" :title="scope.row.method">
+            <span :title="scope.row.method" class="lay-table-textarea">
               {{ triggerMethod[scope.row.method]}}
             </span>
           </template>
         </el-table-column>
         <el-table-column
-          label="内容"
           align="left"
+          label="内容"
           prop="content"
         >
           <template slot-scope="scope">
-            <span class="lay-table-textarea" :title="scope.row.content">
+            <span :title="scope.row.content" class="lay-table-textarea">
               {{ scope.row.content }}
             </span>
           </template>
         </el-table-column>
 
         <el-table-column
-          label="创建时间"
           align="center"
-          width="160px"
+          label="创建时间"
           prop="createTime"
+          width="160px"
         >
           <template slot-scope="scope">
-            <span class="lay-table-textarea" :title="scope.row.createTime">
+            <span :title="scope.row.createTime" class="lay-table-textarea">
               {{ scope.row.createTime }}
             </span>
           </template>
@@ -102,9 +102,9 @@
 
       <pagination
         v-show="total > 0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
         :limit.sync="queryParams.pageSize"
+        :page.sync="queryParams.pageNum"
+        :total="total"
         @pagination="getList"
       />
     </div>
@@ -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 @@
 <template>
   <div>
     <easy-cron
-      :hideSecond="false"
-      :disabledSecond="false"
-      :disabled="false"
-      style="width: 100%;"
       v-model="stateValue"
+      :disabled="false"
+      :disabledSecond="false"
       :exeStartTime="exeStartTime"
+      :hideSecond="false"
+      style="width: 100%;"
     ></easy-cron>
   </div>
 </template>
@@ -44,6 +44,9 @@ export default {
       stateValue: ''
     }
   },
+  created() {
+    this.stateValue = this.value || '* * * * * ? *';
+  },
 }
 
 </script>
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 @@
                 <div>
                   <e-tag-card
                     v-for="(item, idx) in form.triggers"
-                    :key="item.guid || getGuid()"
+                    :key="item.guid "
                     style="margin-top: 5px"
                     type="info"
                   >
@@ -260,7 +260,7 @@
                 <div>
                   <e-tag-card
                     v-for="(item, idx) in form.actions"
-                    :key="item.guid || getGuid()"
+                    :key="item.guid "
                     style="margin-top: 5px"
                     type="info"
                   >
@@ -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: [],