提交

src/views/home/components/CheckWarnReport.vue

@@ -52,8 +52,7 @@ export default {
         },
         load(){
             getDangerByList({
-                hdangerType:0,
-                status: 4
+                hdangerType:0
             }).then((res)=>{
                 this.total=res.data.length
                 this.items=res.data

src/views/home/components/SensorWarningInfo.vue

@@ -52,8 +52,7 @@ export default {
         },
         load(){
             getDangerByList({
-                hdangerType:1,
-                status: 4
+                hdangerType:1
             }).then((res)=>{
                 this.total=res.data.length
                 this.items=res.data

src/views/home/components/SensorWarningStatistics.vue

@@ -26,6 +26,10 @@
                 </div>
                 <div class="status">
                     <div class="status-item">
+                        <div class="name">待评审</div>
+                        <div class="number">{{ data.goafHdangerStatusToforreviewlNum }}</div>
+                    </div> 
+                    <div class="status-item">
                         <div class="name">待整改</div>
                         <div class="number">{{ data.goafHdangerStatusTorectifyNum }}</div>
                     </div>                  
@@ -35,7 +39,7 @@
                     </div>    
                     <div class="status-item">
                         <div class="name">已完成</div>
-                        <div class="number">{{ data.goafHdangerLevelSeriousNum }}</div>
+                        <div class="number">{{ data.goafHdangerStatusCompleteNum }}</div>
                     </div>    
                 </div>
             </div>

src/views/home/components/WarningStatistics.vue

@@ -26,6 +26,10 @@
                 </div>
                 <div class="status">
                     <div class="status-item">
+                        <div class="name">待评审</div>
+                        <div class="number">{{ data.goafHdangerStatusToforreviewlNum }}</div>
+                    </div> 
+                    <div class="status-item">
                         <div class="name">待整改</div>
                         <div class="number">{{ data.goafHdangerStatusTorectifyNum }}</div>
                     </div>                  

src/views/home/index.vue

@@ -169,15 +169,23 @@ import {
                                 justify-content: center;
                                 align-items: center;
                                 flex-direction: column;
-                                background: #381F23;
+                                background-size: 100% 100%;
+                                background-repeat: no-repeat;
+                                &:nth-child(1){
+                                    background-color: #381F23;
+                                    background-image: url("./images/hdanger/level_1.png");
+                                }
                                 &:nth-child(2){
-                                    background: #382B1F;
+                                    background-color: #382B1F;
+                                    background-image: url("./images/hdanger/level_2.png");
                                 }
                                 &:nth-child(3){
                                     background: #283123; 
+                                    background-image: url("./images/hdanger/level_3.png");
                                 }
                                 &:nth-child(4){
                                     background: #172841;
+                                    background-image: url("./images/hdanger/level_4.png");
                                 }                             
                             }
                         }
@@ -186,16 +194,22 @@ import {
                             justify-content: center;
                             height: 50%;
                             .status-item{
-                                width: 33.33%;
+                                width: 25%;
                                 display: flex;
                                 justify-content: center;
-                                flex-direction: column;                                
+                                flex-direction: column;  
+                                box-sizing: border-box;                              
                                 .name{
-                                    background: #EB4A2E;
+                                    background: #7cc20d;
                                     width: 100%;
                                     text-align: center;
                                     padding: 3px 0;
-                                }                                
+                                } 
+                                &:nth-child(1){
+                                    .name{
+                                        background: #409eff;
+                                    }
+                                }                               
                                 &:nth-child(2){
                                     .name{
                                         background: #F4C000;
@@ -203,7 +217,7 @@ import {
                                 }
                                 &:nth-child(3){
                                     .name{
-                                        background: #6DCA06;;
+                                        background: #b9d616;;
                                     }
                                 } 
                                 .number{
@@ -311,7 +325,7 @@ import {
         #map{
             width: 100%;
             height: 100%;
-            background-image: url(./images/home/map.png);
+            // background-image: url(./images/home/map.png);
             background-size: 100% 100%;
             background-repeat: no-repeat;
         }

src/views/particulars/sensor.vue

@@ -85,7 +85,7 @@
                                 <p>安装区域：{{ NumConvertLM(item.goafOrebelt) }}/{{ item.goafOrebody }}/{{ item.goafOreheight }}/{{ item.goafName }}</p>
                                 <p>安装位置：{{ item.goafDevLocation }}</p>
                                 <p>阈值：{{item.goafAlarmThreshold}}</p>
-                                <!-- <p>是否在线：{{item.status}}</p> -->
+                                <p>上报数据值：{{item.goafSensorValue}}</p>
                             </div>
                             <footer :class="'status-'+item.hdangerLevel">{{hdangerLevel(item.hdangerLevel)}}</footer>
                         </div>