From a0a0182d58166bff6d1f88b0893bce560db2caca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Tue, 25 Jun 2024 16:31:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/views/business/alarmRule/index.vue | 34 ++++++++++++++++---
1 file changed, 30 insertions(+), 4 deletions(-)
diff --git a/ruoyi-ui/src/views/business/alarmRule/index.vue b/ruoyi-ui/src/views/business/alarmRule/index.vue
index ef15893..d26410a 100644
--- a/ruoyi-ui/src/views/business/alarmRule/index.vue
+++ b/ruoyi-ui/src/views/business/alarmRule/index.vue
@@ -227,6 +227,21 @@
+
+
+
+
+
+
+
+
+
+
@@ -451,12 +466,14 @@ import {
getScenes, getEditedScenes, getSelectListBySceneId, getDeviceModeByDeviceId, getModeFunctionParametersByModeFunctionId
} from "@/api/business/alarmRule";
import {addDeviceModeFunction} from "@/api/business/deviceModeFunction";
+import {listUser} from "../../../api/system/user";
export default {
name: "AlarmRule",
dicts: ['hw_alarm_rule_type', 'hw_alarm_rule_link_flag', 'hw_alarm_rule_status', 'hw_alarm_rule_push_flag', 'hw_alarm_rule_trigger_condition', 'hw_alarm_rule_link_type'],
data() {
return {
+ phoneList: [],
FUNCTION_MODE_ATTRIBUTE: "1", //设备模型属性
FUNCTION_MODE_SERVICE: "2",//设备模型服务
DATA_MORE_THAN_A_AND_LESS_THAN_B: 3,//大于A且小于B
@@ -614,8 +631,18 @@ export default {
created() {
this.getList();
this.getScenes();
+ this.getPhoneList()
},
methods: {
+ getPhoneList() {
+ listUser({
+ pageNum: 1,
+ pageSize: 10000000
+ }).then(response => {
+ this.phoneList = response.rows.filter(v => !!v.phonenumber);
+ }
+ );
+ },
/** 查询报警规则列表 */
getList() {
this.loading = true;
@@ -687,7 +714,7 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.editedDisabled = false;
- this.sceneDisabled = false;
+ this.sceneDisabled = false;
this.reset();
this.getEditedScenes();
this.open = true;
@@ -696,7 +723,7 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
- this.sceneDisabled = true;
+ this.sceneDisabled = true;
this.getEditedScenes();
const alarmRuleId = row.alarmRuleId || this.ids
@@ -716,7 +743,6 @@ export default {
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
-
if (this.form.linkFlag == this.LINK_FLAG_YES &&
(this.alarmRuleLinkData == null || this.alarmRuleLinkData.length <= 0)) {
this.$modal.msgWarning("请添加联动设备");
@@ -927,7 +953,7 @@ export default {
// 报警规则联动设备表单重置
resetAlarmRuleLink() {
this.alarmRuleLinkForm = {
- alarmRuleType:'1',
+ alarmRuleType: '1',
linkType: null,
linkDeviceId: null,
linkDeviceFunctionId: null,