Merge branch 'master' of http://192.168.124.50:80/wuhongjian/qd-changjing

src/views/pages/area/components/ImportantAreaPopNew.vue

@@ -133,7 +133,10 @@
         </el-tree>
       </div>
       <div class="site-content-right">
-        右
+        <div><span>视频监控</span></div>
+         <video-play
+                :key="channelCode" :channel-id="[channelCode]"
+              ></video-play>
       </div>
       </div>
       <div class="site-content-people" v-show="selectedIndex == 2">
@@ -241,6 +244,7 @@
   </div>
 </template>
 <script>
+import VideoPlay from './VideoPlay'
 import bus from "@/views/layout/bus";
 import 'viewerjs/dist/viewer.css'
 import { directive as viewer } from "v-viewer"
@@ -286,13 +290,6 @@ export default {
           channelCode: returnData[0].channelCode
         })
       }
-    })
-      getCameraAllLabel().then((res) => {
-      this.tabList = res.data.data
-    });
-    getCameraAll().then((res) => {
-      this.cameraAllData = res.data
-      // this.addResourceTomap('cameraAll',res.data);
     })
        getCameraAllOrgan({parentId:'S4NbecfYB1DBH8HNULGS34'}).then((res) => {
       this.cameraTree = res.data.data
@@ -343,11 +340,12 @@ export default {
       selectedFacilitiesType:"",//设施类型
       facilitiesTypeOption:[{label:"设施类型",value:"1"}],
       facilitiesDataResource:[{facilitiesType:"设施类型1",address:"李沧",manageMan:"张山",telePhone:"1334650987"}],
-       cameraAllData:[],
       cameraTreeIsShow:true,
       cameraTreeSingle: [],
       checkStatus: '2',
       cameraTree:[],
+      channelCode:"3701222749350945",
+      
     };
   },
   methods: {

src/views/pages/areaMonitor/components/EarlyWarning.vue

@@ -232,7 +232,7 @@ export default {
         selectByAreaEvent(params).then((res) => {
             this.eventListData = res.data.data.events;
             this.total = res.data.data.sum;
-            this.$parent.allListDataNum = res.data.data.sum;
+            // this.$parent.allListDataNum = res.data.data.sum;
         });
     },
     beforeCreate() {}, //生命周期 - 创建之前

src/views/pages/areaMonitor/index.vue

@@ -8,7 +8,7 @@
       </div>
 
       <header>
-        <div class="title">重点区域监控平台</div>
+        <div class="title">重点区域精细化管理</div>
         <div></div>
       </header>
 
@@ -36,13 +36,13 @@
         </el-autocomplete>
       </div>
 
-      <div class="eventNum">
+      <!-- <div class="eventNum">
         累计事件数量(2022.05.25-至今)
         <p>
           <span>{{ allListDataNum }}</span
           >件
         </p>
-      </div>
+      </div> -->
 
       <!-- 事件感知 -->
       <div class="complaintContent">
@@ -75,10 +75,10 @@
       </div>
  
       <!-- 热力图图例 -->
-      <div class="legend"></div>
+      <!-- <div class="legend"></div> -->
       
       <!-- 时间轴 -->
-      <div class="timerShaft">
+      <!-- <div class="timerShaft">
         <HorizonTimeLine
           :timelineData="timelineData"
           @timeId="timeIdData"
@@ -86,7 +86,7 @@
           @hotName="hotName"
         />
         <span>时</span>
-      </div>
+      </div> -->
       <div class="changeLayer">
         <div class="title">地图显示</div>
         <div class="change-btn-box">
@@ -126,6 +126,7 @@
             <el-radio label="all">全市</el-radio>
             <el-radio label="local">本地</el-radio>
             <el-radio label="noLocal">外地</el-radio>
+            <el-radio label="clear">清除热力图</el-radio>
           </el-radio-group>
         </div>
       </div>
@@ -480,6 +481,7 @@ export default {
     },
 
     layerHandleChange(item) {
+      console.log("地图显示等",item);
       if (this.changeLayerBtnGroup.indexOf(item) !== -1) {
         switch (item) {
           case "AI事件":
@@ -703,6 +705,11 @@ export default {
             "thermodynamic"
           );
           break;
+        case "clear":
+          this.hiMapFun.removeLayerByLayerName("types");
+          this.hiMapFun.removeLayerByLayerName("thermodynamic");
+          this.thermodynamicPeopleType = "";
+          break;  
       }
     },
     removeRoadCauseAnalysis() {
@@ -768,7 +775,7 @@ export default {
       font-family: 'Tensentype-ZhiHeiJ-W5';
     }
     .title::before {
-      content: '重点区域监控平台';
+      content: '重点区域精细化管理';
       text-shadow: 0px 3px 10px rgba(0,0,0,.9);
       position: absolute;
       z-index: -1;

src/views/pages/civilizedCity/components/EventListDetailsPopNew.vue

@@ -150,7 +150,7 @@ export default {
       openVideo: false,
       newImageUrl: "",
       resourceType:"resource",
-      channelCode:["3701222749350945"]
+      channelCode:"3701222749350945"
 
     };
   },