|
|
@@ -963,6 +963,7 @@
|
|
|
<el-dialog title="人员选择" :visible.sync="showFindUserByDept" width="40%">
|
|
|
<findUserByDept v-if="showFindUserByDept" ref="findUserByDept" :deptId="iconCurrentIndex" @addSelection="addSelection"></findUserByDept>
|
|
|
</el-dialog>
|
|
|
+ <TVWall ref="TVWall"></TVWall>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -973,6 +974,7 @@ import vBottomMenu from '@/components/vBottomMenu.vue' //一体化公共底部
|
|
|
import eventLogUpload from '@/views/eventLogUpload.vue' //日志上传文件
|
|
|
import areaSupermap from '@/components/supermap'//区域标记地图
|
|
|
import TcPlayer from '@/components/TcPlayer' //视频预览
|
|
|
+import TVWall from '@/components/TVWall.vue' //电视墙弹窗
|
|
|
import leftRightSwiperScroll from '@/components/leftRightSwiperScroll.vue';//事件中心底部资源内容溢出组件
|
|
|
import {getIconBg} from '@/api/components/sookaMapIcon';//资源底色控制文件
|
|
|
import {joinConferences} from "@/api/meeting";
|
|
|
@@ -1023,7 +1025,8 @@ export default {
|
|
|
supermapDialog1,
|
|
|
eventLogUpload,
|
|
|
areaSupermap,
|
|
|
- TcPlayer
|
|
|
+ TcPlayer,
|
|
|
+ TVWall
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
@@ -1827,7 +1830,7 @@ export default {
|
|
|
markersMap.click = 'preview'
|
|
|
// markersMap.parameter = res.data[i].cameraCode
|
|
|
markersMap.parameter = {code:res.data.data[i].cameraCode,
|
|
|
- type:res.data.data[i].cameraFactory}
|
|
|
+ type:res.data.data[i].cameraFactory,name:res.data.data[i].name}
|
|
|
}
|
|
|
}
|
|
|
markersMap.lng = res.data[i].longitude
|
|
|
@@ -2422,7 +2425,7 @@ export default {
|
|
|
icon: 'camera',
|
|
|
bindPopupHtml: '',
|
|
|
click: 'preview',
|
|
|
- parameter: {code:res.data.centermonitorTCamera.cameraCode,type:res.data.centermonitorTCamera.cameraFactory},
|
|
|
+ parameter: {code:res.data.centermonitorTCamera.cameraCode,type:res.data.centermonitorTCamera.cameraFactory,name:res.data.centermonitorTCamera.cameraName},
|
|
|
keepBindPopup: false,
|
|
|
isAggregation: false,
|
|
|
radius: 0
|
|
|
@@ -2527,49 +2530,90 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
},
|
|
|
+ showTVWall(channelCode, channelName) {
|
|
|
+ let tvListJson = [{
|
|
|
+ "switchTab": "2",
|
|
|
+ "treeLabels": [{
|
|
|
+ "id": null,
|
|
|
+ "labelCode": "999",
|
|
|
+ "labelName": "电视墙",
|
|
|
+ "cameraType": null,
|
|
|
+ "parentLabelCode": ""
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "id": "spcamera00010",
|
|
|
+ "labelCode": channelCode,
|
|
|
+ "labelName": channelName,
|
|
|
+ "cameraType": "1",
|
|
|
+ "parentLabelCode": "999"
|
|
|
+ }
|
|
|
+ ],
|
|
|
+ "labelChannels": [{
|
|
|
+ "labelCode": channelCode,
|
|
|
+ "channelDates": [{
|
|
|
+ "channelCode": channelCode,
|
|
|
+ "channelName": channelName,
|
|
|
+ "channelSn": null,
|
|
|
+ "cameraType": "1",
|
|
|
+ "online": "1",
|
|
|
+ "cameraCode": "1"
|
|
|
+ }]
|
|
|
+ }]
|
|
|
+ }]
|
|
|
+ this.$refs.TVWall.showTVWall(tvListJson, [{
|
|
|
+ "channelId": channelCode
|
|
|
+ }]);
|
|
|
+ this.$refs.bottomMenu.showMeasure = false;
|
|
|
+ this.$refs.bottomMenu.showChild = false;
|
|
|
+ this.$refs.bottomMenu.showBanChild = false;
|
|
|
+ this.$refs.bottomMenu.showChangChild = false;
|
|
|
+ },
|
|
|
/** 预览按钮操作 */
|
|
|
preview(cameraParam) {
|
|
|
- if(cameraParam.type=='1'){
|
|
|
- getDahuaVideoServer().then(newResponse => {
|
|
|
- console.log(newResponse)
|
|
|
- this.ws.detectConnectQt().then(res => {
|
|
|
- if (res) { // 连接客户端成功
|
|
|
- this.alertLogin()
|
|
|
- this.ws.login({
|
|
|
- loginIp: newResponse.loginIp,
|
|
|
- loginPort: newResponse.loginPort,
|
|
|
- userName: newResponse.userName,
|
|
|
- userPwd: newResponse.userPwd,
|
|
|
- token: '',
|
|
|
- https: 0
|
|
|
- })
|
|
|
- this.ws.on('loginState', (res) => {
|
|
|
- this.isLogin = res
|
|
|
- console.log('---res-----', res)
|
|
|
- if (res) {
|
|
|
- this.alertLoginSuccess()
|
|
|
- this.activePanel = 'key2'
|
|
|
- this.realTimeVideoDialog(cameraParam.code)
|
|
|
- } else {
|
|
|
- this.alertLoginFailed()
|
|
|
- }
|
|
|
- })
|
|
|
- } else { // 连接客户端失败
|
|
|
- this.alertReinstall()
|
|
|
- }
|
|
|
- })
|
|
|
- })
|
|
|
- }else if(cameraParam.type=='0'){
|
|
|
- let that = this
|
|
|
- that.cameraVisible = true
|
|
|
- getHaiKangVideoServer({cameraCode:cameraParam.code}).then(newResponse => {
|
|
|
- that.cameraTitle = '摄像头-'+newResponse.data.cameraName
|
|
|
- that.initPlugin(newResponse.data.appkey,newResponse.data.loginIp,newResponse.data.secret,newResponse.data.loginPort)
|
|
|
- setTimeout(function() {
|
|
|
- that.playhk(newResponse.data.channelCode)
|
|
|
- }, 5000)
|
|
|
- })
|
|
|
+ if(cameraParam.type=='1') {
|
|
|
+ console.log(cameraParam)
|
|
|
+this.showTVWall(cameraParam.code,cameraParam.name)
|
|
|
}
|
|
|
+ // getDahuaVideoServer().then(newResponse => {
|
|
|
+ // console.log(newResponse)
|
|
|
+ // this.ws.detectConnectQt().then(res => {
|
|
|
+ // if (res) { // 连接客户端成功
|
|
|
+ // this.alertLogin()
|
|
|
+ // this.ws.login({
|
|
|
+ // loginIp: newResponse.loginIp,
|
|
|
+ // loginPort: newResponse.loginPort,
|
|
|
+ // userName: newResponse.userName,
|
|
|
+ // userPwd: newResponse.userPwd,
|
|
|
+ // token: '',
|
|
|
+ // https: 0
|
|
|
+ // })
|
|
|
+ // this.ws.on('loginState', (res) => {
|
|
|
+ // this.isLogin = res
|
|
|
+ // console.log('---res-----', res)
|
|
|
+ // if (res) {
|
|
|
+ // this.alertLoginSuccess()
|
|
|
+ // this.activePanel = 'key2'
|
|
|
+ // this.realTimeVideoDialog(cameraParam.code)
|
|
|
+ // } else {
|
|
|
+ // this.alertLoginFailed()
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // } else { // 连接客户端失败
|
|
|
+ // this.alertReinstall()
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // })
|
|
|
+ // }else if(cameraParam.type=='0'){
|
|
|
+ // let that = this
|
|
|
+ // that.cameraVisible = true
|
|
|
+ // getHaiKangVideoServer({cameraCode:cameraParam.code}).then(newResponse => {
|
|
|
+ // that.cameraTitle = '摄像头-'+newResponse.data.cameraName
|
|
|
+ // that.initPlugin(newResponse.data.appkey,newResponse.data.loginIp,newResponse.data.secret,newResponse.data.loginPort)
|
|
|
+ // setTimeout(function() {
|
|
|
+ // that.playhk(newResponse.data.channelCode)
|
|
|
+ // }, 5000)
|
|
|
+ // })
|
|
|
+ // }
|
|
|
|
|
|
},
|
|
|
realTimeVideoDialog(cameraParams) { // 调用弹窗实时播放接口
|
王通