|
@@ -1,6 +1,6 @@
|
|
<template>
|
|
<template>
|
|
<div>
|
|
<div>
|
|
- <el-dialog :title="title" :visible.sync="TVWallVisible" v-if="TVWallVisible" customClass="TVWallCustomWidth"
|
|
|
|
|
|
+ <el-dialog :title="title" :visible.sync="TVWallVisible" v-if="TVWallVisible" customClass="TVWallCustomWidth1"
|
|
@close="cancelEventLocationShow()">
|
|
@close="cancelEventLocationShow()">
|
|
<!--<div @click="findCameraByEventCoordinate()">视频联动</div>-->
|
|
<!--<div @click="findCameraByEventCoordinate()">视频联动</div>-->
|
|
<!--<div class="forthis" style="width: 22%; position: absolute;left: 0;z-index: 9999999999999;">-->
|
|
<!--<div class="forthis" style="width: 22%; position: absolute;left: 0;z-index: 9999999999999;">-->
|
|
@@ -21,16 +21,18 @@
|
|
<!--<!–视频窗口展示---海康–>-->
|
|
<!--<!–视频窗口展示---海康–>-->
|
|
<!--<div id="playWnd" class="playWnd" style="left: 0px; top: 0px;"></div>-->
|
|
<!--<div id="playWnd" class="playWnd" style="left: 0px; top: 0px;"></div>-->
|
|
<!--</div>-->
|
|
<!--</div>-->
|
|
-
|
|
|
|
|
|
+ <div style="display: flex;">
|
|
<div id="dom1" class="dom1"></div>
|
|
<div id="dom1" class="dom1"></div>
|
|
<div class="leader-info-container" v-if="this.detail!=null">
|
|
<div class="leader-info-container" v-if="this.detail!=null">
|
|
- <!-- <img src="../../public/img-sample.png">-->
|
|
|
|
- <table class="leader-info-list-con" style="height: 100%; margin-bottom: 0" border="1px solid #ccc" cellpadding="0" cellspacing="0" >
|
|
|
|
- <div v-for="(value, key) in this.detail" :key="key">
|
|
|
|
- <tr><td class="td1 td-height-7">{{value.name}}:</td><td class="td2 td-height-7">{{value.value}}</td></tr>
|
|
|
|
- </div>
|
|
|
|
- </table>
|
|
|
|
|
|
+ <el-descriptions class="leader-info-list-con" style=" margin-bottom: 0" cellpadding="0" cellspacing="0" :column='1' border>
|
|
|
|
+ <el-descriptions-item v-for="item in this.detail"> <template slot="label">
|
|
|
|
+ <span> {{item.name}}</span>
|
|
|
|
+ </template>
|
|
|
|
+ {{item.value}}
|
|
|
|
+ </el-descriptions-item>
|
|
|
|
+ </el-descriptions>
|
|
</div>
|
|
</div>
|
|
|
|
+ </div>
|
|
</el-dialog>
|
|
</el-dialog>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
@@ -357,17 +359,10 @@ export default {
|
|
strMap.set(k,obj[k]);
|
|
strMap.set(k,obj[k]);
|
|
if(!this.detailList.includes(k))
|
|
if(!this.detailList.includes(k))
|
|
{
|
|
{
|
|
- let sroce={}
|
|
|
|
- if (k=='经度')
|
|
|
|
- {
|
|
|
|
- sroce={
|
|
|
|
- name:'经纬度',
|
|
|
|
- value:obj['经度']+','+obj['纬度']
|
|
|
|
- }
|
|
|
|
- }else { sroce={
|
|
|
|
|
|
+ let sroce ={
|
|
name:k,
|
|
name:k,
|
|
value:(obj[k]==null?'无':obj[k])
|
|
value:(obj[k]==null?'无':obj[k])
|
|
- }}
|
|
|
|
|
|
+ }
|
|
|
|
|
|
str.push(sroce)
|
|
str.push(sroce)
|
|
}
|
|
}
|
|
@@ -856,14 +851,13 @@ html, body {
|
|
margin-top: 100px;
|
|
margin-top: 100px;
|
|
margin-left: 80px;
|
|
margin-left: 80px;
|
|
}
|
|
}
|
|
-//电视墙视频摄像头预览弹层样式chuanSet
|
|
|
|
-.TVWallCustomWidth {
|
|
|
|
|
|
+//电视墙视频摄像头预览弹层样式
|
|
|
|
+.TVWallCustomWidth1 {
|
|
width: 1500px !important;
|
|
width: 1500px !important;
|
|
- height: 800px !important;
|
|
|
|
|
|
+ height: 750px !important;
|
|
background: #04080c !important;
|
|
background: #04080c !important;
|
|
box-shadow: $barShadow !important;
|
|
box-shadow: $barShadow !important;
|
|
border: 1px $barBorder !important;
|
|
border: 1px $barBorder !important;
|
|
-
|
|
|
|
.el-dialog__header {
|
|
.el-dialog__header {
|
|
padding: 15px 20px !important;
|
|
padding: 15px 20px !important;
|
|
background-image: -moz-linear-gradient($GradualGreen) !important;
|
|
background-image: -moz-linear-gradient($GradualGreen) !important;
|
|
@@ -876,8 +870,7 @@ html, body {
|
|
color: #3cd7ef !important;
|
|
color: #3cd7ef !important;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
- .leader-info-container {
|
|
|
|
|
|
+ .leader-info-container{
|
|
// padding: .5rem;
|
|
// padding: .5rem;
|
|
display: flex;
|
|
display: flex;
|
|
height: 650px;
|
|
height: 650px;
|
|
@@ -885,28 +878,25 @@ html, body {
|
|
overflow-y: scroll;
|
|
overflow-y: scroll;
|
|
flex-direction: column;
|
|
flex-direction: column;
|
|
padding: 0 1rem;
|
|
padding: 0 1rem;
|
|
-
|
|
|
|
- .leader-info-list-con {
|
|
|
|
|
|
+ .leader-info-list-con{
|
|
width: 100%;
|
|
width: 100%;
|
|
padding: 1rem;
|
|
padding: 1rem;
|
|
margin-bottom: .5rem;
|
|
margin-bottom: .5rem;
|
|
- background-image: -moz-linear-gradient($GradualGreen) !important;
|
|
|
|
|
|
+ background-image: -moz-linear-gradient($GradualGreen)!important;
|
|
background-image: -webkit-linear-gradient($GradualGreen) !important;
|
|
background-image: -webkit-linear-gradient($GradualGreen) !important;
|
|
- background-image: linear-gradient($GradualGreen) !important;
|
|
|
|
|
|
+ background-image: linear-gradient($GradualGreen)!important;
|
|
border: solid 1px #7dc2eb;
|
|
border: solid 1px #7dc2eb;
|
|
box-shadow: $shadowListHover !important;
|
|
box-shadow: $shadowListHover !important;
|
|
border-radius: 5px;
|
|
border-radius: 5px;
|
|
-
|
|
|
|
- h4 {
|
|
|
|
|
|
+ h4{
|
|
margin: .4rem 0;
|
|
margin: .4rem 0;
|
|
color: $white;
|
|
color: $white;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
- .leader-info-list-con:hover {
|
|
|
|
- background-image: -moz-linear-gradient($popupBG) !important;
|
|
|
|
|
|
+ .leader-info-list-con:hover{
|
|
|
|
+ background-image: -moz-linear-gradient($popupBG)!important;
|
|
background-image: -webkit-linear-gradient($popupBG) !important;
|
|
background-image: -webkit-linear-gradient($popupBG) !important;
|
|
- background-image: linear-gradient($popupBG) !important;
|
|
|
|
|
|
+ background-image: linear-gradient($popupBG)!important;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|