From 0d605a1a624a185aeafe8f72927b5915479d1f32 Mon Sep 17 00:00:00 2001
From: 23688nl <329261568@qq.com>
Date: Fri, 11 Nov 2022 11:56:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9A=20=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=9C=BA=E6=99=AF=20=E6=B6=88=E6=81=AF=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=20=E6=89=A7=E8=A1=8C=E5=8A=A8=E4=BD=9C=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=A4=E6=96=AD=EF=BC=8C=E5=8A=A8=E4=BD=9C=E5=BF=85?=
 =?UTF-8?q?=E9=A1=BB=E9=80=89=E6=8B=A9=E4=B8=80=E4=B8=AA=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/profileV2/ESceneManage/index.vue  | 47 ++++++++++++-------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/src/views/iot/project/profileV2/ESceneManage/index.vue b/src/views/iot/project/profileV2/ESceneManage/index.vue
index d87fbc7f..52cc51ba 100644
--- a/src/views/iot/project/profileV2/ESceneManage/index.vue
+++ b/src/views/iot/project/profileV2/ESceneManage/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="e-scene-manage">
-    <div v-show="!isLoggingViewShow" style="width: 100%;">
+    <div v-show="!isLoggingViewShow" style="width: 100%">
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
           <el-button
@@ -135,7 +135,11 @@
                 >执行</el-button
               >
 
-              <el-button size="mini" type="text" @click="handleLoggingView(scope.row)" icon="el-icon-takeaway-box"
+              <el-button
+                size="mini"
+                type="text"
+                @click="handleLoggingView(scope.row)"
+                icon="el-icon-takeaway-box"
                 >指令历史</el-button
               >
             </template>
@@ -295,12 +299,15 @@
         </dialog-template>
       </div>
     </div>
-    <e-logging v-if="isLoggingViewShow"
+    <e-logging
+      v-if="isLoggingViewShow"
       :sourceId="loggingSourceId"
       :sceneInfo="loggingSourceObject"
-      @handleLinkToHome="() => {
-        isLoggingViewShow = false;
-      }"
+      @handleLinkToHome="
+        () => {
+          isLoggingViewShow = false;
+        }
+      "
     ></e-logging>
   </div>
 </template>
@@ -318,8 +325,7 @@ import DialogTemplate from "@/components/DialogTemplate";
 import ESceneTriggers from "./ESceneTriggers/index";
 import ETagCard from "@/components/Cards/ETagCard";
 import ESceneAction from "./ESceneAction/index";
-import ELogging from './ELogging'
-
+import ELogging from "./ELogging";
 
 export default {
   name: "ESceneManage",
@@ -349,7 +355,13 @@ export default {
       },
     },
   },
-  components: { DialogTemplate, ESceneTriggers, ETagCard, ESceneAction, ELogging },
+  components: {
+    DialogTemplate,
+    ESceneTriggers,
+    ETagCard,
+    ESceneAction,
+    ELogging,
+  },
   data() {
     return {
       queryParams: {},
@@ -484,13 +496,16 @@ export default {
 
           isTrue = false;
         }
-        if (
-          e.actionType === "NOTIFIER" &&
-          (!e.sceneActionNotifierContacts[0] ||
-            !e.sceneActionNotifierContacts[0]["contactsRelList"])
-        ) {
-          this.msgError("执行条件中有条件未选择联系人！");
-          isTrue = false;
+        if (e.actionType === "NOTIFIER") {
+          let arr = e.sceneActionNotifierContacts.filter((v) => {
+            if ((!v["contactsRelList"]) || v["contactsRelList"].length <= 0) {
+              return v;
+            }
+          });
+          if (arr && arr.length > 0) {
+            this.msgError("执行条件中有条件未选择联系人！");
+            isTrue = false;
+          }
         }
       });
       return isTrue;