无感监管代码提交

src/api/components/supermap.js

@@ -46,6 +46,7 @@ export const iconList = {
   'marker': require('@/assets/images/cameraType/marker.png'),
   'big-horn': require('@/assets/images/cameraType/big-horn.png'),
   'camera': require('@/assets/images/cameraType/newCamera.png'),
+  'enterprise': require('@/assets/images/cameraType/enterprise.png'),//企业图标
   'camera-not': require('@/assets/images/cameraType/camera-not.png'),
   'not-online': require('@/assets/images/cameraType/not-online.png'),
   'sensor': require('@/assets/images/cameraType/sensor.png'),

src/api/forest.js

@@ -378,7 +378,7 @@ export function eventHandling(id,eventCode) {
 }
   export function enterpriseList(param) {
     return request({
-      url: '/center-data/unobtrusive/enterprise/list',
+      url: '/center-unobtrusive/unobtrusive/enterprise/list',
       method: 'get',
       params:param
     })
@@ -386,13 +386,13 @@ export function eventHandling(id,eventCode) {
 
   export function enterpriseById(id) {
     return request({
-      url: '/center-data/unobtrusive/enterprise/'+id,
+      url: '/center-unobtrusive/unobtrusive/enterprise/'+id,
       method: 'get'
     })
   }
   export function selectRegulatoryinformationByEnterpriseId(param) {
     return request({
-      url: '/center-data/regulatoryinformation/selectRegulatoryinformationByEnterpriseId',
+      url: '/center-unobtrusive/regulatoryinformation/selectRegulatoryinformationByEnterpriseId',
       method: 'get',
       params:param
     })
@@ -400,7 +400,7 @@ export function eventHandling(id,eventCode) {
   // 获取企业详情
   export function getRegulatoryinformation(id) {
     return request({
-      url: `/center-data/regulatoryinformation/${id}`,
+      url: `/center-unobtrusive/regulatoryinformation/${id}`,
       method: 'get'
     })
   }

src/views/forest.vue

@@ -227,7 +227,7 @@
             <!-- 菜单 -->
             <div class="mainContainer">
               <!-- 列表 -->
-              <div class="listItem" v-for="(e,idx) in cameraListSearch" :key="idx" @click="dropLocation(e.latitude, e.longitude, e.cameraCode)">
+              <div class="listItem" v-for="(e,idx) in cameraListSearch" :key="idx" @click="deviceShow(e)">
                   <img class="itemPic"
                     v-bind:src="e.cameraImg == null ? require('@/assets/images/video-plaza/shiLianWangImg/no-camera.png'):e.cameraImg" >
                   <div class="itemArea" >
@@ -391,18 +391,6 @@
       this.ws = DHWsInstance;
     },
     mounted() {
-      this.$refs.deviceDialog.open([
-        {
-          key:'名称',
-          value:'测试名称'
-        },
-        {
-          key:'地址',
-          value:'测试地址'
-        },
-      ])
-      console.log('图层对象',window.webglExampleConfig)
-      console.log('媒体对象',navigator)
       // 初始化地图数据
       this.getSuperMapUrl();
       setTimeout(() => {
@@ -559,7 +547,6 @@
     methods: {
       // 获取企业信息列表
       getSelectRegulatoryinformationByEnterpriseId(pageSize, pageNum) {
-        debugger
         if (pageNum < 1) {
           this.$modal.msg('当前已是第一页')
           return
@@ -627,6 +614,9 @@
       preview(cameraParam) {
         this.showTVWall(cameraParam.code, cameraParam.name, cameraParam.type);
       },
+      deviceShow(e) {
+        this.showTVWall(e.cameraCode, e.cameraName, e.cameraType);
+      },
       showTVWall(channelCode, channelName, type) {
         let tvListJson = [
           {
@@ -681,40 +671,38 @@
       getDeviceList(e,idx){
         this.deviceBtn=idx
         let that = this;
+        let cameraMarkersList = [];
+        let markersMap = {
+          lng: 124.59,
+          lat: 43.02,
+          icon: "enterprise",
+          bindPopupHtml: "",
+          click: "previewBefore",
+          parameter: "",
+          name: e.id,
+          keepBindPopup: false,
+          isAggregation: false,
+        };
+        markersMap.parameter = {
+          id: e.id,
+          name: e.enterpriseName,
+        }
+
+        markersMap.lng = e.longitude;
+        markersMap.lat = e.latitude;
+        markersMap.icon = "enterprise";
+        markersMap.click = 'previewBefore'
+        markersMap.bindPopupHtml = "";
+        cameraMarkersList.push(markersMap);
+
+        setTimeout(() => {
+          that.$refs.supermap.clearM();
+          that.$refs.supermap.clearMRadius();
+          that.$refs.supermap.setMarkers(cameraMarkersList);
+        }, 3000);
         enterpriseById(e.id).then(res => {
           that.cameraListSearch = res.data.cameras
           that.cameraListSearchAll = res.data.cameras
-          let cameraMarkersList = [];
-          for (let i = 0; i < res.data.cameras.length; i++) {
-            let markersMap = {
-              lng: 124.59,
-              lat: 43.02,
-              icon: "camera",
-              bindPopupHtml: "",
-              click: "previewBefore",
-              parameter: "",
-              name: i,
-              keepBindPopup: false,
-              isAggregation: false,
-            };
-            markersMap.parameter = {
-              code: res.data.cameras[i].cameraCode,
-              name: res.data.cameras[i].cameraName,
-              type: res.data.cameras[i].cameraType
-            }
-
-            markersMap.lng = res.data.cameras[i].longitude;
-            markersMap.lat = res.data.cameras[i].latitude;
-            markersMap.icon = "camera";
-            markersMap.click = 'previewBefore'
-            markersMap.bindPopupHtml = "";
-            cameraMarkersList.push(markersMap);
-          }
-          setTimeout(() => {
-            that.$refs.supermap.clearM();
-            that.$refs.supermap.clearMRadius();
-            that.$refs.supermap.setMarkers(cameraMarkersList);
-          }, 3000);
         })
         that.regulatoryinformationQueryParams = {
           pageNum: 1,
@@ -781,13 +769,13 @@
           );
         }
       },
-      previewBefore(cameraParam) {
-        selectByCameraId(cameraParam.code).then(res => {
-          this.$refs.deviceDialog.update(res.data, 'SHE')
-        })
-        this.$refs.deviceDialog.open(cameraParam)
-        return
-        this.currentCameraParam = cameraParam
+      previewBefore(company) {
+        this.$refs.deviceDialog.open([
+          {
+            key:"名称",
+            value:company.name
+          },
+        ])
       },
       getLocation(event) {
         this.visible_dw = !this.visible_dw