Merge remote-tracking branch 'origin/pet' into pet

src/views/map/components/qixiang.vue

@@ -150,7 +150,7 @@ export default {
     // 定时器
     start() {
       console.log('定时器开启')
-      this.timer = setInterval(this.getMeteorologicalinfo, 10000) // 注意: 第一个参数为方法名的时候不要加括号;
+      this.timer = setInterval(this.getMeteorologicalinfo, 90000) // 注意: 第一个参数为方法名的时候不要加括号;
     },
     over() {
       clearInterval(this.timer)

src/views/map/dialog/index.vue

@@ -274,6 +274,7 @@ export default {
   }
   .app-container {
     padding: 0px;
+    width: 100%;
   }
 }
 </style>

src/views/map/dialog/mkGateMachine.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container print-work">
+  <div class="app-container print-work" style="width: 100%">
     <div v-if= "type !== 'CAMERA'" class="level-title">
       <h1>区域名称：{{ info.GATE_AREA_NAME }}</h1>
     </div>

src/views/map/dialog/video_play_bianjieruqin.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="width: 100%">
     <div class="level-title">
       <h1>摄像头名称：{{ info.NAME }}</h1>
     </div>

src/views/map/dialog/video_play_plat.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="width: 100%">
     <div class="level-title">
       <h1>摄像头名称：{{ info.NAME }}</h1>
     </div>

src/views/map/index.vue

@@ -1401,7 +1401,7 @@ export default {
       // eslint-disable-next-line no-unused-vars
       var _this = this
       const collection = new Cesium.CustomDataSource('clickEntityCollection')
-
+      debugger
       poin.forEach(item => {
         if (!this.poinEntity.hasOwnProperty(item.id)) {
           const entity = drag.addEntity(item)