From 30293db4da06c4b3053e21d440a35820bac0a577 Mon Sep 17 00:00:00 2001 From: 23688nl <329261568@qq.com> Date: Mon, 26 Sep 2022 10:30:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9A=20=E5=9C=BA?= =?UTF-8?q?=E6=99=AF=E6=8E=A7=E5=88=B6=20=20=E5=A2=9E=E5=8A=A0=20=E8=A7=A6?= =?UTF-8?q?=E5=8F=91=E5=99=A8=20=E9=98=B2=E6=8A=96(=E9=97=B4=E9=9A=94)=20?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=93=8D=E4=BD=9C=EF=BC=8C=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/EasyCron/index.vue | 6 +- .../ESceneAction/src/executeAction.js | 6 +- .../ESceneTriggers/src/ECronForm.vue | 1 + .../ESceneTriggers/src/EInterval.vue | 62 +++++++++++++++++++ .../ESceneManage/ESceneTriggers/src/index.js | 36 ++++++++++- .../ESceneTriggers/src/style.scss | 40 ++++++++++++ src/views/system/dept/index.vue | 2 +- 7 files changed, 145 insertions(+), 8 deletions(-) create mode 100644 src/views/iot/project/profileV2/ESceneManage/ESceneTriggers/src/EInterval.vue diff --git a/src/components/EasyCron/index.vue b/src/components/EasyCron/index.vue index 87be64b8..0feab513 100644 --- a/src/components/EasyCron/index.vue +++ b/src/components/EasyCron/index.vue @@ -3,7 +3,7 @@
- + @@ -52,6 +52,10 @@ export default { event: 'change' }, props: { + disabledSecond: { + type: Boolean, + default: true + }, cronValue: { type: String, default: '' diff --git a/src/views/iot/project/profileV2/ESceneManage/ESceneAction/src/executeAction.js b/src/views/iot/project/profileV2/ESceneManage/ESceneAction/src/executeAction.js index fc8fb321..801abb32 100644 --- a/src/views/iot/project/profileV2/ESceneManage/ESceneAction/src/executeAction.js +++ b/src/views/iot/project/profileV2/ESceneManage/ESceneAction/src/executeAction.js @@ -71,10 +71,7 @@ export default { let notifierObj = { msgType: 'SMS', "msgServer": "电信", - "msgTemplate": "报警模板", - "actionId": null, - "sceneId": null, - "recordStatus": 0, + "msgTemplate": "", contactsRelList: [] } this.dataItem.sceneActionNotifierContacts = [notifierObj]; @@ -180,6 +177,7 @@ export default { : null} { (dataItem.actionType === "NOTIFIER") ?
+ +
+
+ + + + +
+
+ + 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"] } ],