监控模式告警信息查看详情增加modelid是否存在判断

src/components/monitoring/door.vue

@@ -109,16 +109,16 @@
           @mouseleave="closeAlarkAlert(item, index, 0)" v-for="(item, index) in listData.warnEquipList" :key="index"
           v-if="activeTab == 1">
           <div :style="{ display: item.showAlert ? 'flex' : 'none' }" class="alark-alert">
-            <p @click="bjClick(item)">
+            <p @click="bjClick(item)" v-if="item.modelId != ''">
               <img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" />
               <span>查看详情</span>
             </p>
-            <span v-if="item.confirmStatus == '0'">|</span>
+            <span v-if="item.confirmStatus == '0' && item.modelId != ''">|</span>
             <p v-if="item.confirmStatus == '0'" @click="doCancelWarn(item)">
               <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
               <span>确认告警</span>
             </p>
-            <span v-if="item.warnStatus == 1">|</span>
+            <span v-if="item.warnStatus == 1 && (item.modelId != '' || item.confirmStatus == '0')">|</span>
             <p v-if="item.warnStatus == 1" @click="doRecoveryWarn(item)">
               <i class="el-icon-refresh-right" style="margin-right:10px;"></i>
               <span>告警恢复</span>
@@ -149,16 +149,16 @@
           @mouseenter="showAlarkAlert(item, index, 1)" style="position: relative"
           @mouseleave="closeAlarkAlert(item, index, 1)">
           <div :style="{ display: item.showAlert ? 'flex' : 'none' }" class="alark-alert">
-            <p @click="bjClick(item)">
+            <p @click="bjClick(item)" v-if="item.modelId != ''">
               <img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" />
               <span>查看详情</span>
             </p>
-            <span v-if="item.confirmStatus == 1">|</span>
+            <span v-if="item.confirmStatus == 1 && item.modelId != ''">|</span>
             <p v-if="item.confirmStatus == 1" @click="doCancelWarn(item)">
               <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
               <span>确认告警</span>
             </p>
-            <span v-if="item.warnStatus == 1">|</span>
+            <span v-if="item.warnStatus == 1 && (item.modelId != '' || item.confirmStatus == '0')">|</span>
             <p v-if="item.warnStatus == 1" @click="doRecoveryWarn(item)">
               <i class="el-icon-refresh-right" style="margin-right:10px;"></i>
               <span>告警恢复</span>

src/components/monitoring/electricity.vue

@@ -53,16 +53,16 @@
           @mouseenter="showAlarmAlert(item, index)" style="position: relative"
           @mouseleave="closeAlarmAlert(item, index)">
           <div :style="{ display: item.showAlert ? 'flex' : 'none' }" class="alarm-alert">
-            <p @click="bjClick(item)">
+            <p @click="bjClick(item)" v-if="item.modelId != ''">
               <img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" />
               <span>查看详情</span>
             </p>
-            <span v-if="item.confirmStatus == '0'">|</span>
+            <span v-if="item.confirmStatus == '0' && item.modelId != ''">|</span>
             <p @click="doCancelWarn(item)" v-if="item.confirmStatus == '0'">
               <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
               <span>确认告警</span>
             </p>
-            <span v-if="item.warnStatus == 1">|</span>
+            <span v-if="item.warnStatus == 1 && (item.modelId != '' || item.confirmStatus == '0')">|</span>
             <p v-if="item.warnStatus == 1" @click="doRecoveryWarn(item)">
               <i class="el-icon-refresh-right" style="margin-right:10px;"></i>
               <span>告警恢复</span>

src/components/monitoring/firefighting.vue

@@ -76,16 +76,16 @@
           @mouseenter="showAlarkAlert(item, index, 0)" style="position: relative"
           @mouseleave="closeAlarkAlert(item, index, 0)">
           <div :style="{ display: item.showAlert ? 'flex' : 'none' }" class="alark-alert">
-            <p @click="bjClick(item)">
+            <p @click="bjClick(item)" v-if="item.modelId != ''">
               <img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" />
               <span>查看详情</span>
             </p>
-            <span v-if="item.confirmStatus == '0'">|</span>
+            <span v-if="item.confirmStatus == '0' && item.modelId != ''">|</span>
             <p v-if="item.confirmStatus == '0'" @click="doCancelWarn(item)">
               <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
               <span>确认告警</span>
             </p>
-            <span v-if="item.warnStatus == 1">|</span>
+            <span v-if="item.warnStatus == 1 && (item.modelId != '' || item.confirmStatus == '0')">|</span>
             <p v-if="item.warnStatus == 1" @click="doRecoveryWarn(item)">
               <i class="el-icon-refresh-right" style="margin-right:10px;"></i>
               <span>告警恢复</span>
@@ -111,16 +111,16 @@
           @mouseenter="showAlarkAlert(item, index, 1)" style="position: relative"
           @mouseleave="closeAlarkAlert(item, index, 1)">
           <div :style="{ display: item.showAlert ? 'flex' : 'none' }" class="alark-alert">
-            <p @click="bjClick(item)">
+            <p @click="bjClick(item)" v-if="item.modelId != ''">
               <img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" />
               <span>查看详情</span>
             </p>
-            <span v-if="item.confirmStatus == '0'">|</span>
+            <span v-if="item.confirmStatus == '0' && item.modelId != ''">|</span>
             <p v-if="item.confirmStatus == '0'" @click="doCancelWarn(item)">
               <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
               <span>确认告警</span>
             </p>
-            <span v-if="item.warnStatus == 1">|</span>
+            <span v-if="item.warnStatus == 1 && (item.modelId != '' || item.confirmStatus == '0')">|</span>
             <p v-if="item.warnStatus == 1" @click="doRecoveryWarn(item)">
               <i class="el-icon-refresh-right" style="margin-right:10px;"></i>
               <span>告警恢复</span>

src/components/monitoring/light.vue

@@ -70,16 +70,16 @@
           style="position: relative" @mouseenter="showAlarkAlert(item, index, 0)"
           @mouseleave="closeAlarkAlert(item, index, 0)">
           <div :style="{ display: item.showAlert ? 'flex' : 'none' }" class="alark-alert">
-            <p>
+            <p @click="bjclick(item)" v-if="item.modelId != ''">
               <img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" />
               <span>查看详情</span>
             </p>
-            <span v-if="item.confirmStatus == '0'">|</span>
+            <span v-if="item.confirmStatus == '0' && item.modelId != ''">|</span>
             <p v-if="item.confirmStatus == '0'" @click="doCancelWarn(item)">
               <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
               <span>确认告警</span>
             </p>
-            <span v-if="item.warnStatus == 1">|</span>
+            <span v-if="item.warnStatus == 1 && (item.modelId != '' || item.confirmStatus == '0')">|</span>
             <p v-if="item.warnStatus == 1" @click="doRecoveryWarn(item)">
               <i class="el-icon-refresh-right" style="margin-right:10px;"></i>
               <span>告警恢复</span>
@@ -107,16 +107,16 @@
           @mouseenter="showAlarkAlert(item, index, 1)" style="position: relative"
           @mouseleave="closeAlarkAlert(item, index, 1)">
           <div :style="{ display: item.showAlert ? 'flex' : 'none' }" class="alark-alert">
-            <p @click="bjClick(item)">
+            <p @click="bjClick(item)" v-if="item.modelId != ''">
               <img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" />
               <span>查看详情</span>
             </p>
-            <span v-if="item.confirmStatus == '0'">|</span>
+            <span v-if="item.confirmStatus == '0' && item.modelId != ''">|</span>
             <p v-if="item.confirmStatus == '0'" @click="doCancelWarn(item)">
               <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
               <span>确认告警</span>
             </p>
-            <span v-if="item.warnStatus == 1">|</span>
+            <span v-if="item.warnStatus == 1 && (item.modelId != '' || item.confirmStatus == '0')">|</span>
             <p v-if="item.warnStatus == 1" @click="doRecoveryWarn(item)">
               <i class="el-icon-refresh-right" style="margin-right:10px;"></i>
               <span>告警恢复</span>

src/components/monitoring/monitoring.vue

@@ -63,16 +63,16 @@
             @mouseenter="showAlarmAlert(item, index)" style="position: relative"
             @mouseleave="closeAlarmAlert(item, index)">
             <div :style="{ display: item.showAlert ? 'flex' : 'none' }" class="alarm-alert">
-              <p @click="bjClick(item)">
+              <p @click="bjClick(item)" v-if="item.modelId != ''">
                 <img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" />
                 <span>查看详情</span>
               </p>
-              <span v-if="item.confirmStatus == '0'">|</span>
+              <span v-if="item.confirmStatus == '0' && item.modelId != ''">|</span>
               <p v-if="item.confirmStatus == '0'" @click="doCancelWarn(item)">
                 <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
                 <span>确认告警</span>
               </p>
-              <span v-if="item.warnStatus == 1">|</span>
+              <span v-if="item.warnStatus == 1 && (item.modelId != '' || item.confirmStatus == '0')">|</span>
               <p v-if="item.warnStatus == 1" @click="doRecoveryWarn(item)">
                 <i class="el-icon-refresh-right" style="margin-right:10px;"></i>
                 <span>告警恢复</span>

src/components/monitoring/wall.vue

@@ -78,16 +78,16 @@
           style="position: relative" @mouseleave="closeAlarkAlert(item, index, 0)"
           v-for="(item, index) in listData.warnEquipList" :key="index" v-if="activeTab == 1">
           <div :style="{ display: item.showAlert ? 'flex' : 'none' }" class="alark-alert">
-            <p @click="bjClick(item)">
+            <p @click="bjClick(item)" v-if="item.modelId != ''">
               <img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" />
               <span>查看详情</span>
             </p>
-            <span v-if="item.confirmStatus == '0'">|</span>
+            <span v-if="item.confirmStatus == '0' && item.modelId != ''">|</span>
             <p v-if="item.confirmStatus == '0'" @click="doCancelWarn(item)">
               <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
               <span>确认告警</span>
             </p>
-            <span v-if="item.warnStatus == 1">|</span>
+            <span v-if="item.warnStatus == 1 && (item.modelId != '' || item.confirmStatus == '0')">|</span>
             <p v-if="item.warnStatus == 1" @click="doRecoveryWarn(item)">
               <i class="el-icon-refresh-right" style="margin-right:10px;"></i>
               <span>告警恢复</span>
@@ -118,16 +118,16 @@
           :key="index" @mouseenter="showAlarkAlert(item, index, 1)" style="position: relative"
           @mouseleave="closeAlarkAlert(item, index, 1)">
           <div :style="{ display: item.showAlert ? 'flex' : 'none' }" class="alark-alert">
-            <p @click="bjClick(item)">
+            <p @click="bjClick(item)" v-if="item.modelId != ''">
               <img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" />
               <span>查看详情</span>
             </p>
-            <span v-if="item.confirmStatus == '0'">|</span>
+            <span v-if="item.confirmStatus == '0' && item.modelId != ''">|</span>
             <p v-if="item.confirmStatus == '0'" @click="doCancelWarn(item)">
               <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
               <span>确认告警</span>
             </p>
-            <span v-if="item.warnStatus == 1">|</span>
+            <span v-if="item.warnStatus == 1 && (item.modelId != '' || item.confirmStatus == '0')">|</span>
             <p v-if="item.warnStatus == 1" @click="doRecoveryWarn(item)">
               <i class="el-icon-refresh-right" style="margin-right:10px;"></i>
               <span>告警恢复</span>

src/components/monitoring/warm.vue

@@ -185,16 +185,16 @@
           @mouseleave="closeAlarkAlert(item, index, 0)" v-for="(item, index) in listData.warnEquipList" :key="index"
           v-if="activeTab == 1">
           <div :style="{ display: item.showAlert ? 'flex' : 'none' }" class="alark-alert">
-            <p @click="bjClick(item)">
+            <p @click="bjClick(item)" v-if="item.modelId != ''">
               <img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" />
               <span>查看详情</span>
             </p>
-            <span v-if="item.confirmStatus == '0'">|</span>
+            <span v-if="item.confirmStatus == '0' && item.modelId != ''">|</span>
             <p v-if="item.confirmStatus == '0'" @click="doCancelWarn(item)">
               <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
               <span>确认告警</span>
             </p>
-            <span v-if="item.warnStatus == 1">|</span>
+            <span v-if="item.warnStatus == 1 && (item.modelId != '' || item.confirmStatus == '0')">|</span>
             <p v-if="item.warnStatus == 1" @click="doRecoveryWarn(item)">
               <i class="el-icon-refresh-right" style="margin-right:10px;"></i>
               <span>告警恢复</span>
@@ -220,16 +220,16 @@
           @mouseenter="showAlarkAlert(item, index, 1)" style="position: relative"
           @mouseleave="closeAlarkAlert(item, index, 1)" :key="'warnEvent' + index">
           <div :style="{ display: item.showAlert ? 'flex' : 'none' }" class="alark-alert">
-            <p @click="bjClick(item)">
+            <p @click="bjClick(item)" v-if="item.modelId != ''">
               <img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" />
               <span>查看详情</span>
             </p>
-            <span v-if="item.confirmStatus == '0'">|</span>
+            <span v-if="item.confirmStatus == '0' && item.modelId != ''">|</span>
             <p v-if="item.confirmStatus == '0'" @click="doCancelWarn(item)">
               <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
               <span>确认告警</span>
             </p>
-            <span v-if="item.warnStatus == 1">|</span>
+            <span v-if="item.warnStatus == 1 && (item.modelId != '' || item.confirmStatus == '0')">|</span>
             <p v-if="item.warnStatus == 1" @click="doRecoveryWarn(item)">
               <i class="el-icon-refresh-right" style="margin-right:10px;"></i>
               <span>告警恢复</span>

src/components/monitoring/water.vue

@@ -182,16 +182,16 @@
           :key="'warnEquip_' + index" @mouseenter="showAlarkAlert(item, index, 0)" style="position: relative"
           @mouseleave="closeAlarkAlert(item, index, 0)">
           <div :style="{ display: item.showAlert ? 'flex' : 'none' }" class="alark-alert">
-            <p @click="bjClick(item)">
+            <p @click="bjClick(item)" v-if="item.modelId != ''">
               <img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" />
               <span>查看详情</span>
             </p>
-            <span v-if="item.confirmStatus == '0'">|</span>
+            <span v-if="item.confirmStatus == '0' && item.modelId != ''">|</span>
             <p v-if="item.confirmStatus == '0'" @click="doCancelWarn(item)">
               <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
               <span>确认告警</span>
             </p>
-            <span v-if="item.warnStatus == 1">|</span>
+            <span v-if="item.warnStatus == 1 && (item.modelId != '' || item.confirmStatus == '0')">|</span>
             <p v-if="item.warnStatus == 1" @click="doRecoveryWarn(item)">
               <i class="el-icon-refresh-right" style="margin-right:10px;"></i>
               <span>告警恢复</span>
@@ -215,16 +215,16 @@
           @mouseenter="showAlarkAlert(item, index, 1)" style="position: relative"
           @mouseleave="closeAlarkAlert(item, index, 1)">
           <div :style="{ display: item.showAlert ? 'flex' : 'none' }" class="alark-alert">
-            <p @click="bjClick(item)">
+            <p @click="bjClick(item)" v-if="item.modelId != ''">
               <img src="../../../public/img/monitoring/electricity/alark-detail-icon.png" alt="" />
               <span>查看详情</span>
             </p>
-            <span v-if="item.confirmStatus == '0'">|</span>
+            <span v-if="item.confirmStatus == '0' && item.modelId != ''">|</span>
             <p v-if="item.confirmStatus == '0'" @click="doCancelWarn(item)">
               <img src="../../../public/img/monitoring/electricity/close-alark-icon.png" alt="" />
               <span>确认告警</span>
             </p>
-            <span v-if="item.warnStatus == 1">|</span>
+            <span v-if="item.warnStatus == 1 && (item.modelId != '' || item.confirmStatus == '0')">|</span>
             <p v-if="item.warnStatus == 1" @click="doRecoveryWarn(item)">
               <i class="el-icon-refresh-right" style="margin-right:10px;"></i>
               <span>告警恢复</span>