Merge branch 'master' of http://git.xt.wenhq.top:8083/wenhongquan/qdtlui

# Conflicts:
#	src/views/governance/index.vue

src/views/bigscreen/index.vue

@@ -45,7 +45,7 @@ export default {
               params:'{"httpMethod":"POST","path":"/api/resource/v1/cameras","headers":{},"query":{},"parameter":{},"body":{"pageNo": 1,"pageSize": 5000,"treeCode": "0"},"contentType":"application/json;charset=UTF-8","mock":false,"appKey":"27794545","appSecret":"5Xi27Gl7JrbHHF1MpdaB"}'
             },
             staticCount:0,
-            dynamicCount:0,
+            dynamicCount:2,
             areaCount:0
         };
     },
@@ -76,7 +76,7 @@ export default {
          getResource(){
                getResource({date:'2022-03-12'}).then(response =>{
                      console.log(response.data);
-                
+
                      var trainArry = [];
                      var bridgeArry = [];
                      var railArry = [];
@@ -131,7 +131,7 @@ export default {
                        this.$refs.mapdiv.addPoints(stationLocation,'location.png',0.6,'location');
                        this.areaCount += response.data.area.length
                        this.staticCount += response.data.drone.length + stationLocation.length;
-                      //  this.dynamicCount +=  response.data.deviceTrail.length 
+                      //  this.dynamicCount +=  response.data.deviceTrail.length
                        this.dynamicCount +=  Object.getOwnPropertyNames(response.data.deviceTrail).length
                })
          },

src/views/governance/index.vue

@@ -139,7 +139,7 @@ export default {
               lcChartData:{},
               videoChartDate:{},
               staticCount:0,
-              dynamicCount:0,
+              dynamicCount:2,
               areaCount:0,
               menuNameNew:'更多监测'
         };

src/views/public/index.vue

@@ -19,7 +19,7 @@
                         <div class="wordClass"style="float:left;margin-left:9.5rem">发文数量</div>
                 </div>
                 </div>
-                 
+
                 <div>
                 <div class="publicTitle" style="margin-top:2.5rem">
                         <img src="../../assets/images/icon.png" style="width:1.8rem;height:1.8rem;margin-top:0.3rem"/>
@@ -73,7 +73,7 @@
         </div>
 
         <div id='tsChart' style="width:45rem;height:25rem"></div>
-        
+
          <div class="publicTitle" style="margin-top:1.5rem">
            <img src="../../assets/images/icon.png" style="width:1.8rem;height:1.8rem;margin-top:0.3rem"/>
            <div style="font-size:1.6rem;font-family: Adobe Heiti Std;font-weight: normal;color: #DFEEF3;margin-left:0.5rem">本月统计趋势数据</div>
@@ -129,7 +129,7 @@ export default {
                   {content:'关于某某站点施工通知',label:'待处理',tag:'家'},
               ],
               staticCount:0,
-              dynamicCount:0,
+              dynamicCount:2,
               areaCount:0
         };
     },

src/views/safe/index.vue

@@ -152,7 +152,7 @@ export default {
                 params:'{"httpMethod":"POST","path":"/api/resource/v1/cameras","headers":{},"query":{},"parameter":{},"body":{"pageNo": 1,"pageSize": 5000,"treeCode": "0"},"contentType":"application/json;charset=UTF-8","mock":false,"appKey":"27794545","appSecret":"5Xi27Gl7JrbHHF1MpdaB"}'
               },
               staticCount:0,
-              dynamicCount:0,
+              dynamicCount:2,
               areaCount:0
         };
     },