From 33d6185c6c4e72f9aa4cae657baa6d27a89cb84b Mon Sep 17 00:00:00 2001
From: sd <shidong@jhsoft.cc>
Date: 星期五, 29 八月 2025 09:25:40 +0800
Subject: [PATCH] 实时监控-没有触发预警的数据不再显示任务名称和等级（卡片和详情弹框）

---
 src/pages/datapush/index/RightEvent.vue |   31 +++++++++----------------------
 1 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/src/pages/datapush/index/RightEvent.vue b/src/pages/datapush/index/RightEvent.vue
index 062a47a..50849da 100644
--- a/src/pages/datapush/index/RightEvent.vue
+++ b/src/pages/datapush/index/RightEvent.vue
@@ -15,8 +15,8 @@
 
         <div>
           <span style="line-height: 38px;margin-right: 20px;">鎺ㄩ�佹柟寮�</span>
-          <el-radio :disabled="urls.length > 0" v-model="taskEditData.pushType" label="1">UDP</el-radio>
-          <el-radio :disabled="urls.length > 0" v-model="taskEditData.pushType" label="2">HTTP</el-radio>
+          <el-radio v-model="taskEditData.pushType" label="1">UDP</el-radio>
+          <el-radio v-model="taskEditData.pushType" label="2">HTTP</el-radio>
           <el-radio disabled v-model="taskEditData.pushType" label="3">MQTT</el-radio>
         </div>
         <span style="line-height: 38px">鎺ㄩ�佹湇鍔″櫒</span>
@@ -27,11 +27,13 @@
         <div v-for="(item, index) in urls" :key="item.hash" class="flex-box server-url">
           <div>
             <el-checkbox v-model="item.enable"></el-checkbox>
-            <span class="ml20">{{ "URL&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" }}</span>
+            <span v-if="taskEditData.pushType === '1'" class="ml20">{{ "鏈嶅姟鍣�&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" }}</span>
+            <span v-else class="ml20">{{ "URL&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" }}</span>
             <el-input v-if="taskEditData.pushType === '1'" v-model="item.server_ip"
               style="width: 180px; margin-left: 0px;margin-right: 30px" size="small"
               placeholder="192.168.1.100"></el-input>
-            绔彛 <el-input v-if="taskEditData.pushType === '1'" v-model="item.port" style="width: 70px; margin-left: 10px"
+              <span v-if="taskEditData.pushType === '1'">绔彛</span>
+             <el-input v-if="taskEditData.pushType === '1'" v-model="item.port" style="width: 70px; margin-left: 10px"
               size="small" placeholder="8030"></el-input>
             <el-input v-if="taskEditData.pushType === '2'" v-model="item.url" style="width: 360px; margin-left: 0px"
               size="small" placeholder="http://10.10.10.10:8000/dataApi"></el-input>
@@ -111,15 +113,10 @@
               <el-input v-model="rule.rule_value" placeholder="璇疯緭鍏ュ唴瀹�" size="small"></el-input>
             </div>
             <div v-else>
-              <el-select v-if="!isWarningSelect" v-model="rule.rule_values" multiple collapse-tags placeholder="璇烽�夋嫨"
-                size="small" @change="selectValue(rule, $event)">
-                <el-option v-for="item in rule.ruleValueOptions" :key="item.id" :label="item.name"
-                  :disabled="item.disabled" :value="item.value"></el-option>
-              </el-select>
-              <el-select v-else v-model="rule.rule_values" collapse-tags placeholder="璇烽�夋嫨" size="small"
+              <el-select v-model="rule.rule_values" multiple collapse-tags placeholder="璇烽�夋嫨" size="small"
                 @change="selectValue(rule, $event)">
                 <el-option v-for="item in rule.ruleValueOptions" :key="item.id" :label="item.name"
-                  :value="item.value"></el-option>
+                  :disabled="item.disabled" :value="item.value"></el-option>
               </el-select>
             </div>
           </el-col>
@@ -211,7 +208,6 @@
   },
   data() {
     return {
-      isWarningSelect: true,
       taskEditData: {},
       dataList: [],
       dictionary: [],
@@ -625,11 +621,6 @@
           }
         }
       });
-      if (rule.topic_type && rule.topic_type === 'warning') {
-        this.isWarningSelect = true
-      } else {
-        this.isWarningSelect = false
-      }
     },
     selectArg(rule, resetNext = false) {
       let argInfo = rule.topicArgOptions.filter((arg) => {
@@ -696,12 +687,8 @@
           return;
         }
       }
-      if (this.isWarningSelect) {
-        rule.rule_value = val
-      } else {
-        rule.rule_value = val.join(",");
-      }
 
+      rule.rule_value = val.join(",");
     },
     setOptionsDisable(rule) {
       console.log(rule);

--
Gitblit v1.8.0