diff --git a/src/components/monitoring/conditioner.vue b/src/components/monitoring/conditioner.vue
index fba7add..d13899c 100644
--- a/src/components/monitoring/conditioner.vue
+++ b/src/components/monitoring/conditioner.vue
@@ -49,7 +49,7 @@
         <p>报警时间</p>
       </div>
       <div v-if="listData.length == 0" class="noBjxx">暂无故障报警信息</div>
-      <vue-seamless-scroll :class-option="classOption" :data="listData" class="warp">
+      <div class="warp">
         <div class="item flex-center" v-for="(item, index) in listData" :key="index" style="position: relative"
           @mouseenter="showAlarkAlert(item, index)" @mouseleave="closeAlarkAlert(item, index)">
           <div v-if="item.homepageShow == 1" @click="doCancelWarn(item.id)"
@@ -61,34 +61,24 @@
           </div>
           <div class="box flex-center" style="justify-content: space-around" :class="bimModel == 2 ? 'tataicon' : ''">
             <div class="left flex-center-center">
-              <img class="icon" src="../../../public/img/monitoring/electricity/lx.png" v-if="item.status == '90001'" />
+              <img class="icon" src="../../../public/img/monitoring/electricity/lx.png" v-if="item.warnStatus == '2'" />
               <img class="icon" src="../../../public/img/monitoring/electricity/bj.png" v-else />
               <span class="message" v-text="item.name" :style="{
-                color:
-                  item.status == 90000
-                    ? 'white'
-                    : item.status == 90001
-                      ? '#a5bbe5'
-                      : '#ff0000',
+                color:item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff0000' : 'white',
               }" :title="item.name"></span>
             </div>
             <span></span>
             <span class="data" :style="{
-              color:
-                item.status == 90000
-                  ? 'white'
-                  : item.status == 90001
-                    ? '#a5bbe5'
-                    : '#ff0000',
+              color:item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff0000' : 'white',
             }" :title="item.warnContent">{{ item.warnContent }}</span>
             <span class=""></span>
             <span class="time"
-              :style="{ color: item.status == 90000 ? '' : item.status == 90001 ? '#a5bbe5' : '#ff0000' }">{{
+              :style="{ color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff0000' : 'white', }">{{
                 item.warnDate.substring(5, 16)
               }}</span>
           </div>
         </div>
-      </vue-seamless-scroll>
+      </div>
       <div
         style="position: absolute;bottom: 10px;right: 10px;width:345px;text-align:right;color:rgb(7, 230, 237);font-size:14px;cursor:pointer;">
         <span @click="goMoreWarnList">查看报警详情</span>
@@ -1871,7 +1861,7 @@ export default {
     height: 120px;
     width: 345px;
     margin: auto;
-    overflow: hidden;
+    overflow-y: auto;
 
     .item {
       height: 40px;
diff --git a/src/components/monitoring/door.vue b/src/components/monitoring/door.vue
index f464749..5d40bbe 100644
--- a/src/components/monitoring/door.vue
+++ b/src/components/monitoring/door.vue
@@ -104,8 +104,7 @@
       " class="noBjxx">
         暂无安全报警信息
       </div>
-      <vue-seamless-scroll v-else :class-option="classOption"
-        :data="activeTab == 1 ? listData.warnEquipList : listData.warnEventList" class="warp">
+      <div v-else class="warp">
         <div class="item flex-center" @mouseenter="showAlarkAlert(item, index, 0)" style="position: relative"
           @mouseleave="closeAlarkAlert(item, index, 0)" v-for="(item, index) in listData.warnEquipList" :key="index"
           v-if="activeTab == 1">
@@ -123,36 +122,21 @@
           <div class="box flex-center" :class="bimModel == 2 ? 'tataicon' : ''">
             <div class="left flex-center-center">
               <img class="icon" :src="
-                require(item.status == 90001
+                require(item.warnStatus == 2
                   ? '../../../public/img/monitoring/electricity/lx.png'
                   : '../../../public/img/monitoring/electricity/bj.png')
               " />
               <span class="message" v-text="item.name" :title="item.name" :style="{
-                color:
-                  item.status == 90000
-                    ? ''
-                    : item.status == 90001
-                      ? '#a5bbe5'
-                      : '#ff0000',
+                color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff0000' : 'white',
               }"></span>
             </div>
             <span class=""></span>
             <span class="data" :title="item.warnContent" :style="{
-              color:
-                item.status == 90000
-                  ? ''
-                  : item.status == 90001
-                    ? '#a5bbe5'
-                    : '#ff0000',
+              color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff0000' : 'white',
             }">{{ item.warnContent }}</span>
             <span class=""></span>
             <span class="time" :style="{
-              color:
-                item.status == 90000
-                  ? ''
-                  : item.status == 90001
-                    ? '#a5bbe5'
-                    : '#ff0000',
+              color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff0000' : 'white',
             }">{{ item.warnDate.substring(5, 16) }}</span>
           </div>
         </div>
@@ -173,40 +157,25 @@
           <div class="box flex-center">
             <div class="left flex-center-center">
               <img class="icon" :src="
-                require(item.status == 90001
+                require(item.warnStatuss == 2
                   ? '../../../public/img/monitoring/electricity/lx.png'
                   : '../../../public/img/monitoring/electricity/bj.png')
               " />
               <span class="message" v-text="item.name" :title="item.name" :style="{
-                color:
-                  item.status == 90000
-                    ? ''
-                    : item.status == 90001
-                      ? '#a5bbe5'
-                      : '#ff0000',
+                color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff0000' : 'white',
               }"></span>
             </div>
             <span class=""></span>
             <span class="data" :title="item.warnContent" :style="{
-              color:
-                item.status == 90000
-                  ? ''
-                  : item.status == 90001
-                    ? '#a5bbe5'
-                    : '#ff0000',
+              color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff0000' : 'white',
             }">{{ item.warnContent }}</span>
             <span class=""></span>
             <span class="time" :style="{
-              color:
-                item.status == 90000
-                  ? ''
-                  : item.status == 90001
-                    ? '#a5bbe5'
-                    : '#ff0000',
+              color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff0000' : 'white',
             }">{{ item.warnDate.substring(5, 16) }}</span>
           </div>
         </div>
-      </vue-seamless-scroll>
+      </div>
       <div style="
           position: absolute;
           bottom: 10px;
@@ -1485,7 +1454,7 @@ export default {
       height: 120px;
       width: 345px;
       margin: auto;
-      overflow: hidden;
+      overflow-y: auto;
 
       .item {
         height: 40px;
diff --git a/src/components/monitoring/electricity.vue b/src/components/monitoring/electricity.vue
index 5a76a60..5ab0e86 100644
--- a/src/components/monitoring/electricity.vue
+++ b/src/components/monitoring/electricity.vue
@@ -48,7 +48,7 @@
       " class="noBjxx">
         暂无报警信息
       </div>
-      <vue-seamless-scroll v-else :class-option="classOption" :data="listData.warnEquipList" class="warp">
+      <div v-else class="warp">
         <div class="item flex-center" v-for="(item, index) in listData.warnEquipList" :key="index"
           @mouseenter="showAlarmAlert(item, index)" style="position: relative"
           @mouseleave="closeAlarmAlert(item, index)">
@@ -65,24 +65,24 @@
           </div>
           <div class="box flex-center" :class="bimModel == 2 ? 'tataicon' : ''">
             <div class="left flex-center-center">
-              <img class="icon" src="../../../public/img/monitoring/electricity/lx.png" v-if="item.status == 90001" />
+              <img class="icon" src="../../../public/img/monitoring/electricity/lx.png" v-if="item.warnStatus == 2" />
               <img class="icon" src="../../../public/img/monitoring/electricity/bj.png" v-else />
-              <span class="message" :style="{ color: item.status == 90001 ? '#9D9D9D' : 'red' }"
+              <span class="message" :style="{ color: item.warnStatus == 2 ? 'white' : 'red' }"
                 v-text="item.equipName"></span>
             </div>
             <span class=""></span>
             <!-- <span class="data" :style="{ color: item.status == 90001 ? '#9D9D9D' : 'red' }">{{ item.status == 90001 ?
                 "离线" : "报警"
             }}</span> -->
-            <span class="data" :style="{ color: item.status == 90001 ? '#9D9D9D' : 'red' }">{{ item.warnContent
+            <span class="data" :style="{ color: item.warnStatus == 2 ? 'white' : 'red' }">{{ item.warnContent
             }}</span>
             <span class=""></span>
-            <span class="time" :style="{ color: item.status == 90001 ? '#9D9D9D' : 'red' }">{{
+            <span class="time" :style="{ color: item.warnStatus == 2 ? 'white' : 'red' }">{{
                 item.warnDate.substring(5, 16)
             }}</span>
           </div>
         </div>
-      </vue-seamless-scroll>
+      </div>
       <div
         style="position: absolute;bottom: 10px;right: 10px;width:345px;text-align:right;color:rgb(7, 230, 237);font-size:14px;cursor:pointer;">
         <span @click="goMoreWarnList">查看报警详情</span>
@@ -552,7 +552,7 @@ export default {
                 }
               } else {
                 lookEquipmentCop("电");
-                setOpacityFun();
+                setOpacityFun(false,0.3);
                 this.getNavigationMap();
               }
             } else {
@@ -1678,7 +1678,7 @@ export default {
       height: 120px;
       width: 345px;
       margin: auto;
-      overflow: hidden;
+      overflow-y: auto;
 
       .item {
         height: 40px;
diff --git a/src/components/monitoring/firefighting.vue b/src/components/monitoring/firefighting.vue
index af1afe0..aeb28c2 100644
--- a/src/components/monitoring/firefighting.vue
+++ b/src/components/monitoring/firefighting.vue
@@ -71,8 +71,7 @@
       " class="noBjxx">
         暂无安全报警信息
       </div>
-      <vue-seamless-scroll v-else :class-option="classOption"
-        :data="activeTab == 1 ? listData.warnEquipList : listData.warnEventList" class="warp">
+      <div v-else class="warp">
         <div v-if="activeTab == 1" class="item flex-center" v-for="(item, index) in listData.warnEquipList" :key="index"
           @mouseenter="showAlarkAlert(item, index, 0)" style="position: relative"
           @mouseleave="closeAlarkAlert(item, index, 0)">
@@ -89,32 +88,17 @@
           </div>
           <div class="box flex-center" :class="bimModel == 2 ? 'tataicon' : ''">
             <div class="left flex-center-center">
-              <img class="icon" src="../../../public/img/monitoring/electricity/lx.png" v-if="item.status == 90001" />
+              <img class="icon" src="../../../public/img/monitoring/electricity/lx.png" v-if="item.warnStatus == 2" />
               <img class="icon" src="../../../public/img/monitoring/electricity/bj.png" v-else />
               <span class="message" v-text="item.name" :title="item.name" :style="{
-                color:
-                  item.status == 90000
-                    ? 'white'
-                    : item.status == 90001
-                      ? '#a5bbe5'
-                      : '#ff0000',
+                color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff000' : 'white',
               }"></span>
             </div>
             <span class="data" title="item.warnContent" :style="{
-              color:
-                item.status == 90000
-                  ? 'white'
-                  : item.status == 90001
-                    ? '#a5bbe5'
-                    : '#ff0000',
+              color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff000' : 'white',
             }">{{ item.warnContent }}</span>
             <span class="time" :style="{
-              color:
-                item.status == 90000
-                  ? 'white'
-                  : item.status == 90001
-                    ? '#a5bbe5'
-                    : '#ff0000',
+              color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff000' : 'white',
             }">{{ item.warnDate.substring(5, 16) }}</span>
           </div>
         </div>
@@ -134,46 +118,22 @@
           </div>
           <div class="box flex-center">
             <div class="left flex-center-center">
-              <img class="icon" src="../../../public/img/monitoring/electricity/lx.png" v-if="item.status == 90001" />
+              <img class="icon" src="../../../public/img/monitoring/electricity/lx.png" v-if="item.warnStatus == 2" />
               <img class="icon" src="../../../public/img/monitoring/electricity/bj.png" v-else />
               <span class="message" v-text="item.name" :title="item.name" :style="{
-                color:
-                  item.status == 90000
-                    ? 'white'
-                    : item.status == 90001
-                      ? '#a5bbe5'
-                      : '#ff0000',
+                color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff000' : 'white',
               }"></span>
             </div>
             <span class="data" title="item.warnMsg" :style="{
-              color:
-                item.status == 90000
-                  ? 'white'
-                  : item.status == 90001
-                    ? '#a5bbe5'
-                    : '#ff0000',
+              color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff000' : 'white',
             }">{{ item.warnContent }}</span>
             <span class="time" :style="{
-              color:
-                item.status == 90000
-                  ? 'white'
-                  : item.status == 90001
-                    ? '#a5bbe5'
-                    : '#ff0000',
+              color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff000' : 'white',
             }">{{ item.warnDate.substring(5, 16) }}</span>
           </div>
         </div>
-      </vue-seamless-scroll>
-      <div style="
-          position: absolute;
-          bottom: 10px;
-          right: 10px;
-          width: 345px;
-          text-align: right;
-          color: rgb(7, 230, 237);
-          font-size: 14px;
-          cursor: pointer;
-        ">
+      </div>
+      <div style="position: absolute;bottom: 10px; right: 10px; width: 345px; text-align: right; color: rgb(7, 230, 237); font-size: 14px; cursor: pointer;">
         <span @click="goMoreWarnList">查看报警详情</span>
       </div>
     </div>
@@ -1251,7 +1211,7 @@ export default {
       height: 120px;
       width: 345px;
       margin: auto;
-      overflow: hidden;
+      overflow-y: auto;
 
       .item {
         height: 40px;
diff --git a/src/components/monitoring/lift.vue b/src/components/monitoring/lift.vue
index c55659b..9a033a9 100644
--- a/src/components/monitoring/lift.vue
+++ b/src/components/monitoring/lift.vue
@@ -44,7 +44,7 @@
 			</div>
 			<div v-if="listData.length == 0" class="noBjxx">暂无故障报警信息
 			</div>
-			<vue-seamless-scroll :class-option="classOption" :data="listData" class="warp">
+			<div v-else class="warp">
 				<div class="item flex-center" v-for="(item, index) in listData" :key="index" style="position: relative;"
 					@mouseenter="showAlarkAlert(item, index)" @mouseleave="closeAlarkAlert(item, index)">
 					<div :style="{ display: item.showAlert ? 'flex' : 'none' }" class="alark-alert">
@@ -57,24 +57,24 @@
 						:class="bimModel == 2 ? 'tataicon' : ''">
 						<div class="left flex-center-center">
 							<img class="icon" src="../../../public/img/monitoring/electricity/lx.png"
-								v-if="item.status == '90001'">
+								v-if="item.warnStatus == '2'">
 							<img class="icon" src="../../../public/img/monitoring/electricity/bj.png" v-else>
 							<span class="message" v-text="item.name"
-								:style="{ color: item.status == 90000 ? 'white' : item.status == 90001 ? '#a5bbe5' : '#ff0000' }"
+								:style="{ color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff000' : 'white', }"
 								:title="item.name"></span>
 						</div>
 						<span></span>
 						<span class="data"
-							:style="{ color: item.status == 90000 ? 'white' : item.status == 90001 ? '#a5bbe5' : '#ff0000' }"
+							:style="{ color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff000' : 'white', }"
 							:title="item.warnContent">{{ item.warnContent }}</span>
 						<span class=""></span>
 						<span class="time"
-							:style="{ color: item.status == 90000 ? '' : item.status == 90001 ? '#a5bbe5' : '#ff0000' }">{{
+							:style="{ color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff000' : 'white', }">{{
 									item.warnDate.substring(5, 16)
 							}}</span>
 					</div>
 				</div>
-			</vue-seamless-scroll>
+			</div>
 			<div
 				style="position: absolute;bottom: 10px;right: 10px;width:345px;text-align:right;color:rgb(7, 230, 237);font-size:14px;cursor:pointer;">
 				<span @click="goMoreWarnList">查看报警详情</span>
@@ -1052,7 +1052,7 @@ export default {
 		height: 120px;
 		width: 345px;
 		margin: auto;
-		overflow: hidden;
+		overflow-y: auto;
 
 		.item {
 			height: 40px;
diff --git a/src/components/monitoring/light.vue b/src/components/monitoring/light.vue
index aea6649..009e540 100644
--- a/src/components/monitoring/light.vue
+++ b/src/components/monitoring/light.vue
@@ -65,8 +65,7 @@
       " class="noBjxx">
         暂无安全报警信息
       </div>
-      <vue-seamless-scroll v-else :class-option="classOption"
-        :data="activeTab == 1 ? listData.warnEquipList : listData.warnEventList" class="warp">
+      <div v-else class="warp">
         <div class="item flex-center" v-for="(item, index) in listData.warnEquipList" :key="index" v-if="activeTab == 1"
           style="position: relative" @mouseenter="showAlarkAlert(item, index, 0)"
           @mouseleave="closeAlarkAlert(item, index, 0)">
@@ -83,34 +82,19 @@
           </div>
           <div class="box flex-center" style="justify-content: space-around" :class="bimModel == 2 ? 'tataicon' : ''">
             <div class="left flex-center-center">
-              <img class="icon" src="../../../public/img/monitoring/electricity/lx.png" v-if="item.status == '90001'" />
+              <img class="icon" src="../../../public/img/monitoring/electricity/lx.png" v-if="item.status == '2'" />
               <img class="icon" src="../../../public/img/monitoring/electricity/bj.png" v-else />
               <span class="message" v-text="item.name" :style="{
-                color:
-                  item.status == 90000
-                    ? 'white'
-                    : item.status == 90001
-                      ? '#a5bbe5'
-                      : '#ff0000',
+                color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff0000' : 'white',
               }" :title="item.name"></span>
             </div>
             <span></span>
             <span class="data" :style="{
-              color:
-                item.status == 90000
-                  ? 'white'
-                  : item.status == 90001
-                    ? '#a5bbe5'
-                    : '#ff0000',
+              color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff0000' : 'white',
             }" :title="item.warnContent">{{ item.warnContent }}</span>
             <span class=""></span>
             <span class="time" :style="{
-              color:
-                item.status == 90000
-                  ? ''
-                  : item.status == 90001
-                    ? '#a5bbe5'
-                    : '#ff0000',
+              color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff0000' : 'white',
             }">{{ item.warnDate.substring(5, 16) }}</span>
           </div>
         </div>
@@ -130,47 +114,23 @@
           </div>
           <div class="box flex-center">
             <div class="left flex-center-center">
-              <img class="icon" src="../../../public/img/monitoring/electricity/lx.png" v-if="item.status == 90001" />
+              <img class="icon" src="../../../public/img/monitoring/electricity/lx.png" v-if="item.status == 2" />
               <img class="icon" src="../../../public/img/monitoring/electricity/bj.png" v-else />
               <span class="message" v-text="item.name" :title="item.name" :style="{
-                color:
-                  item.status == 90000
-                    ? 'white'
-                    : item.status == 90001
-                      ? '#a5bbe5'
-                      : '#ff0000',
+                color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff0000' : 'white',
               }"></span>
             </div>
             <span class="data" title="item.warnContent" :style="{
-              color:
-                item.status == 90000
-                  ? 'white'
-                  : item.status == 90001
-                    ? '#a5bbe5'
-                    : '#ff0000',
+              color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff0000' : 'white',
             }">{{ item.warnContent }}</span>
             <span class=""></span>
             <span class="time" :style="{
-              color:
-                item.status == 90000
-                  ? 'white'
-                  : item.status == 90001
-                    ? '#a5bbe5'
-                    : '#ff0000',
+              color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff0000' : 'white',
             }">{{ item.warnDate.substring(5, 16) }}</span>
           </div>
         </div>
-      </vue-seamless-scroll>
-      <div style="
-          position: absolute;
-          bottom: 10px;
-          right: 10px;
-          width: 345px;
-          text-align: right;
-          color: rgb(7, 230, 237);
-          font-size: 14px;
-          cursor: pointer;
-        ">
+      </div>
+      <div style=" position: absolute; bottom: 10px; right: 10px; width: 345px; text-align: right; color: rgb(7, 230, 237); font-size: 14px;cursor: pointer;">
         <span @click="goMoreWarnList">查看报警详情</span>
       </div>
     </div>
@@ -1109,7 +1069,7 @@ export default {
     height: 120px;
     width: 345px;
     margin: auto;
-    overflow: hidden;
+    overflow-y: auto;
 
     .item {
       height: 40px;
diff --git a/src/components/monitoring/monitoring.vue b/src/components/monitoring/monitoring.vue
index 57219a2..efc9009 100644
--- a/src/components/monitoring/monitoring.vue
+++ b/src/components/monitoring/monitoring.vue
@@ -58,7 +58,7 @@
         " class="noBjxx">
           暂无设备告警信息
         </div>
-        <vue-seamless-scroll v-else :class-option="classOption" :data="listData.warnEquipList" class="warp">
+        <div v-else class="warp">
           <div class="item flex-center" v-for="(item, index) in listData.warnEquipList" :key="index"
             @mouseenter="showAlarmAlert(item, index)" style="position: relative"
             @mouseleave="closeAlarmAlert(item, index)">
@@ -75,21 +75,21 @@
             </div>
             <div class="box flex-center" :class="bimModel == 2 ? 'tataicon' : ''">
               <div class="left flex-center-center">
-                <img class="icon" src="../../../public/img/monitoring/electricity/lx.png" v-if="item.status == 90001" />
+                <img class="icon" src="../../../public/img/monitoring/electricity/lx.png" v-if="item.warnStatus == 2" />
                 <img class="icon" src="../../../public/img/monitoring/electricity/bj.png" v-else />
-                <span class="message" :style="{ color: item.status == 90001 ? '#9D9D9D' : 'red' }"
+                <span class="message" :style="{ color:  item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff000' : 'white', }"
                   v-text="item.name"></span>
               </div>
               <span class=""></span>
-              <span class="data" :style="{ color: item.status == 90001 ? '#9D9D9D' : 'red' }">{{ item.warnContent
+              <span class="data" :style="{ color:  item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff000' : 'white', }">{{ item.warnContent
               }}</span>
               <span class=""></span>
-              <span class="time" :style="{ color: item.status == 90001 ? '#9D9D9D' : 'red' }">{{
+              <span class="time" :style="{ color:  item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff000' : 'white', }">{{
                   item.warnDate.substring(5, 16)
               }}</span>
             </div>
           </div>
-        </vue-seamless-scroll>
+        </div>
         <div style="
             position: absolute;
             bottom: 10px;
@@ -2151,7 +2151,7 @@ export default {
       height: 120px;
       width: 345px;
       margin: auto;
-      overflow: hidden;
+      overflow-y: auto;
 
       .item {
         height: 40px;
diff --git a/src/components/monitoring/wall.vue b/src/components/monitoring/wall.vue
index 9353e35..1a61810 100644
--- a/src/components/monitoring/wall.vue
+++ b/src/components/monitoring/wall.vue
@@ -73,8 +73,7 @@
       " class="noBjxx">
         暂无告警事件信息
       </div>
-      <vue-seamless-scroll v-else :class-option="classOption"
-        :data="activeTab == 1 ? listData.warnEquipList : listData.warnEventList" class="warp">
+      <div v-else class="warp">
         <div @click="bjClick(item)" class="item flex-center" @mouseenter="showAlarkAlert(item, index, 0)"
           style="position: relative" @mouseleave="closeAlarkAlert(item, index, 0)"
           v-for="(item, index) in listData.warnEquipList" :key="index" v-if="activeTab == 1">
@@ -92,36 +91,21 @@
           <div class="box flex-center">
             <div class="left flex-center-center">
               <img class="icon" :src="
-                require(item.status == 90001
+                require(item.warnStatus == 2
                   ? '../../../public/img/monitoring/electricity/lx.png'
                   : '../../../public/img/monitoring/electricity/bj.png')
               " />
               <span class="message" v-text="item.name" :title="item.name" :style="{
-                color:
-                  item.status == 90000
-                    ? ''
-                    : item.status == 90001
-                      ? '#a5bbe5'
-                      : '#ff0000',
+                color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff000' : 'white',
               }"></span>
             </div>
             <span class=""></span>
             <span class="data" :title="item.warnContent" :style="{
-              color:
-                item.status == 90000
-                  ? ''
-                  : item.status == 90001
-                    ? '#a5bbe5'
-                    : '#ff0000',
+              color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff000' : 'white',
             }">{{ item.warnContent }}</span>
             <span class=""></span>
             <span class="time" :style="{
-              color:
-                item.status == 90000
-                  ? ''
-                  : item.status == 90001
-                    ? '#a5bbe5'
-                    : '#ff0000',
+              color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff000' : 'white',
             }">{{ item.warnDate.substring(5, 16) }}</span>
           </div>
         </div>
@@ -142,40 +126,25 @@
           <div class="box flex-center" :class="bimModel == 2 ? 'tataicon' : ''">
             <div class="left flex-center-center">
               <img class="icon" :src="
-                require(item.status == 90001
+                require(item.warnStatus == 2
                   ? '../../../public/img/monitoring/electricity/lx.png'
                   : '../../../public/img/monitoring/electricity/bj.png')
               " />
               <span class="message" v-text="item.name" :title="item.name" :style="{
-                color:
-                  item.status == 90000
-                    ? ''
-                    : item.status == 90001
-                      ? '#a5bbe5'
-                      : '#ff0000',
+                color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff000' : 'white',
               }"></span>
             </div>
             <span class=""></span>
             <span class="data" :title="item.warnContent" :style="{
-              color:
-                item.status == 90000
-                  ? ''
-                  : item.status == 90001
-                    ? '#a5bbe5'
-                    : '#ff0000',
+              color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff000' : 'white',
             }">{{ item.warnContent }}</span>
             <span class=""></span>
             <span class="time" :style="{
-              color:
-                item.status == 90000
-                  ? ''
-                  : item.status == 90001
-                    ? '#a5bbe5'
-                    : '#ff0000',
+              color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff000' : 'white',
             }">{{ item.warnDate.substring(5, 16) }}</span>
           </div>
         </div>
-      </vue-seamless-scroll>
+      </div>
       <div style="
           position: absolute;
           bottom: 10px;
@@ -1429,7 +1398,7 @@ export default {
     height: 160px;
     width: 345px;
     margin: auto;
-    overflow: hidden;
+    overflow-y: auto;
 
     .alark-alert {
       position: absolute;
diff --git a/src/components/monitoring/warm.vue b/src/components/monitoring/warm.vue
index cb569b4..fd51b1e 100644
--- a/src/components/monitoring/warm.vue
+++ b/src/components/monitoring/warm.vue
@@ -180,8 +180,7 @@
       " class="noBjxx">
         暂无告警事件信息
       </div>
-      <vue-seamless-scroll v-else :class-option="classOption"
-        :data="activeTab == 1 ? listData.warnEquipList : listData.warnEventList" class="warp">
+      <div v-else class="warp">
         <div class="item flex-center" @mouseenter="showAlarkAlert(item, index, 0)" style="position: relative"
           @mouseleave="closeAlarkAlert(item, index, 0)" v-for="(item, index) in listData.warnEquipList" :key="index"
           v-if="activeTab == 1">
@@ -198,32 +197,17 @@
           </div>
           <div class="box flex-center" style="color: red">
             <div class="left flex-center-center">
-              <img class="icon" src="../../../public/img/monitoring/electricity/lx.png" v-if="item.status == 90001" />
+              <img class="icon" src="../../../public/img/monitoring/electricity/lx.png" v-if="item.warnStatus == 2" />
               <img class="icon" src="../../../public/img/monitoring/electricity/bj.png" v-else />
               <span class="message" v-text="item.name" :style="{
-                color:
-                  item.status == 90000
-                    ? 'white'
-                    : item.status == 90001
-                      ? '#a5bbe5'
-                      : '#ff0000',
+                color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff000' : 'white',
               }"></span>
             </div>
             <span class="data" :style="{
-              color:
-                item.status == 90000
-                  ? 'white'
-                  : item.status == 90001
-                    ? '#a5bbe5'
-                    : '#ff0000',
+              color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff000' : 'white',
             }">{{ item.warnContent }}</span>
             <span class="time" :style="{
-              color:
-                item.status == 90000
-                  ? 'white'
-                  : item.status == 90001
-                    ? '#a5bbe5'
-                    : '#ff0000',
+              color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff000' : 'white',
             }">{{ item.warnDate.substring(5, 16) }}</span>
           </div>
         </div>
@@ -243,35 +227,21 @@
           </div>
           <div class="box flex-center" style="color: red">
             <div class="left flex-center-center">
-              <img class="icon" src="../../../public/img/monitoring/electricity/bj.png" />
+              <img class="icon" src="../../../public/img/monitoring/electricity/lx.png" v-if="item.warnStatus == 2" />
+              <img class="icon" src="../../../public/img/monitoring/electricity/bj.png" v-else />
               <span class="message" v-text="item.name" :style="{
-                color:
-                  item.status == 90000
-                    ? 'white'
-                    : item.status == 90001
-                      ? '#a5bbe5'
-                      : '#ff0000',
+                color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff000' : 'white',
               }"></span>
             </div>
             <span class="data" :style="{
-              color:
-                item.status == 90000
-                  ? 'white'
-                  : item.status == 90001
-                    ? '#a5bbe5'
-                    : '#ff0000',
+              color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff000' : 'white',
             }">{{ item.warnContent }}</span>
             <span class="time" :style="{
-              color:
-                item.status == 90000
-                  ? 'white'
-                  : item.status == 90001
-                    ? '#a5bbe5'
-                    : '#ff0000',
+              color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff000' : 'white',
             }">{{ item.warnDate.substring(5, 16) }}</span>
           </div>
         </div>
-      </vue-seamless-scroll>
+      </div>
       <div style="
             position: absolute;
             bottom: 10px;
@@ -431,7 +401,7 @@ export default {
         fivthBuilding: [0, 0, 0, 0, 0, 0],
         sixthBuilding: [0, 0, 0, 0, 0, 0],
       }, //历史用热统计
-      type: 2, //日/月
+      type: 1, //日/月
       value1: [], //选择日期
       tower: null,
       layer: null,
@@ -1530,7 +1500,7 @@ export default {
       height: 120px;
       width: 345px;
       margin: auto;
-      overflow: hidden;
+      overflow-y: auto;
 
       .item {
         height: 40px;
diff --git a/src/components/monitoring/water.vue b/src/components/monitoring/water.vue
index 574b908..4d95df2 100644
--- a/src/components/monitoring/water.vue
+++ b/src/components/monitoring/water.vue
@@ -177,8 +177,7 @@
       " class="noBjxx">
         暂无告警事件信息
       </div>
-      <vue-seamless-scroll v-else :class-option="classOption"
-        :data="activeTab == 1 ? listData.warnEquipList : listData.warnEventList" class="warp">
+      <div v-else class="warp">
         <div v-if="activeTab == 1" class="item flex-center" v-for="(item, index) in listData.warnEquipList"
           :key="'warnEquip_' + index" @mouseenter="showAlarkAlert(item, index, 0)" style="position: relative"
           @mouseleave="closeAlarkAlert(item, index, 0)">
@@ -195,14 +194,14 @@
           </div>
           <div class="box flex-center" :class="bimModel == 2 ? 'tataicon' : ''">
             <div class="left flex-center-center">
-              <img class="icon" src="../../../public/img/monitoring/electricity/lx.png" v-if="item.status == 90001" />
+              <img class="icon" src="../../../public/img/monitoring/electricity/lx.png" v-if="item.warnStatus == 2" />
               <img class="icon" src="../../../public/img/monitoring/electricity/bj.png" v-else />
-              <span class="message" :style="{ color: item.status == 90001 ? '#9D9D9D' : 'red' }"
+              <span class="message" :style="{ color:  item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff000' : 'white', }"
                 v-text="item.name"></span>
             </div>
-            <span class="data" :style="{ color: item.status == 90001 ? '#9D9D9D' : 'red' }">{{ item.warnContent
+            <span class="data" :style="{ color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff000' : 'white', }">{{ item.warnContent
             }}</span>
-            <span class="time" :style="{ color: item.status == 90001 ? '#9D9D9D' : 'red' }">{{
+            <span class="time" :style="{ color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff000' : 'white', }">{{
                 item.warnDate.substring(5, 16)
             }}</span>
           </div>
@@ -223,19 +222,19 @@
           </div>
           <div class="box flex-center">
             <div class="left flex-center-center">
-              <img class="icon" src="../../../public/img/monitoring/electricity/lx.png" v-if="item.status == 90001" />
+              <img class="icon" src="../../../public/img/monitoring/electricity/lx.png" v-if="item.warnStatus == 2" />
               <img class="icon" src="../../../public/img/monitoring/electricity/bj.png" v-else />
               <span class="message" v-text="item.name"
-                :style="{ color: item.status == 90001 ? '#9D9D9D' : 'red' }"></span>
+                :style="{ color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff000' : 'white', }"></span>
             </div>
-            <span class="data" :style="{ color: item.status == 90001 ? '#9D9D9D' : 'red' }">{{ item.warnContent
+            <span class="data" :style="{ color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff000' : 'white', }">{{ item.warnContent
             }}</span>
-            <span class="time" :style="{ color: item.status == 90001 ? '#9D9D9D' : 'red' }">{{
+            <span class="time" :style="{ color: item.warnStatus == 2 ? 'white' : item.warnStatus == 1 ? '#ff000' : 'white', }">{{
                 item.warnDate.substring(5, 16)
             }}</span>
           </div>
         </div>
-      </vue-seamless-scroll>
+      </div>
       <div style="
           position: absolute;
           bottom: 10px;
@@ -1556,7 +1555,7 @@ export default {
       height: 120px;
       width: 345px;
       margin: auto;
-      overflow: hidden;
+      overflow-y: auto;
 
       .item {
         height: 40px;