tj

src/pages/alarms/processed/index.vue

@@ -16,7 +16,7 @@
                             el-col(:span="8")
                                 div(style="color:#409EFF;font-size:18px;font-weight:400;font-family:Microsoft YaHei;")  {{item.threeCount}}
                                 div(style="font-size:12px;color:#656565;font-family:Microsoft YaHei;font-weight:400;") 一般
-            div.left_aside(style="height:auto;margin-bottom:0px;")
+            div.left_aside(style="height:auto;margin:40px 0;")
                 el-header.left_header 等级分布
                 div(id="myCharts" style="height:232px;background:#ffffff")
                     //ve-pie.untreated_canvas(:data="chartData" :extend="chartExtend" legend-position="bottom" width="260px"  height="350px"  )
@@ -24,8 +24,8 @@
             el-tabs(v-model="activeName" type="border-card" @tab-click="handleClick")
                 el-tab-pane(label="全部" name="0")
                     query-list(v-if="activeName == 0" ref="queryList")
-                el-tab-pane(label="视频监控系统" name="438c30d3d7f241b573f22a1a36c60485")
-                    query-list(v-if="activeName == '438c30d3d7f241b573f22a1a36c60485'" ref="queryList")
+                //- el-tab-pane(label="视频监控系统" name="438c30d3d7f241b573f22a1a36c60485")
+                //-     query-list(v-if="activeName == '438c30d3d7f241b573f22a1a36c60485'" ref="queryList")
                 el-tab-pane(label="出入口控制系统" name="ed401f7d9291b508d411d8192b016c6e")
                     query-list(v-if="activeName == 'ed401f7d9291b508d411d8192b016c6e'" ref="queryList")
                 el-tab-pane(label="入侵报警系统" name="75c7c11716713edfd2ce3581f5e7c193")
@@ -119,7 +119,7 @@
                 }).then(data => {
                     this.leftLoading = false
                     if (data && data.code === 0) {
-                        const list = data.list.filter(item => item.systemName != '安全检查及探测系统')
+                        const list = data.list.filter(item => !['安全检查及探测系统','视频监控系统'].includes(item.systemName))
                         this.eventList = list
                         let oneCount, twoCount, threeCount
                         oneCount = twoCount = threeCount = 0
@@ -191,9 +191,9 @@
     }
 
     .left_col_header {
+        height: 40px;
+        line-height: 40px;
         background-color: #E1EDF4;
-        height: 30px;
-        line-height: 30px;
         color: #000000;
         text-align: center;
         font-size:15px;
@@ -202,10 +202,10 @@
     }
 
     .row_style {
+        height: 80px;
+        padding: 20px 0;
         line-height: 24px;
         text-align: center;
-        /*height:60px;*/
-        /*padding:3px;*/
     }
 
     .alarms-untreated-main > .el-tabs {

src/pages/alarms/untreated/index.vue

@@ -16,7 +16,7 @@
                             el-col(:span="8")
                                 div(style="color:#409EFF;font-size:18px;font-weight:400;font-family:Microsoft YaHei;")  {{item.threeCount}}
                                 div(style="font-size:12px;color:#656565;font-family:Microsoft YaHei;font-weight:400;") 一般
-            div.left_aside(style="height:auto;margin-bottom:0px;")
+            div.left_aside(style="height:auto;margin:40px 0;")
                 el-header.left_header 等级分布
                 div(id="myCharts" style="height:232px;background:#ffffff")
                     //ve-pie.untreated_canvas(:data="chartData" :extend="chartExtend" legend-position="bottom" width="260px"  height="350px"  )
@@ -24,8 +24,8 @@
             el-tabs(v-model="activeName" type="border-card" @tab-click="handleClick")
                 el-tab-pane(label="全部" name="0")
                     query-list(v-if="activeName == 0" ref="queryList")
-                el-tab-pane(label="视频监控系统" name="438c30d3d7f241b573f22a1a36c60485")
-                    query-list(v-if="activeName == '438c30d3d7f241b573f22a1a36c60485'" ref="queryList")
+                //- el-tab-pane(label="视频监控系统" name="438c30d3d7f241b573f22a1a36c60485")
+                //-     query-list(v-if="activeName == '438c30d3d7f241b573f22a1a36c60485'" ref="queryList")
                 el-tab-pane(label="出入口控制系统" name="ed401f7d9291b508d411d8192b016c6e")
                     query-list(v-if="activeName == 'ed401f7d9291b508d411d8192b016c6e'" ref="queryList")
                 el-tab-pane(label="入侵报警系统" name="75c7c11716713edfd2ce3581f5e7c193")
@@ -119,7 +119,7 @@
                 }).then(data => {
                     this.leftLoading = false
                     if (data && data.code === 0) {
-                        const list = data.list.filter(item => item.systemName != '安全检查及探测系统')
+                        const list = data.list.filter(item => !['安全检查及探测系统','视频监控系统'].includes(item.systemName))
                         this.eventList = list
                         let oneCount, twoCount, threeCount
                         oneCount = twoCount = threeCount = 0
@@ -191,9 +191,9 @@
     }
 
     .left_col_header {
+        height: 40px;
+        line-height: 40px;
         background-color: #E1EDF4;
-        height: 30px;
-        line-height: 30px;
         color: #000000;
         text-align: center;
         font-size:15px;
@@ -202,10 +202,10 @@
     }
 
     .row_style {
+        height: 80px;
+        padding: 20px 0;
         line-height: 24px;
         text-align: center;
-        /*height:60px;*/
-        /*padding:3px;*/
     }
 
     .alarms-untreated-main > .el-tabs {

src/pages/routes/alarms/processed/index.vue

@@ -16,7 +16,7 @@
                             el-col(:span="8")
                                 div(style="color:#409EFF;font-size:18px;font-weight:400;font-family:Microsoft YaHei;")  {{item.threeCount}}
                                 div(style="font-size:12px;color:#656565;font-family:Microsoft YaHei;font-weight:400;") 一般
-            div.left_aside(style="height:auto;margin-bottom:0px;")
+            div.left_aside(style="height:auto;margin:40px 0;")
                 el-header.left_header 等级分布
                 div(id="myCharts" style="height:232px;background:#ffffff")
                     //ve-pie.untreated_canvas(:data="chartData" :extend="chartExtend" legend-position="bottom" width="260px"  height="350px"  )
@@ -24,8 +24,8 @@
             el-tabs(v-model="activeName" type="border-card" @tab-click="handleClick")
                 el-tab-pane(label="全部" name="0")
                     query-list(v-if="activeName == 0" ref="queryList")
-                el-tab-pane(label="视频监控系统" name="438c30d3d7f241b573f22a1a36c60485")
-                    query-list(v-if="activeName == '438c30d3d7f241b573f22a1a36c60485'" ref="queryList")
+                //- el-tab-pane(label="视频监控系统" name="438c30d3d7f241b573f22a1a36c60485")
+                //-     query-list(v-if="activeName == '438c30d3d7f241b573f22a1a36c60485'" ref="queryList")
                 el-tab-pane(label="出入口控制系统" name="ed401f7d9291b508d411d8192b016c6e")
                     query-list(v-if="activeName == 'ed401f7d9291b508d411d8192b016c6e'" ref="queryList")
                 el-tab-pane(label="入侵报警系统" name="75c7c11716713edfd2ce3581f5e7c193")
@@ -114,7 +114,7 @@
                 }).then(data => {
                     this.leftLoading = false
                     if (data && data.code === 0) {
-                        const list = data.list.filter(item => item.systemName != '安全检查及探测系统')
+                        const list = data.list.filter(item => !['安全检查及探测系统','视频监控系统'].includes(item.systemName))
                         this.eventList = list
                         let oneCount, twoCount, threeCount
                         oneCount = twoCount = threeCount = 0
@@ -186,9 +186,9 @@
     }
 
     .left_col_header {
+        height: 40px;
+        line-height: 40px;
         background-color: #E1EDF4;
-        height: 30px;
-        line-height: 30px;
         color: #000000;
         text-align: center;
         font-size:15px;
@@ -197,10 +197,10 @@
     }
 
     .row_style {
+        height: 80px;
+        padding: 20px 0;
         line-height: 24px;
         text-align: center;
-        /*height:60px;*/
-        /*padding:3px;*/
     }
 
     .alarms-untreated-main > .el-tabs {

src/pages/routes/alarms/untreated/index.vue

@@ -16,7 +16,7 @@
                             el-col(:span="8")
                                 div(style="color:#409EFF;font-size:18px;font-weight:400;font-family:Microsoft YaHei;")  {{item.threeCount}}
                                 div(style="font-size:12px;color:#656565;font-family:Microsoft YaHei;font-weight:400;") 一般
-            div.left_aside(style="height:auto;margin-bottom:0px;")
+            div.left_aside(style="height:auto;margin:40px 0;")
                 el-header.left_header 等级分布
                 div(id="myCharts" style="height:232px;background:#ffffff")
                     //ve-pie.untreated_canvas(:data="chartData" :extend="chartExtend" legend-position="bottom" width="260px"  height="350px"  )
@@ -24,8 +24,8 @@
             el-tabs(v-model="activeName" type="border-card" @tab-click="handleClick")
                 el-tab-pane(label="全部" name="0")
                     query-list(v-if="activeName == 0" ref="queryList")
-                el-tab-pane(label="视频监控系统" name="438c30d3d7f241b573f22a1a36c60485")
-                    query-list(v-if="activeName == '438c30d3d7f241b573f22a1a36c60485'" ref="queryList")
+                //- el-tab-pane(label="视频监控系统" name="438c30d3d7f241b573f22a1a36c60485")
+                //-     query-list(v-if="activeName == '438c30d3d7f241b573f22a1a36c60485'" ref="queryList")
                 el-tab-pane(label="出入口控制系统" name="ed401f7d9291b508d411d8192b016c6e")
                     query-list(v-if="activeName == 'ed401f7d9291b508d411d8192b016c6e'" ref="queryList")
                 el-tab-pane(label="入侵报警系统" name="75c7c11716713edfd2ce3581f5e7c193")
@@ -114,7 +114,7 @@
                 }).then(data => {
                     this.leftLoading = false
                     if (data && data.code === 0) {
-                        const list = data.list.filter(item => item.systemName != '安全检查及探测系统')
+                        const list = data.list.filter(item => !['安全检查及探测系统','视频监控系统'].includes(item.systemName))
                         this.eventList = list
                         let oneCount, twoCount, threeCount
                         oneCount = twoCount = threeCount = 0
@@ -186,9 +186,9 @@
     }
 
     .left_col_header {
+        height: 40px;
+        line-height: 40px;
         background-color: #E1EDF4;
-        height: 30px;
-        line-height: 30px;
         color: #000000;
         text-align: center;
         font-size:15px;
@@ -197,10 +197,10 @@
     }
 
     .row_style {
+        height: 80px;
+        padding: 20px 0;
         line-height: 24px;
         text-align: center;
-        /*height:60px;*/
-        /*padding:3px;*/
     }
 
     .alarms-untreated-main > .el-tabs {

src/pages/routes/analysis/alarmAnalysis/index.vue

@@ -32,10 +32,10 @@ el-container(style="padding:0px;" :style="{height:currentHeight+40+'px'}")
                 font.font_str  总报警数量
                 font.font_str  已处理的报警
                 font.font_str  未处理的报警
-            div.div_flex(style="text-align:center;height: 50%;")
-              div.div_width
-                font.font_num_bottom {{dayalarmData[1].video || 0}}
-                font.font_str_bottom 视频监控报警数
+            div.div_flex(style="text-align:center;width:100%")
+              //- div.div_width
+              //-   font.font_num_bottom {{dayalarmData[1].video || 0}}
+              //-   font.font_str_bottom 视频监控报警数
               //- div.div_width
               //-   font.font_num_bottom {{dayalarmData[1].safety || 0}}
               //-   font.font_str_bottom 安全检查报警数
@@ -424,7 +424,7 @@ export default {
         }
       }).then((data) => {
         if (data && data.code === 0) {
-          this.subSystemAlarmData.itemData = data.result.filter(i=>{return i.name!='安全检查'})
+          this.subSystemAlarmData.itemData = data.result.filter(i=>{return !['安全检查','视频监控'].includes(i.name)})
           this.subSystemAlarmData.legendData = data.result.map((item) => {
             return item.name
           })