From 917c4ee8b05e816602aa06f67f2f5447150b242f Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 17 十二月 2025 09:35:50 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao

---
 admin/src/views/business/warningRule.vue |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/admin/src/views/business/warningRule.vue b/admin/src/views/business/warningRule.vue
index db5eb91..7773aaf 100644
--- a/admin/src/views/business/warningRule.vue
+++ b/admin/src/views/business/warningRule.vue
@@ -37,6 +37,13 @@
       >
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column prop="title" label="鎶ヨ瑙勫垯" min-width="200px" show-tooltip-when-overflow></el-table-column>
+        <el-table-column prop="detailList" label="瑙勫垯鏄庣粏" min-width="360px" show-tooltip-when-overflow>
+          <template slot-scope="{row}">
+            <div  v-if="row.detailList && row.detailList.length">
+                <div style="display: block;" v-for="item in row.detailList"> {{item.warningName||''}} {{item.regionName||''}} {{item.deviceName||''}};</div>
+             </div>
+          </template>
+        </el-table-column>
         <el-table-column prop="memberNames" label="鎶ヨ鎺ユ敹浜�" min-width="200px" show-tooltip-when-overflow>
           <template slot-scope="{row}">
            <span v-if="row.memberNotice === 1">{{row.memberNames}}</span>

--
Gitblit v1.9.3