From 17052a90ea9b3d23cab8325eee674aeeefa19e39 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期一, 08 二月 2021 13:55:05 +0800
Subject: [PATCH] 修复事件推送的多选菜单.

---
 src/pages/datapush/index/RightEvent.vue |   44 +++++++++++++++++++++++---------------------
 1 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/pages/datapush/index/RightEvent.vue b/src/pages/datapush/index/RightEvent.vue
index ef2e973..dcaae85 100644
--- a/src/pages/datapush/index/RightEvent.vue
+++ b/src/pages/datapush/index/RightEvent.vue
@@ -377,7 +377,6 @@
       var reg = /^[A-Za-z]+[0-9-_]?$/;
       if (!reg.test(param.alias)) {
         this.$message('璇疯緭鍏ュ悎娉曞瓧娈靛悕');
-        debugger
         param.error = true;
       } else {
         param.error = false;
@@ -442,8 +441,8 @@
       });
     },
     delUrl(index) {
-      this.$set(this.taskEditData.urls, index, this.baseRule)
-      this.taskEditData.urls.splice(index, 1)
+      this.$set(this.taskEditData.urls, index, this.baseRule);
+      this.taskEditData.urls.splice(index, 1);
     },
     // 淇濆瓨
     async eventPushsSave() {
@@ -480,15 +479,15 @@
         }
 
         if (i.rule_value === "all*all") {
-          str += "鍏ㄩ儴"
+          str += "鍏ㄩ儴";
         } else if (i.rule_value === "null*null") {
-          str += "绌�"
+          str += "绌�";
         } else {
-          str += i.rule_value
+          str += i.rule_value;
         }
 
         if (str.length > 0) {
-          ruleDesc.push(str)
+          ruleDesc.push(str);
         }
       });
       // 澶勭悊瑙勫垯鍒楄〃鏁版嵁缁撴瀯
@@ -545,7 +544,7 @@
     async getCameras() {
       let rsp = await findByEventTopic({ topic: 'camera', type: 'name' });
       if (rsp && rsp.success) {
-        this.dictionary['camera'] = rsp.data
+        this.dictionary['camera'] = rsp.data;
       }
 
       rsp = await findByEventTopic({ topic: 'dbtable' });
@@ -569,7 +568,7 @@
               value: task.name,
               name: task.name
             })
-            hash[task.name] = true
+            hash[task.name] = true;
           }
         })
       }
@@ -595,44 +594,47 @@
         if (element.value === rule.topic_type) {
           rule.topicArgOptions = element.children;
           if (resetNext) {
-            rule.topic_arg = rule.topicArgOptions[0].value
-            this.selectArg(rule, resetNext)
+            rule.topic_arg = rule.topicArgOptions[0].value;
+            this.selectArg(rule, resetNext);
           }
         }
       });
     },
     selectArg(rule, resetNext = false) {
       let argInfo = rule.topicArgOptions.filter(arg => {
-        return arg.value === rule.topic_arg
+        return arg.value === rule.topic_arg;
       })
 
       if (argInfo.length > 0) {
-        let desc = argInfo[0].description.split(",")
+        let desc = argInfo[0].description.split(",");
         if (desc.length > 0) {
           rule.operatorTypeOpionts = this.dictionary.EVENTTYPECOMPUTE.filter(el => {
-            return desc.indexOf(el.value) >= 0
+            return desc.indexOf(el.value) >= 0;
           })
         }
       }
 
       if (resetNext) {
-        rule.operator_type = rule.operatorTypeOpionts[rule.operatorTypeOpionts.length - 1].value
-        this.selectOperator(rule, resetNext)
+        rule.operator_type = rule.operatorTypeOpionts[rule.operatorTypeOpionts.length - 1].value;
+        this.selectOperator(rule, resetNext);
       }
     },
     selectOperator(rule, resetNext = false) {
       if (rule.operator_type === "option") {
-        rule.ruleValueOptions = this.dictionary[rule.topic_type] ? this.dictionary[rule.topic_type] : []
-        rule.rule_values = rule.rule_value.split(",")
+        rule.ruleValueOptions = this.dictionary[rule.topic_type] ? this.dictionary[rule.topic_type] : [];
+
+        if (rule.rule_value != "") {
+          rule.rule_values = rule.rule_value.split(",");
+        }
 
         // 澶勭悊 鍏ㄩ儴/绌�
         for (let i = 0; i < rule.rule_values.length; i++) {
           if (rule.rule_values[i] === "all*all") {
-            rule.rule_values[i] = "鍏ㄩ儴"
+            rule.rule_values[i] = "鍏ㄩ儴";
           }
 
           if (rule.rule_values[i] === "null*null") {
-            rule.rule_values[i] = "绌�"
+            rule.rule_values[i] = "绌�";
           }
         }
 
@@ -659,7 +661,7 @@
         }
       }
 
-      rule.rule_value = val.join(",")
+      rule.rule_value = val.join(",");
     },
     setOptionsDisable(rule) {
       let isAllSelect = (rule.rule_values.indexOf("鍏ㄩ儴") >= 0);

--
Gitblit v1.8.0