+
+
+
+
+
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 e9d34e30..eb42d66e 100644
--- a/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/index.js
+++ b/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/index.js
@@ -4,6 +4,7 @@ import selectMethod from './ESelect'
import ESelectDevice from './ESelectDevice'
import EConditionTemp from './EConditionTemp'
import ECronForm from './ECronForm'
+import EInterval from './EInterval'
export default {
@@ -21,18 +22,20 @@ export default {
require: true,
},
},
- components: { selectMethod, ESelectDevice, EConditionTemp, ECronForm },
+ components: { selectMethod, ESelectDevice, EConditionTemp, ECronForm, EInterval },
data() {
return {
method: 'DEVICE',
exeStartTime: "",
- open: false
+ open: false,
+ isAntiShake: false,
}
},
mounted() {
if (this.$refs.eCondition && this.dataItem.sceneTriggerDevices[0]['deviceId']) {
this.$refs.eCondition.getcomdlist(this.dataItem.sceneTriggerDevices[0]['deviceId']);
};
+ this.isAntiShake = Number(this.dataItem.intervalVal) >= 1 ? true : false;
this.exeStartTime = this.parseTime(new Date(), "{y}-{m}-{d} {h}:{i}:{s}");
},
methods: {
@@ -79,6 +82,13 @@ export default {
this.open = false
}
},
+ watch: {
+ isAntiShake() {
+ if(this.isAntiShake === false) {
+ this.dataItem['intervalVal'] = 0;
+ }
+ }
+ },
render() {
const { dataItem, inputWidth, sourceId } = this;
return (
@@ -90,6 +100,28 @@ export default {
+
+
+
+
+
+
{defaultConfig.title || '--'}: { dataItem.orderBy }
刪除
+
+
+ {
+ this.isAntiShake ? { dataItem['intervalVal'] = e }}
+ onChange={(e) => { dataItem['intervalUnit'] = e }}
+ >
+ : null
+ }
+
diff --git a/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/style.scss b/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/style.scss
index 71d3ab05..aa77635e 100644
--- a/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/style.scss
+++ b/src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/style.scss
@@ -58,3 +58,43 @@
font-size: 12px;
margin-left: 20px;
}
+.e-trigger-title {
+ display: flex;
+ height: 100%;
+ align-items: center;
+ width: 100%;
+}
+.e-scene-trigger-anti-switch {
+ margin: 0 10px;
+}
+.e-scene-trigger-anti-switch .el-switch__label {
+ position: absolute;
+ display: none;
+ color: #fff !important;
+}
+
+.e-scene-trigger-anti-switch .el-switch__label--right {
+ z-index: 1;
+}
+
+.e-scene-trigger-anti-switch .el-switch__label--right span{
+margin-left: 15px;
+}
+
+.e-scene-trigger-anti-switch .el-switch__label--left {
+ z-index: 1;
+}
+
+.e-scene-trigger-anti-switch .el-switch__label--left span{
+ margin-left: 30px;
+}
+
+.e-scene-trigger-anti-switch .el-switch__label.is-active {
+ display: block;
+}
+
+.e-scene-trigger-anti-switch.el-switch .el-switch__core,
+.el-switch .el-switch__label {
+ width: 100px !important;
+ margin: 0;
+}
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index fbe0918b..b16b8f9a 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -195,7 +195,7 @@ export default {
email: [
{
type: "email",
- message: "'请输入正确的邮箱地址",
+ message: "请输入正确的邮箱地址",
trigger: ["blur", "change"]
}
],