资源落点摄像头操控

src/views/resources.vue

@@ -38,8 +38,6 @@
                   v-for="(item, index) in resourcesCountList"
                   v-on:click="selectResourcesByLabel(item.type, searchName)"
                 >
-                  <!--v-on:click="selectResourcesByLabel(item.label)">-->
-                  <!--v-on:click="indentleftSetMarkers(item.resourceTable)">-->
                   <div
                     class="iconfont icon icon-normal"
                     :class="item.icon"
@@ -57,32 +55,6 @@
           </dv-border-box-13>
         </div>
       </div>
-
-      <!--<div class="leftbar" ref="left">-->
-      <!--<div class="forthis">-->
-      <!--<dv-border-box-13 backgroundColor="rgba(12, 19, 38, .90)" style="padding-bottom: 1rem;">-->
-      <!--<img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;"/>-->
-      <!--<div class="i-list-con h-80" style="padding-left: 1rem;">-->
-      <!--<el-collapse accordion>-->
-      <!--<el-collapse-item v-for="(item,index) in resourcesCountList" :key="index">-->
-      <!--<template slot="title">-->
-      <!--<div class="d-l-con sj-collapse" v-on:click="selectResourcesByLabel(item.label)">-->
-      <!--<div class="d-l-l-text">-->
-      <!--<h4 class="collapse-title">{{ item.name }}</h4>-->
-      <!--</div>-->
-      <!--<div class="d-l-l-count">{{item.value}}</div>-->
-      <!--</div>-->
-      <!--</template>-->
-      <!--</el-collapse-item>-->
-      <!--</el-collapse>-->
-      <!--<div class="i-list-con small-bottom-margin h-30">-->
-      <!--</div>-->
-      <!--</div>-->
-      <!--</dv-border-box-13>-->
-      <!--</div>-->
-      <!--</div>-->
-      <!-- 地图 -->
-      <!--      @preview="preview"-->
       <supermap
         ref="supermap"
         style="width: 100%; height: 100vh"
@@ -220,14 +192,7 @@ export default {
           console.log("icon_" + (index + 1) + "=", icon);
           that.$set(that.resourcesCountList[index], "icon", icon);
           that.$set(that.resourcesCountList[index], "bg", getIconBg(icon));
-          // alert(resourcesCountList[i])
-          // console.log("data resourcesCountList[index]=", data.type)
-          // console.log("resourcesCountList[index]=", that.resourcesCountList[index])
 
-          // if(index < 5){
-          //   // that.fireControlViewPoint(data.type, 'undefined');
-          //   that.selectResourcesByLabel(data.type, '所有');
-          // }
         });
         //数据自动落点开始
         let maxCount = 100; //落点数超过这个数的资源不落点
@@ -297,11 +262,8 @@ export default {
       that.$refs.supermap.clearM(false);
       that.$refs.supermap.clearM(true);
       selectResourcesByLabel(label, name).then((res) => {
-        console.log("res.data=", res.data);
-        // this.resourcesList = res.data;
         this.resourcesList = res.data.resourceList;
         this.initMarkers(this.resourcesList, label.split("_").slice(-1));
-        // this.initMarkers(this.resourcesList);
       });
     },
     showResourcesDialog(param) {
@@ -328,7 +290,7 @@ export default {
           id: null,
           labelCode: data.cameraList[i].cameraCode,
           labelName: data.cameraList[i].cameraName,
-          cameraType: "1",
+          cameraType: data.cameraList[i].cameraType,
           parentLabelCode: "999",
         });
         labelChannels.push({
@@ -338,7 +300,7 @@ export default {
               channelCode: data.cameraList[i].cameraCode,
               channelName: data.cameraList[i].cameraName,
               channelSn: null,
-              cameraType: "1",
+              cameraType: data.cameraList[i].cameraType,
               online: "1",
               cameraCode: "1",
             },
@@ -361,7 +323,6 @@ export default {
       }
     },
     initMarkers(list, type) {
-      console.log("list=", list);
       if (list != null && list.length > 0) {
         for (let i = 0; i < list.length; i++) {
           let markersMap = {
@@ -535,7 +496,6 @@ export default {
           this.markersList.push(markersMap);
         }
         setTimeout(() => {
-          // return
           this.$refs.supermap.clearM();
           this.$refs.supermap.setMarkers(this.markersList);
         }, 2000);