wvp-pro.git - Gitblit

old mode 100644 new mode 100755

			@@ -22,10 +22,10 @@
			<el-descriptions-item label="行政区域" >{{channel.civilCode}}</el-descriptions-item>
			<el-descriptions-item label="设备归属" >{{channel.owner}}</el-descriptions-item>
			<el-descriptions-item label="安装地址" >{{channel.address == null?'未知': channel.address}}</el-descriptions-item>
			<el-descriptions-item label="云台类型" >{{channel.ptztypeText}}</el-descriptions-item>
			<el-descriptions-item label="状态">
			<el-tag size="small" v-if="channel.status === 1">在线</el-tag>
			<el-tag size="small" type="info" v-if="channel.status === 0">离线</el-tag>
			<el-descriptions-item label="云台类型" >{{channel.PTZTypeText}}</el-descriptions-item>
			<el-descriptions-item label="通道状态">
			<el-tag size="small" v-if="channel.status === true">在线</el-tag>
			<el-tag size="small" type="info" v-if="channel.status === false">离线</el-tag>
			</el-descriptions-item>
			</el-descriptions>
			<div style="padding-top: 10px">
			@@ -186,6 +186,14 @@
			this.deviceService.getAllSubChannel(false, data.deviceId, data.channelId, this.channelsHandler)
			}
			}
			},
			{
			label: "查询轨迹",
			icon: "el-icon-map-location",
			disabled: false,
			onClick: () => {
			this.getTrace(data)
			}
			}
			],
			event, // 鼠标事件信息
			@@ -294,7 +302,6 @@
			}).then(function (res) {
			that.isLoging = false;
			if (res.data.code === 0) {

			that.$refs.devicePlayer.openDialog("media", deviceId, channelId, {
			streamInfo: res.data.data,
			hasAudio: channel.hasAudio
			@@ -320,8 +327,8 @@
			} else {
			let positions = [];
			for (let i = 0; i < channelPositions.length; i++) {
			if (channelPositions[i].cnLng * channelPositions[i].cnLat > 0) {
			positions.push([channelPositions[i].cnLng, channelPositions[i].cnLat])
			if (channelPositions[i][this.longitudeStr] * channelPositions[i][this.latitudeStr] > 0) {
			positions.push([channelPositions[i][this.longitudeStr], channelPositions[i][this.latitudeStr]])
			}

			}