提交: 项目场景 消息方式 执行动作 添加判断,动作必须选择一个联系人
This commit is contained in:
parent
7a30a9c799
commit
0d605a1a62
|
@ -1,6 +1,6 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="e-scene-manage">
|
<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-row :gutter="10" class="mb8">
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<el-button
|
<el-button
|
||||||
|
@ -135,7 +135,11 @@
|
||||||
>执行</el-button
|
>执行</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
|
>指令历史</el-button
|
||||||
>
|
>
|
||||||
</template>
|
</template>
|
||||||
|
@ -295,12 +299,15 @@
|
||||||
</dialog-template>
|
</dialog-template>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<e-logging v-if="isLoggingViewShow"
|
<e-logging
|
||||||
|
v-if="isLoggingViewShow"
|
||||||
:sourceId="loggingSourceId"
|
:sourceId="loggingSourceId"
|
||||||
:sceneInfo="loggingSourceObject"
|
:sceneInfo="loggingSourceObject"
|
||||||
@handleLinkToHome="() => {
|
@handleLinkToHome="
|
||||||
isLoggingViewShow = false;
|
() => {
|
||||||
}"
|
isLoggingViewShow = false;
|
||||||
|
}
|
||||||
|
"
|
||||||
></e-logging>
|
></e-logging>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
@ -318,8 +325,7 @@ import DialogTemplate from "@/components/DialogTemplate";
|
||||||
import ESceneTriggers from "./ESceneTriggers/index";
|
import ESceneTriggers from "./ESceneTriggers/index";
|
||||||
import ETagCard from "@/components/Cards/ETagCard";
|
import ETagCard from "@/components/Cards/ETagCard";
|
||||||
import ESceneAction from "./ESceneAction/index";
|
import ESceneAction from "./ESceneAction/index";
|
||||||
import ELogging from './ELogging'
|
import ELogging from "./ELogging";
|
||||||
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "ESceneManage",
|
name: "ESceneManage",
|
||||||
|
@ -349,7 +355,13 @@ export default {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
components: { DialogTemplate, ESceneTriggers, ETagCard, ESceneAction, ELogging },
|
components: {
|
||||||
|
DialogTemplate,
|
||||||
|
ESceneTriggers,
|
||||||
|
ETagCard,
|
||||||
|
ESceneAction,
|
||||||
|
ELogging,
|
||||||
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
queryParams: {},
|
queryParams: {},
|
||||||
|
@ -484,13 +496,16 @@ export default {
|
||||||
|
|
||||||
isTrue = false;
|
isTrue = false;
|
||||||
}
|
}
|
||||||
if (
|
if (e.actionType === "NOTIFIER") {
|
||||||
e.actionType === "NOTIFIER" &&
|
let arr = e.sceneActionNotifierContacts.filter((v) => {
|
||||||
(!e.sceneActionNotifierContacts[0] ||
|
if ((!v["contactsRelList"]) || v["contactsRelList"].length <= 0) {
|
||||||
!e.sceneActionNotifierContacts[0]["contactsRelList"])
|
return v;
|
||||||
) {
|
}
|
||||||
this.msgError("执行条件中有条件未选择联系人!");
|
});
|
||||||
isTrue = false;
|
if (arr && arr.length > 0) {
|
||||||
|
this.msgError("执行条件中有条件未选择联系人!");
|
||||||
|
isTrue = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
return isTrue;
|
return isTrue;
|
||||||
|
|
Loading…
Reference in New Issue