diff --git a/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/EConditionTemp.vue b/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/EConditionTemp.vue
index 0ffd1535..cd8e0fdb 100644
--- a/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/EConditionTemp.vue
+++ b/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/EConditionTemp.vue
@@ -1,12 +1,12 @@
@@ -49,7 +49,8 @@ export default {
getProductCmdList(id) {
this.propertyList = [];
getDeviceFunList({
- deviceId: id
+ deviceId: id,
+ cmdKey:'event'
}).then(res => {
this.propertyList = this.uniqueFunc([...res.data], 'funKey');
// this.propertyList= res.data;
diff --git a/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/index.js b/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/index.js
index d98fecd8..00501bd7 100644
--- a/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/index.js
+++ b/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/index.js
@@ -87,7 +87,7 @@ export default {
watch: {
isAntiShake() {
if(this.isAntiShake === false) {
- this.dataItem['intervalVal'] = 0;
+ this.dataItem['intervalVal'] = 60;
}
}
},
diff --git a/src/views/iot/project/profileV2/ESceneManage/index.vue b/src/views/iot/project/profileV2/ESceneManage/index.vue
index 52cc51ba..67acc580 100644
--- a/src/views/iot/project/profileV2/ESceneManage/index.vue
+++ b/src/views/iot/project/profileV2/ESceneManage/index.vue
@@ -4,15 +4,15 @@
新增
- 刷新
+ 刷新
@@ -23,51 +23,51 @@
:height="total > 0 ? '470px' : '510px'"
>
-
+
{{ scope.row.sceneName }}
-
+
{{ scope.row.sceneCode }}
-
+
{{ scope.row.relation }}
-
+
{{ scope.row.runStatus == "0" ? "启用" : "停止" }}
@@ -76,70 +76,70 @@
-
+
{{ scope.row.createTime }}
编辑
删除
{{ scope.row.runStatus == "0" ? "停止" : "启用" }}
执行
指令历史
@@ -148,9 +148,9 @@
@@ -163,12 +163,12 @@
@close="open = false"
>
@@ -212,9 +212,9 @@
新增动作
@@ -291,18 +291,18 @@
{
isLoggingViewShow = false;
@@ -449,7 +449,7 @@ export default {
orderBy: triggersPop ? triggersPop.orderBy + 1 : 1,
method: "",
conditions: [],
- intervalVal: "",
+ intervalVal: "60",
intervalUnit: "SECONDS",
sceneTriggerDevices: [],
execScript: "",