Browse Source

农业前端

wang_xy 2 years ago
parent
commit
464f0a5c2b

+ 1 - 2
public/index.html

@@ -197,8 +197,7 @@
   </head>
   <body>
 <!--  <link rel="stylesheet" href="./supermap/libs/plotting/leaflet/10.2.1/iclient-plot-leaflet.css">-->
-  <script type="text/javascript" include="leaflet,leaflet.sidebyside,iclient-leaflet,iclient-plot-leaflet,leaflet.draw,leaflet.markercluster" src="./supermap/dist/leaflet/include-leaflet.js"></script>
-  <script type="text/javascript" include="bootstrap,plottingPanel,fileupLoad,widgets.alert" src="./supermap/examples/js/include-web.js"></script>
+<script type="text/javascript" include="leaflet,leaflet.sidebyside,iclient-leaflet,iclient-plot-leaflet,leaflet.draw,leaflet.markercluster,leaflet.heat" src="./supermap/dist/leaflet/include-leaflet.js"></script>
 <!--  <script type="text/javascript" include="iclient-classic" src="./supermap/dist/classic/include-classic.js"></script>-->
 <!--  <script type="text/javascript" src="./supermap/libs/plotting/leaflet/10.2.1/iclient-plot-leaflet-es6.min.js"></script>-->
   <script type="text/javascript" include="PlotPanel,StylePanel,SMLInfosPanel,iPortalStylePanel" src="./supermap/examples/js/plottingPanel/PlottingPanel.Include.js"></script>

+ 8 - 1
src/api/datacenter.js

@@ -32,6 +32,13 @@ export function getFindAllType(type) {
   return request({
     url: '/center-agriculture/data/FindAllType?type='+type,
     method: 'get',
-    // data:{"type":type}
+  })
+}
+
+//点击左侧获取获取右侧部门列表(新)
+export function getFindAllZhanList(type,deptId) {
+  return request({
+    url: '/center-agriculture/data/FindAllZhanList?type='+type+'&deptId='+deptId,
+    method: 'get',
   })
 }

+ 2 - 2
src/api/haikang/haikang.js

@@ -9,9 +9,9 @@ export function getHaiKangVideoServer(param) {
   })
 }
 // 查询电视墙
-export function getTVWallList() {
+export function cameraTVHaiKangList() {
   return request({
-    url: '/center-monitor/TVWallController/init',
+    url: '/center-agriculture/data/cameraTVHaiKangList',
     method: 'get',
   })
 }

+ 30 - 10
src/components/TVWall.vue

@@ -2,7 +2,23 @@
   <div>
     <el-dialog title="电视墙" :visible.sync="TVWallVisible" v-if="TVWallVisible" customClass="TVWallCustomWidth"
                @close="cancelEventLocationShow()">
-      <div style="width:100%;height:400px;position:relative;">
+	  <div class="forthis" style="width: 22%; position: absolute;left: 0;z-index: 9999999999999;">
+	  	<!-- <div class="this-title">
+	  		<span>林场</span>
+	  		<span>45</span>
+	  	</div> -->
+	  	<div class="i-list-con" style="height: 64vh; overflow-y: scroll;">
+	  		<span v-for="(item,index) in cameraList" :key="index">
+	  			<div class="d-l-con" @click="playhk(item.channelCode)">
+	  				<div class="d-l-l-text">
+	  					<i class="i-small"></i>
+	  					<h4>{{ item.cameraName }}</h4>
+	  				</div>
+	  			</div>
+	  		</span>
+	  	</div>
+	  </div>
+      <div style="width:70%;height:400px;position:absolute;">
         <!--视频窗口展示---大华-->
         <div id="dom1" class="dom1"></div>
         <!--视频窗口展示---海康-->
@@ -16,6 +32,7 @@
 <script>
 /** ----------------------------------摄像头预览开始------------------------------------- */
 import { getDahuaVideoServer, getTVWallList } from '@/api/dahua/dahua'
+import { cameraTVHaiKangList } from '@/api/haikang/haikang'
 import DHWs from '@/dahua/lib/DHWs'
 
 /** ----------------------------------摄像头预览结束------------------------------------- */
@@ -238,6 +255,7 @@ export default {
       mixedVideoDisplayMode: 2,
       isShowTipe: true,
       /** ----------------------------------摄像头预览结束------------------------------------- */
+      cameraList:[],
       initCount: 0,
       pubKey: '',
       oWebControl: null
@@ -286,12 +304,14 @@ export default {
       // this.preview()
       /** ----------------------------------大华摄像头预览结束------------------------------------- */
       /** ----------------------------------海康摄像头预览开始------------------------------------- */
+      cameraTVHaiKangList().then(response => {
+        debugger
+        this.cameraList=response.data
+      })
       that.initPlugin()
-        setTimeout(function() {
-          for (let i = 1;i<=9;i++){
-            that.playhk(i);
-          }
-        }, 2000)
+      setTimeout(function() {
+        that.playhk();
+      }, 5000)
       /** ----------------------------------海康摄像头预览结束------------------------------------- */
       this.TVWallVisible = true
     },
@@ -512,7 +532,7 @@ export default {
         if (oData.responseMsg.data) {
           that.pubKey = oData.responseMsg.data
           callback()
-        }
+        }125
       })
     },
 //RSA加密
@@ -522,12 +542,12 @@ export default {
       return encrypt.encrypt(value)
     },
     //播放海康摄像头
-    playhk(i){
-      var cameraIndexCode = '33e7f21691a843f6bcb4866efebe088b'     //获取输入的监控点编号值,必填
+    playhk(channelCode){
+      var cameraIndexCode = "33e7f21691a843f6bcb4866efebe088b"     //获取输入的监控点编号值,必填
       var streamMode = 0                                     //主子码流标识:0-主码流,1-子码流
       var transMode = 1                                      //传输协议:0-UDP,1-TCP
       var gpuMode = 0                                        //是否启用GPU硬解,0-不启用,1-启用
-      var wndId = i                                         //播放窗口序号(在2x2以上布局下可指定播放窗口)
+      var wndId = -1                                         //播放窗口序号(在2x2以上布局下可指定播放窗口)
 
       cameraIndexCode = cameraIndexCode.replace(/(^\s*)/g, '')
       cameraIndexCode = cameraIndexCode.replace(/(\s*$)/g, '')

File diff suppressed because it is too large
+ 852 - 834
src/components/supermap.vue


+ 97 - 108
src/components/vBottomMenu.vue

@@ -245,104 +245,104 @@
           </el-col>
           <!-- 左侧end -->
           <!-- 右侧 -->
-          <el-col :span="6" class="dia-right">
-            <div class="e-right">
-              <div class="forthis1-1">
-                <dv-border-box-7 backgroundColor="#040b1f" :color="['#25335d', '#5baffd']"
-                                 style="padding-bottom:1rem ;">
-                  <div class="i-list-con">
-                    <div class="this-con">
-                      <div class="z-info-list" style="margin-top: 0;">
-                        <el-timeline>
-                          <el-timeline-item color="#2bacf7" :timestamp="item.createTime"
-                                            placement="top" v-for="(item,index) in eventLogList">
-                            <el-card style="width: 40vh">
-                              <div class="z-info-list-con">
-                                <div class="user-and-time flex-d">
-                                  <span>{{ item.createName }}</span>
-                                  <span v-if="eventLogList.length - 1 == index&&address!=null&&address!=''"><i
-                                    class="el-icon-location"></i> {{ address }}</span>
-                                  <span v-else></span>
-                                </div>
-                                <div class="z-info">
-                                  <div class="this-con-list-info">
-                                    {{ item.logContent }}
-                                  </div>
-                                  <div>
-                                    <router-link to="#" @click.native="clickFile(itemfile.fileUrl,itemfile.fileName)"
-                                                 v-for="(itemfile,indexfile) in item.fileVOs">
-                                      <!-- 使用el-image的:src需要加require -->
-                                      <!--                                        <img v-if="isAssetTypeAnImage(itemfile.fileUrl)"-->
-                                      <!--                                             style="width:3rem; height:3rem;margin: 2px;"-->
-                                      <!--                                             :src="itemfile.fileUrl"-->
-                                      <!--                                             :title="itemfile.fileName">-->
-                                      <!--                                        </img>-->
-                                      <el-image :src="itemfile.fileUrl" v-if="isAssetTypeAnImage(itemfile.fileUrl)"
-                                                :preview-src-list="assetTypeAnImage(item.attachs)"
-                                                style="width:3rem; height:3rem;margin: 2px;"
-                                                :title="itemfile.fileName">
-                                      </el-image>
-                                      <img v-else-if="isAssetTypeAnMp4(itemfile.fileUrl)"
-                                           style="width:3rem; height:3rem;margin: 2px;"
-                                           :src="require('@/assets/fileTypeImage/mp4.png')"
-                                           :title="itemfile.fileName">
-                                      </img>
-                                      <img v-else-if="isAssetTypeAnWord(itemfile.fileUrl)"
-                                           style="width:3rem; height:3rem;margin: 2px;"
-                                           :src="require('@/assets/fileTypeImage/word.png')"
-                                           :title="itemfile.fileName">
-                                      </img>
-                                      <img v-else-if="isAssetTypeAnExcel(itemfile.fileUrl)"
-                                           style="width:3rem; height:3rem;margin: 2px;"
-                                           :src="require('@/assets/fileTypeImage/excel.png')"
-                                           :title="itemfile.fileName">
-                                      </img>
-                                      <img v-else
-                                           style="width:3rem; height:3rem;margin: 2px;"
-                                           :src="require('@/assets/fileTypeImage/file.png')"
-                                           :title="itemfile.fileName">
-                                      </img>
-                                    </router-link>
-                                  </div>
-                                </div>
-                              </div>
-                            </el-card>
-                          </el-timeline-item>
-                        </el-timeline>
-                      </div>
-                    </div>
-                  </div>
-                </dv-border-box-7>
-              </div>
-              <!--              <div class="forthis">-->
-              <!--                <dv-border-box-7 backgroundColor="#040b1f" :color="['#25335d', '#5baffd']">-->
-              <!--                  <div class="i-list-con">-->
-              <!--                    <div class="this-con h-25 no-padding">-->
-              <!--                      <div class="z-info-list" style="margin-top: 0;">-->
-              <!--                        <div class="z-info-btm-grp">-->
-              <!--                          <div class="z-info-btm-grp-top">-->
-              <!--                            <div class="z-info-btm-grp-left">-->
-              <!--                              &lt;!&ndash;                                <el-button size="small" icon="el-icon-s-flag">责任制&ndash;&gt;-->
-              <!--                              &lt;!&ndash;                                </el-button>&ndash;&gt;-->
-              <!--                              <el-button size="small" icon="el-icon-upload" @click="showEventLogUpload()">上传-->
-              <!--                              </el-button>-->
-              <!--                              <el-button size="small" icon="el-icon-download" @click="toImage()">保存-->
-              <!--                              </el-button>-->
-              <!--                            </div>-->
-              <!--                            <div class="z-info-btm-grp-right">-->
-              <!--                              <el-button size="small" icon="el-icon-mic">会议-->
-              <!--                              </el-button>-->
-              <!--                            </div>-->
-              <!--                          </div>-->
-              <!--                        </div>-->
-              <!--                      </div>-->
-              <!--                    </div>-->
-              <!--                  </div>-->
-              <!--                </dv-border-box-7>-->
-              <!--              </div>-->
-            </div>
+          <!--<el-col :span="6" class="dia-right">-->
+            <!--<div class="e-right">-->
+              <!--<div class="forthis1-1">-->
+                <!--<dv-border-box-7 backgroundColor="#040b1f" :color="['#25335d', '#5baffd']"-->
+                                 <!--style="padding-bottom:1rem ;">-->
+                  <!--<div class="i-list-con">-->
+                    <!--<div class="this-con">-->
+                      <!--<div class="z-info-list" style="margin-top: 0;">-->
+                        <!--<el-timeline>-->
+                          <!--<el-timeline-item color="#2bacf7" :timestamp="item.createTime"-->
+                                            <!--placement="top" v-for="(item,index) in eventLogList">-->
+                            <!--<el-card style="width: 40vh">-->
+                              <!--<div class="z-info-list-con">-->
+                                <!--<div class="user-and-time flex-d">-->
+                                  <!--<span>{{ item.createName }}</span>-->
+                                  <!--<span v-if="eventLogList.length - 1 == index&&address!=null&&address!=''"><i-->
+                                    <!--class="el-icon-location"></i> {{ address }}</span>-->
+                                  <!--<span v-else></span>-->
+                                <!--</div>-->
+                                <!--<div class="z-info">-->
+                                  <!--<div class="this-con-list-info">-->
+                                    <!--{{ item.logContent }}-->
+                                  <!--</div>-->
+                                  <!--<div>-->
+                                    <!--<router-link to="#" @click.native="clickFile(itemfile.fileUrl,itemfile.fileName)"-->
+                                                 <!--v-for="(itemfile,indexfile) in item.fileVOs">-->
+                                      <!--&lt;!&ndash; 使用el-image的:src需要加require &ndash;&gt;-->
+                                      <!--&lt;!&ndash;                                        <img v-if="isAssetTypeAnImage(itemfile.fileUrl)"&ndash;&gt;-->
+                                      <!--&lt;!&ndash;                                             style="width:3rem; height:3rem;margin: 2px;"&ndash;&gt;-->
+                                      <!--&lt;!&ndash;                                             :src="itemfile.fileUrl"&ndash;&gt;-->
+                                      <!--&lt;!&ndash;                                             :title="itemfile.fileName">&ndash;&gt;-->
+                                      <!--&lt;!&ndash;                                        </img>&ndash;&gt;-->
+                                      <!--<el-image :src="itemfile.fileUrl" v-if="isAssetTypeAnImage(itemfile.fileUrl)"-->
+                                                <!--:preview-src-list="assetTypeAnImage(item.attachs)"-->
+                                                <!--style="width:3rem; height:3rem;margin: 2px;"-->
+                                                <!--:title="itemfile.fileName">-->
+                                      <!--</el-image>-->
+                                      <!--<img v-else-if="isAssetTypeAnMp4(itemfile.fileUrl)"-->
+                                           <!--style="width:3rem; height:3rem;margin: 2px;"-->
+                                           <!--:src="require('@/assets/fileTypeImage/mp4.png')"-->
+                                           <!--:title="itemfile.fileName">-->
+                                      <!--</img>-->
+                                      <!--<img v-else-if="isAssetTypeAnWord(itemfile.fileUrl)"-->
+                                           <!--style="width:3rem; height:3rem;margin: 2px;"-->
+                                           <!--:src="require('@/assets/fileTypeImage/word.png')"-->
+                                           <!--:title="itemfile.fileName">-->
+                                      <!--</img>-->
+                                      <!--<img v-else-if="isAssetTypeAnExcel(itemfile.fileUrl)"-->
+                                           <!--style="width:3rem; height:3rem;margin: 2px;"-->
+                                           <!--:src="require('@/assets/fileTypeImage/excel.png')"-->
+                                           <!--:title="itemfile.fileName">-->
+                                      <!--</img>-->
+                                      <!--<img v-else-->
+                                           <!--style="width:3rem; height:3rem;margin: 2px;"-->
+                                           <!--:src="require('@/assets/fileTypeImage/file.png')"-->
+                                           <!--:title="itemfile.fileName">-->
+                                      <!--</img>-->
+                                    <!--</router-link>-->
+                                  <!--</div>-->
+                                <!--</div>-->
+                              <!--</div>-->
+                            <!--</el-card>-->
+                          <!--</el-timeline-item>-->
+                        <!--</el-timeline>-->
+                      <!--</div>-->
+                    <!--</div>-->
+                  <!--</div>-->
+                <!--</dv-border-box-7>-->
+              <!--</div>-->
+                            <!--<div class="forthis">-->
+                              <!--<dv-border-box-7 backgroundColor="#040b1f" :color="['#25335d', '#5baffd']">-->
+                                <!--<div class="i-list-con">-->
+                                  <!--<div class="this-con h-25 no-padding">-->
+                                    <!--<div class="z-info-list" style="margin-top: 0;">-->
+                                      <!--<div class="z-info-btm-grp">-->
+                                        <!--<div class="z-info-btm-grp-top">-->
+                                          <!--<div class="z-info-btm-grp-left">-->
+                                            <!--&lt;!&ndash;                                <el-button size="small" icon="el-icon-s-flag">责任制&ndash;&gt;-->
+                                            <!--&lt;!&ndash;                                </el-button>&ndash;&gt;-->
+                                            <!--<el-button size="small" icon="el-icon-upload" @click="showEventLogUpload()">上传-->
+                                            <!--</el-button>-->
+                                            <!--<el-button size="small" icon="el-icon-download" @click="toImage()">保存-->
+                                            <!--</el-button>-->
+                                          <!--</div>-->
+                                          <!--<div class="z-info-btm-grp-right">-->
+                                            <!--<el-button size="small" icon="el-icon-mic">会议-->
+                                            <!--</el-button>-->
+                                          <!--</div>-->
+                                        <!--</div>-->
+                                      <!--</div>-->
+                                    <!--</div>-->
+                                  <!--</div>-->
+                                <!--</div>-->
+                              <!--</dv-border-box-7>-->
+                            <!--</div>-->
+            <!--</div>-->
 
-          </el-col>
+          <!--</el-col>-->
           <!-- 左侧end -->
         </el-row>
       </div>
@@ -457,17 +457,6 @@ export default {
           click: 'editableLayers'
         },
         {
-          name: '养殖场',
-          icon: 'iconfont sj-icon-lbzy',
-          click: 'forestban'
-        },
-
-        {
-          name: '农场',
-          icon: 'iconfont sj-icon-lczy',
-          click: 'forestchang'
-        },
-        {
           name: '电视墙',
           icon: 'el-icon-s-grid',
           click: 'TVWall'

+ 2 - 2
src/router/index.js

@@ -65,7 +65,7 @@ export const constantRoutes = [{
 		name: 'bigdata',
 		component: () => import('@/views/bigdata/bigdata'),
 		meta: {
-			title: '大数据'
+			title: '统计分析'
 		}
 	},
   // {
@@ -140,7 +140,7 @@ export const constantRoutesNew = [{
     name: 'bigdata',
     component: () => import('@/views/bigdata/bigdata'),
     meta: {
-      title: '大数据'
+      title: '统计分析'
     }
   },
 	// {

+ 17 - 33
src/views/bigdata/bigdata.vue

@@ -13,8 +13,6 @@
 				</router-link>
 				<img src="@/assets/images/integrated/bigdata-header-nav-right.png" />
 			</div>
-			<!-- 左侧 -->
-			<fastMenu></fastMenu>
 		</div>
 		<!-- 头部E -->
 
@@ -46,6 +44,8 @@
           <supermap ref="supermap" :mapDiv="'forestMap'" class="indexSupermapClass"
                     :mapSite="{doubleClickZoom:false}" :codes="['9fa5']" :isSideBySide="false" @preview="preview" >
           </supermap>
+          <bigdataSupermap ref="bigdataSupermap" style="width: 100%;height: 59vh;" class="indexSupermapClass" :mapDiv="'bigdataMap'" dynamicPlotting="false"
+                           :mapSite="{doubleClickZoom:false}" :codes="['9fa5']" :isSideBySide="false"/>
 				</div>
 				<!--<tabbar></tabbar>-->
         <div class="b-con mg-b-20">
@@ -134,7 +134,7 @@
 	import chartDetector from './chart-detector' //17 探测器
 	import chartFireControl from './chart-firecontrol' //18 消防力量
 
-  import supermap from '@/components/supermap'; //超图
+  import bigdataSupermap from '@/components/supermap' //超图
 
   import {cooperativesBigData,machineryInfoBigData,landInfoBigData
     ,eventcatalogueBigData,deptBigData
@@ -164,7 +164,7 @@
 			chartCamera,
 			chartDetector,
 			chartFireControl,
-      supermap,
+      bigdataSupermap,
 		},
     created() {
       this.cooperativesBigData();
@@ -178,47 +178,31 @@
       this.huaFeiBigData();
       this.YangZhiBigData();
     },
+    mounted() {
+      setTimeout(() => {
+        this.$refs.bigdataSupermap.loadHeatMap()//事件分布
+      }, 5000)
+    },
 		data() {
 			return {
 				visited: '',
 				navbar: [
 				  {
-						name: '四平云图',
-						path: '/integrated/bigdata',
-					},
-					{
-						name: '数字林业',
-						path: '/integrated/forest',
-					},
-					{
-						name: '数字农业',
-						path: '/',
-					},
-					{
-						name: '数字水利',
-						path: '/',
-					},
-					{
-						name: '数字环保',
-						path: '/',
+						name: '农业云图',
+						path: '/forest',
 					},
 					{
-						name: '数字应急',
-						path: '/',
+						name: '数据中心',
+						path: '/datacenter',
 					},
 					{
-						name: '数字交通',
-						path: '/',
+						name: '监控中心',
+						path: '/monitor',
 					},
 					{
-						name: '数字资源',
-						path: '/',
+						name: '统计分析',
+						path: '/bigdata',
 					},
-					{
-						name: '数字消防',
-						path: '/',
-					},
-
 				],
 				total: 0, //事件总数
         escalation:0,// 事件-上报

+ 5 - 2
src/views/bigdata/chart-pit.vue

@@ -12,7 +12,11 @@
 		name: 'pit',
 		data() {
 			return {
-				count: 0
+				count: 0,
+
+        title:'',
+        visible:false,
+
 			}
 		},
 		mounted() {
@@ -56,7 +60,6 @@
 
 		},
 
-
 	}
 </script>
 

+ 103 - 412
src/views/datacenter.vue

@@ -43,7 +43,8 @@
             <div class="i-list-con h-73">
               <div class="overflow-y" style="height: 39vh">
                 <div class="d-l-con" :class="{on:listCurrentIndex==item.deptId}"
-                     v-for="(item,index) in deptGroupList">
+                     v-for="(item,index) in deptGroupList"
+                     v-on:click="indentleftByDeptIdSetMarkers(item.deptId)">
                   <div class="d-l-l-text">
                     <i class="i-small"></i>
                     <h4>{{ item.deptName }}</h4>
@@ -76,7 +77,8 @@ import {
   getResource,
   getResourcePoint,
   getResourcePointByDeptId,
-  getFindAllType
+  getFindAllType,
+  getFindAllZhanList
 } from '@/api/datacenter'
 
 import supermap from '@/components/supermap' //超图
@@ -123,6 +125,7 @@ export default {
       // resourcesMap: {},
       //右侧资源
       deptGroupList: [],
+      supermapDianList: [],//点击左侧数据表获取到的点位数据
       source: [],
       //左右缩进
       indentStyle: '',
@@ -330,13 +333,13 @@ export default {
           const map = {};
           if(key == 'buzhu'){map.name="补助次数";}
           if(key == 'gengdi'){map.name="耕地面积";}
-          if(key == 'hezuoshe'){map.name="合作社数量";}//
+          if(key == 'hezuoshe'){map.name="合作社数量";}//有经纬度
           if(key == 'huafei'){map.name="化肥库存";}
-          if(key == 'nongji'){map.name="农机站数量";}//
-          if(key == 'nongju'){map.name="农具站数量";}//
-          if(key == 'xubao'){map.name="畜保站数量";}//
-          if(key == 'yangzhi'){map.name="养殖及粪污处理点";}//
-          if(key == 'zhibao'){map.name="植保数量";}
+          if(key == 'nongji'){map.name="农机站数量";}//有经纬度
+          if(key == 'nongju'){map.name="农具库存";}
+          if(key == 'xubao'){map.name="畜保站数量";}//有经纬度
+          if(key == 'yangzhi'){map.name="养殖及粪污处理点";}//有经纬度
+          if(key == 'zhibao'){map.name="植保数量";}//有经纬度
           if(key == 'zhongzhi'){map.name="种植产量";}
           if(key == 'zhongzi'){map.name="种子库存";}
           map.icon='sj-icon-'+key;
@@ -348,8 +351,10 @@ export default {
     },
     indentleftSetMarkers(type) {
       let that = this
+      that.resourceTable=type;
       getFindAllType(type).then(res => {
         that.deptGroupList = res.data.dept;
+        that.supermapDianList = res.data.list;
         that.source = [];
         //点击左侧右侧数据展示及横向柱状图
         if (res.data != null && res.data.dept.length > 0) {
@@ -360,420 +365,106 @@ export default {
         }
         this.dataChat();
         if (res.data != null && res.data.list.length > 0) {
-          for (let i = 0; i < res.data.list.length; i++) {
-            let markersMap = {
-              lng: 124.59,
-              lat: 43.02,
-              icon: 'marker',
-              bindPopupHtml: '',
-              click: '',
-              keepBindPopup: false,
-              isAggregation: false
-            }
-            if(type=='hezuoshe'||type=='nongji'||type=='nongju'||type=='xubao'||type=='yangzhi'){
-              markersMap.icon = 'sj-icon-map-qxz';
-              markersMap.lng = res.data.list[i].longitude;
-              markersMap.lat = res.data.list[i].latitude;
-              markersMap.bindPopupHtml = '' +
-                '<div class="map-tip">' +
-                '   <span>' +
-                '     <div class="d-l-con">' +
-                '       <div class="d-l-l-text">' +
-                '         <h4>经纬度:' + res.data.list[i].longitude + ',' + res.data.list[i].latitude + '</h4>' +
-                '       </div>' +
-                '     </div>' +
-                '   </span>' +
-                '   <span>' +
-                '     <div class="d-l-con">' +
-                '       <div class="d-l-l-text">' +
-                '         <h4>地址:' + res.data.list[i].address + '</h4>' +
-                '       </div>' +
-                '     </div>' +
-                '   </span>' +
-                '   <span>' +
-                '     <div class="d-l-con">' +
-                '       <div class="d-l-l-text">' +
-                '         <h4>名称:' + res.data.list[i].name +'</h4>' +
-                '       </div>' +
-                '     </div>' +
-                '   </span>' +
-
-                '</div>'
+          if(type=='hezuoshe'||type=='nongji'||type=='zhibao'||type=='xubao'||type=='yangzhi'){
+            for (let i = 0; i < res.data.list.length; i++) {
+              let markersMap = {
+                lng: res.data.list[i].longitude,
+                lat: res.data.list[i].latitude,
+                icon: 'marker',
+                bindPopupHtml: '' +
+                  '<div class="map-tip">' +
+                  '   <span>' +
+                  '     <div class="d-l-con">' +
+                  '       <div class="d-l-l-text">' +
+                  '         <h4>经纬度:' + res.data.list[i].longitude + ',' + res.data.list[i].latitude + '</h4>' +
+                  '       </div>' +
+                  '     </div>' +
+                  '   </span>' +
+                  '   <span>' +
+                  '     <div class="d-l-con">' +
+                  '       <div class="d-l-l-text">' +
+                  '         <h4>地址:' + res.data.list[i].address + '</h4>' +
+                  '       </div>' +
+                  '     </div>' +
+                  '   </span>' +
+                  '   <span>' +
+                  '     <div class="d-l-con">' +
+                  '       <div class="d-l-l-text">' +
+                  '         <h4>名称:' + res.data.list[i].name +'</h4>' +
+                  '       </div>' +
+                  '     </div>' +
+                  '   </span>' +
+                  '</div>',
+                click: '',
+                parameter: '',
+                keepBindPopup: false,
+                isAggregation: false
+              }
+              that.markersList.push(markersMap)
             }
+          }else{
+            that.markersList = [];
           }
         }
         that.$refs.supermap.clearM(false);
         that.$refs.supermap.setMarkers(that.markersList);
       });
     },
-    indentleftByDeptIdSetMarkers(deptId) {//暂时无用
+    indentleftByDeptIdSetMarkers(deptId) {
       this.listCurrentIndex = deptId
-      let that = this
-      //点击左侧地图落点
-      getResourcePointByDeptId(that.resourceTable, deptId).then(res => {
-        that.markersList = []
-        if (res.data.resourceList != null && res.data.resourceList.length > 0) {
-          for (let i = 0; i < res.data.resourceList.length; i++) {
-            let markersMap = {
-              lng: 124.59,
-              lat: 43.02,
-              icon: 'marker',
-              bindPopupHtml: '',
-              click: '',
-              keepBindPopup: false,
-              isAggregation: false
-            }
-            if (that.resourceTable == 'centerdata_t_forest_weatherstation') { //气象站
-              markersMap.icon = 'sj-icon-map-qxz'
-              markersMap.lng = res.data.resourceList[i].longitude
-              markersMap.lat = res.data.resourceList[i].latitude
-              markersMap.icon = 'icon_qxz'
-              markersMap.bindPopupHtml = '<div class="map-tip">' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>经纬度:' + res.data.resourceList[i].longitude + ',' + res
-                  .data.resourceList[i].latitude + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>地址:' + res.data.resourceList[i].weatherstationAddress +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].weatherstationPerson +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].weatherstationTel +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
-            } else if (that.resourceTable == 'centerdata_t_forest_farm') { //林场
-              markersMap.icon = 'sj-icon-map-lc'
-              markersMap.lng = res.data.resourceList[i].longitude
-              markersMap.lat = res.data.resourceList[i].latitude
-              markersMap.bindPopupHtml = '<div class="map-tip">' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>经纬度:' + res.data.resourceList[i].longitude + ',' + res
-                  .data.resourceList[i].latitude + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>林场名称:' + res.data.resourceList[i].farmName + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].farmPerson + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].farmTel + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
-            } else if (that.resourceTable == 'centerdata_t_forest_landing') { //起降点
-              markersMap.icon = 'sj-icon-map-qjd'
-              markersMap.lng = res.data.resourceList[i].longitude
-              markersMap.lat = res.data.resourceList[i].latitude
-              markersMap.bindPopupHtml = '<div class="map-tip">' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>经纬度:' + res.data.resourceList[i].longitude + ',' + res
-                  .data.resourceList[i].latitude + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>起降点名称:' + res.data.resourceList[i].landingName +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].landingPerson +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].landingTel + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
-            } else if (that.resourceTable == 'centerdata_t_forest_channel') { //水源渠道
-              markersMap.icon = 'sj-icon-map-syqd'
-              markersMap.lng = res.data.resourceList[i].longitude
-              markersMap.lat = res.data.resourceList[i].latitude
-              markersMap.bindPopupHtml = '<div class="map-tip">' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>经纬度:' + res.data.resourceList[i].longitude + ',' + res
-                  .data.resourceList[i].latitude + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>渠道名称:' + res.data.resourceList[i].channelName +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].channelPerson +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].channelTel + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
-            } else if (that.resourceTable == 'centerdata_t_forest_checkpoint') { //防火检查站
-              markersMap.icon = 'sj-icon-map-fhjcz'
-              markersMap.lng = res.data.resourceList[i].longitude
-              markersMap.lat = res.data.resourceList[i].latitude
-              markersMap.bindPopupHtml = '<div class="map-tip">' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>经纬度:' + res.data.resourceList[i].longitude + ',' + res
-                  .data.resourceList[i].latitude + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>检查站名称:' + res.data.resourceList[i].checkpointName +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>地址:' + res.data.resourceList[i].checkpointAddress +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].checkpointPerson +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].checkpointTel +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
-            } else if (that.resourceTable == 'centerdata_t_forest_waterintake') { //取水口
-              markersMap.icon = 'sj-icon-map-qsk'
-              markersMap.lng = res.data.resourceList[i].longitude
-              markersMap.lat = res.data.resourceList[i].latitude
-              markersMap.bindPopupHtml = '<div class="map-tip">' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>经纬度:' + res.data.resourceList[i].longitude + ',' + res
-                  .data.resourceList[i].latitude + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>取水口名称:' + res.data.resourceList[i].waterintakeName +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].waterintakePerson +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].waterintakeTel +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
-            } else if (that.resourceTable == 'centerdata_t_forest_watercrane') { //水鹤
-              markersMap.icon = 'sj-icon-map-sh'
-              markersMap.lng = res.data.resourceList[i].longitude
-              markersMap.lat = res.data.resourceList[i].latitude
-              markersMap.bindPopupHtml = '<div class="map-tip">' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>经纬度:' + res.data.resourceList[i].longitude + ',' + res
-                  .data.resourceList[i].latitude + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>水鹤名称:' + res.data.resourceList[i].watercraneName +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].watercranePerson +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].watercraneTel +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
-            } else if (that.resourceTable == 'centerdata_t_forest_firehydrant') { //消火栓
-              markersMap.icon = 'sj-icon-map-xhs'
-              markersMap.lng = res.data.resourceList[i].longitude
-              markersMap.lat = res.data.resourceList[i].latitude
-              markersMap.bindPopupHtml = '<div class="map-tip">' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>经纬度:' + res.data.resourceList[i].longitude + ',' + res
-                  .data.resourceList[i].latitude + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>消火栓名称:' + res.data.resourceList[i].firehydrantName +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>地址:' + res.data.resourceList[i].firehydrantAddress +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].firehydrantPerson +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].firehydrantTel +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
-            } else if (that.resourceTable == 'centerdata_t_forest_fireteam') { //森林防火队
-              markersMap.icon = 'sj-icon-map-slfh'
-              markersMap.lng = res.data.resourceList[i].longitude
-              markersMap.lat = res.data.resourceList[i].latitude
-              markersMap.bindPopupHtml = '<div class="map-tip">' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>经纬度:' + res.data.resourceList[i].longitude + ',' + res
-                  .data.resourceList[i].latitude + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>森林防火队名称:' + res.data.resourceList[i].fireteamName +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>联系人:' + res.data.resourceList[i].fireteamPerson +
-                '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span>' +
-                '<span>' +
-                '                  <div class="d-l-con">' +
-                '                  <div class="d-l-l-text">' +
-                '                  <h4>电话:' + res.data.resourceList[i].fireteamTel + '</h4>' +
-                '                </div>' +
-                '                </div>' +
-                '                </span></div>'
+      let that = this;
+      let type = that.resourceTable;
+      that.markersList = [];
+      //点击右侧地图落点
+      if(type=='hezuoshe'||type=='nongji'||type=='zhibao'||type=='xubao'||type=='yangzhi'){
+        getFindAllZhanList(type,deptId).then(res => {
+          if (res.data != null && res.data.length > 0) {
+            for (let i = 0; i < res.data.length; i++) {
+              let markersMap = {
+                lng: res.data[i].longitude,
+                lat: res.data[i].latitude,
+                // lng: 124.391266,
+                // lat: 43.318594,
+                icon: 'marker',
+                bindPopupHtml: '' +
+                  '<div class="map-tip">' +
+                  '   <span>' +
+                  '     <div class="d-l-con">' +
+                  '       <div class="d-l-l-text">' +
+                  '         <h4>经纬度:' + res.data[i].longitude + ',' + res.data[i].latitude + '</h4>' +
+                  '       </div>' +
+                  '     </div>' +
+                  '   </span>' +
+                  '   <span>' +
+                  '     <div class="d-l-con">' +
+                  '       <div class="d-l-l-text">' +
+                  '         <h4>地址:' + res.data[i].address + '</h4>' +
+                  '       </div>' +
+                  '     </div>' +
+                  '   </span>' +
+                  '   <span>' +
+                  '     <div class="d-l-con">' +
+                  '       <div class="d-l-l-text">' +
+                  '         <h4>名称:' + res.data[i].name +'</h4>' +
+                  '       </div>' +
+                  '     </div>' +
+                  '   </span>' +
+                  '</div>',
+                click: '',
+                parameter: '',
+                keepBindPopup: false,
+                isAggregation: false
+              }
+              that.markersList.push(markersMap)
             }
-            that.markersList.push(markersMap)
+          }else{
+            that.markersList = [];
           }
-        }
-        that.$refs.supermap.clearM(false)
-        that.$refs.supermap.setMarkers(that.markersList)
-      })
+          that.$refs.supermap.clearM(false)
+          that.$refs.supermap.setMarkers(that.markersList)
+        })
+      }
+      that.$refs.supermap.clearM(false)
     }
 
   }

+ 27 - 27
src/views/forest.vue

@@ -235,32 +235,32 @@
             </dv-border-box-13>
           </div>
           <!-- 曝光台 -->
-          <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="this-title">
-                <span>曝光台</span>
-                <dv-decoration-3 style="width:150px;height:15px;margin-right: 1rem;"/>
-              </div>
-              <div class="i-list-con small-bottom-margin h-18">
-                <div class="d-l-con padding-box nowrap" v-for="(item,index) in exposureStageList">
-                  <div class="bgt-state">
-                    <div class="bgt-state-frequency">{{ item.urgeCount }}</div>
-                    <div class="bgt-state-minute">{{ item.timeDiff }}分钟</div>
-                  </div>
-                  <div class="bgt-info">
-                    <div class="bgt-info-name">{{ item.eventName }}</div>
-                    <div class="bgt-info-place">
-                      <ul>
-                        <li>{{ item.deptNames }}</li>
-                      </ul>
-                    </div>
-                  </div>
-                </div>
+          <!--<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="this-title">-->
+                <!--<span>曝光台</span>-->
+                <!--<dv-decoration-3 style="width:150px;height:15px;margin-right: 1rem;"/>-->
+              <!--</div>-->
+              <!--<div class="i-list-con small-bottom-margin h-18">-->
+                <!--<div class="d-l-con padding-box nowrap" v-for="(item,index) in exposureStageList">-->
+                  <!--<div class="bgt-state">-->
+                    <!--<div class="bgt-state-frequency">{{ item.urgeCount }}</div>-->
+                    <!--<div class="bgt-state-minute">{{ item.timeDiff }}分钟</div>-->
+                  <!--</div>-->
+                  <!--<div class="bgt-info">-->
+                    <!--<div class="bgt-info-name">{{ item.eventName }}</div>-->
+                    <!--<div class="bgt-info-place">-->
+                      <!--<ul>-->
+                        <!--<li>{{ item.deptNames }}</li>-->
+                      <!--</ul>-->
+                    <!--</div>-->
+                  <!--</div>-->
+                <!--</div>-->
 
-              </div>
-            </dv-border-box-13>
-          </div>
+              <!--</div>-->
+            <!--</dv-border-box-13>-->
+          <!--</div>-->
           <!-- 事件列表 -->
           <div class="forthis">
             <dv-border-box-13 backgroundColor="rgba(12, 19, 38, .90)" style="padding-bottom: 1rem;">
@@ -269,7 +269,7 @@
                 <span>事件列表</span>
                 <dv-decoration-3 style="width:150px;height:15px;margin-right: 1rem;"/>
               </div>
-              <div class="i-list-con small-bottom-margin h-35">
+              <div class="i-list-con small-bottom-margin h-35" style="height: 57.5vh;">
                 <div class="event-list-search">
                   <el-input
                     placeholder="请输入内容"
@@ -654,7 +654,7 @@ export default {
       this.getEventList(day)
       this.getEventByEventType(day)
       this.getEventByReportorOrder(day)
-      this.getExposureStage(day)
+      // this.getExposureStage(day)
       this.calendarDay = day
     },
 

+ 12 - 7
src/views/monitor.vue

@@ -166,10 +166,9 @@ export default {
   },
   data() {
     return {
-      iconCurrentIndex1: '',
-      listCurrentIndex1: '',
-      listCurrentIndex2: '',
-      listCurrentIndex3: '',
+      iconCurrentIndex1: '-1',
+      listCurrentIndex1: '-1',
+      listCurrentIndex2: '-1',
       /** ----------------------------------摄像头预览开始------------------------------------- */
       //大华
       activePanel: 'key1',
@@ -406,8 +405,7 @@ export default {
               markersMap.isAggregation = true
             }
             if (res.data.visuForestCloudCameraBOList[i].channelCode != null) {
-              markersMap.parameter = res.data.visuForestCloudCameraBOList[i].channelCode.split(
-                ',')
+              markersMap.parameter = res.data.visuForestCloudCameraBOList[i].cameraCode
             } else {
               markersMap.parameter = []
             }
@@ -466,6 +464,7 @@ export default {
       this.listCurrentIndex1 = depId
       let that = this
       that.cameraMarkersList = []
+
       that.visuForestCloudCameraBOList = []
       selectCameraByDeptId(depId).then(res => {
         //根据设备类型查看列表
@@ -487,7 +486,7 @@ export default {
               markersMap.isAggregation = true
             }
             if (res.data[i].channelCode != null) {
-              markersMap.parameter = res.data[i].channelCode.split(',')
+              markersMap.parameter = res.data[i].cameraCode
             } else {
               markersMap.parameter = []
             }
@@ -630,6 +629,7 @@ export default {
     /** ----------------------------------海康摄像头预览开始------------------------------------- */
     // 创建播放实例
     initPlugin(newappkey,newloginIp,newsecret,newloginPort) {
+      debugger
       let that=this
       that.oWebControl = new WebControl({
         szPluginContainer: 'playWnd',                       // 指定容器id
@@ -761,6 +761,11 @@ export default {
 
   }
 }
+
+// 推送消息
+function cbIntegrationCallBack(oData) {
+  console.log(JSON.stringify(oData.responseMsg))
+}
 </script>