From 4a800a8fc83c6bd1f86a8e847b079a51a7532c09 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 20 七月 2022 15:05:58 +0800
Subject: [PATCH] 修复国标配置的bug
---
src/pages/datapush/index/RightEvent.vue | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/src/pages/datapush/index/RightEvent.vue b/src/pages/datapush/index/RightEvent.vue
index 0edd147..01ca008 100644
--- a/src/pages/datapush/index/RightEvent.vue
+++ b/src/pages/datapush/index/RightEvent.vue
@@ -41,6 +41,7 @@
v-model="item.url"
style="width: 360px; margin-left: 0px"
size="small"
+ placeholder="http://10.10.10.10:8000/dataApi"
></el-input>
</div>
<div class="server-add">
@@ -59,6 +60,7 @@
placeholder="璇烽�夋嫨"
size="small"
>
+ <el-option label="璇烽�夋嫨" value=""></el-option>
<el-option
v-for="item in taskEditData.lineOptions"
:key="item.value"
@@ -546,6 +548,13 @@
},
// 淇濆瓨
async eventPushsSave() {
+ if (this.taskEditData.name.length < 1) {
+ this.$notify({
+ type: "warning",
+ message: "璇峰～鍐欐帹閫佷换鍔″悕绉�",
+ });
+ return;
+ }
// 鍒ゆ柇淇濆瓨鐨刬p鏄惁绗﹀悎鏍煎紡瑕佹眰
if (this.taskEditData.urls.length < 1) {
this.$notify({
@@ -563,7 +572,13 @@
return;
}
}
-
+ if (this.dataList.length < 1) {
+ this.$notify({
+ type: "warning",
+ message: "璇峰湪浠诲姟閰嶇疆涓淮鎶よ鍒欙紒",
+ });
+ return;
+ }
// 鎷兼帴瀛楃涓�
let ruleDesc = [];
this.dataList.forEach((i) => {
@@ -696,12 +711,12 @@
if (resetNext) {
rule.topic_arg = rule.topicArgOptions[0].value;
this.selectArg(rule, resetNext);
+ this.setOptionsDisable(rule);
}
}
});
},
selectArg(rule, resetNext = false) {
- debugger;
let argInfo = rule.topicArgOptions.filter((arg) => {
return arg.value === rule.topic_arg;
});
@@ -770,9 +785,11 @@
rule.rule_value = val.join(",");
},
setOptionsDisable(rule) {
- let isAllSelect = rule.rule_values.indexOf("鍏ㄩ儴") >= 0;
+ console.log(rule);
+ let isAllSelect =
+ rule.rule_values.indexOf("鍏ㄩ儴") >= 0 ||
+ rule.rule_values.indexOf("all*all") >= 0;
let isNullSelect = rule.rule_values.indexOf("绌�") >= 0;
- console.log(rule.rule_values);
rule.ruleValueOptions.forEach((opt) => {
if (!rule.rule_values.length) {
@@ -787,6 +804,8 @@
opt.disabled = isAllSelect || isNullSelect;
});
+ console.log(1212);
+ console.log(rule.ruleValueOptions);
},
// 鏍规嵁value杩斿洖瀵瑰簲鐨刵ame
getNameByValue(arr, value) {
@@ -988,3 +1007,6 @@
}
}
</style>
+
+
+
--
Gitblit v1.8.0