Commit c486786f authored by yaqizhang's avatar yaqizhang

大屏样式

parent 89e2fa50
...@@ -6,12 +6,10 @@ ...@@ -6,12 +6,10 @@
<button @click="Mutil.tianSlB()" class="map-botton">全景地图</button> <button @click="Mutil.tianSlB()" class="map-botton">全景地图</button>
</div> </div>
<div v-show="isShowVideo" v-drag style="display: none;position:absolute;left:1000px;top:10px;z-index: 30;padding: 10px; background-color: #fff;width: 400px;height: 300px;border-radius: 5px;border: 1px solid #000;"> <div v-show="isShowVideo" v-drag style="display: none;position:absolute;left:1000px;top:10px;z-index: 30;padding: 5px; background-color: rgba(2, 40, 90, 0.8);width: 400px;height: 255px;border-radius: 5px;border: 1px solid #000;">
<div style="width: 100%;height: 30px;"> <div style="width: 100%;height: 30px;">
<span @click="closeVideo" style="float: right;margin-right: 10px;font-size: 1.5rem;"class="el-icon-close"></span> <span style="float: left;color: #fff;font-size: 1rem;">{{deviceVideo.deviceName}}</span>
</div> <span @click="closeVideo" style="float: right;margin-right: 10px;font-size: 1.5rem;color: #fff;"class="el-icon-close"></span>
<div style="width: 100%;height: 35px;text-align: center;font-size: 1rem;font-weight: 900;">
<span>{{deviceVideo.deviceName}}</span>
</div> </div>
<div id="div_video"></div> <div id="div_video"></div>
</div> </div>
...@@ -62,7 +60,7 @@ ...@@ -62,7 +60,7 @@
</div> </div>
<div class="markbox-div"> <div class="markbox-div">
<el-tooltip content="职业危害场所" placement="left" effect="light"> <el-tooltip content="职业危害场所" placement="left" effect="light">
<div @click="mapweihai" ref="whimg" style="position: relative;"> <div ref="whimg" style="position: relative;">
<img width="20px" style="margin-top: 10px;" src="@/assets/mark/weihaichangsuo.png" /> <img width="20px" style="margin-top: 10px;" src="@/assets/mark/weihaichangsuo.png" />
<!-- <img src="@/assets/mark/selected.png" alt="" style="position: absolute;width: 16px; top: 0;right: 0"> --> <!-- <img src="@/assets/mark/selected.png" alt="" style="position: absolute;width: 16px; top: 0;right: 0"> -->
</div> </div>
...@@ -70,11 +68,11 @@ ...@@ -70,11 +68,11 @@
</el-tooltip> </el-tooltip>
</div> </div>
<div class="markbox-span"> <div class="markbox-span">
<span>2</span> <span>0</span>
</div> </div>
<div class="markbox-div"> <div class="markbox-div">
<el-tooltip content="隐患" placement="left" effect="light"> <el-tooltip content="隐患" placement="left" effect="light">
<div @click="mapyinhuan" ref="yhimg" style="position: relative;"> <div ref="yhimg" style="position: relative;">
<img width="20px" style="margin-top: 10px;" src="@/assets/mark/yinhuan.png" /> <img width="20px" style="margin-top: 10px;" src="@/assets/mark/yinhuan.png" />
<!-- <img src="@/assets/mark/selected.png" alt="" style="position: absolute;width: 16px; top: 0;right: 0"> --> <!-- <img src="@/assets/mark/selected.png" alt="" style="position: absolute;width: 16px; top: 0;right: 0"> -->
</div> </div>
...@@ -82,7 +80,7 @@ ...@@ -82,7 +80,7 @@
</el-tooltip> </el-tooltip>
</div> </div>
<div class="markbox-span"> <div class="markbox-span">
<span>2</span> <span>0</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -164,6 +162,7 @@ export default class GIS extends Vue { ...@@ -164,6 +162,7 @@ export default class GIS extends Vue {
@Provide() shipinVisble: boolean = true; @Provide() shipinVisble: boolean = true;
@Provide() weihaiVisble: boolean = true; @Provide() weihaiVisble: boolean = true;
@Provide() yinhuanVisble: boolean = true; @Provide() yinhuanVisble: boolean = true;
@Provide() treecheckedObj: any = {};
getMapData() { getMapData() {
let that = this; let that = this;
...@@ -273,18 +272,18 @@ export default class GIS extends Vue { ...@@ -273,18 +272,18 @@ export default class GIS extends Vue {
getshipinWindowInfo(deviceId: string) { getshipinWindowInfo(deviceId: string) {
let that = this; let that = this;
this.closeVideo(); this.closeVideo();
METHOD.axiosGet( METHOD.axiosGet(
that, that,
`/safetyDeviceInfo/getSafetyDeviceInfoById/${deviceId}`, `/safetyDeviceInfo/getSafetyDeviceInfoById/${deviceId}`,
function (res: any) { function (res: any) {
if (res.code == 0) { if (res.code == 0) {
that.treecheckedObj = res.data;
that.deviceVideo = res.data; that.deviceVideo = res.data;
let device = res.data; let device = res.data;
that.isShowVideo=true; that.isShowVideo=true;
that.player.play('http://27.128.189.137:18000/flv/hls/stream_88_0.flv' , 1); that.player.play('http://27.128.189.137:18000/flv/hls/' + that.treecheckedObj.deviceNumber + '.flv' , 1);
that.lastVideoPlayId="stream_88_0";//记录上次播放的视频ID that.lastVideoPlayId=that.treecheckedObj.deviceNumber;//记录上次播放的视频ID
console.log(device,"de-----")
} }
} }
); );
...@@ -513,20 +512,6 @@ export default class GIS extends Vue { ...@@ -513,20 +512,6 @@ export default class GIS extends Vue {
this.shipinVisble=true; this.shipinVisble=true;
this.$refs.shipinimg.lastChild.style.display = "block"; this.$refs.shipinimg.lastChild.style.display = "block";
} }
}
mapweihai(){
if(this){
this.$refs.whimg.lastChild.style.display = "none";
}else{
this.$refs.whimg.lastChild.style.display = "block";
}
}
mapyinhuan(){
if(this){
this.$refs.yhimg.lastChild.style.display = "none";
}else{
this.$refs.yhimg.lastChild.style.display = "block";
}
} }
getStatiData() { getStatiData() {
let that = this; let that = this;
...@@ -579,13 +564,13 @@ export default class GIS extends Vue { ...@@ -579,13 +564,13 @@ export default class GIS extends Vue {
shipinlngSum += ele.longitude; shipinlngSum += ele.longitude;
shipinlatSum += ele.latitude; shipinlatSum += ele.latitude;
}); });
let shipincenter = [ // let center = [
shipinlngSum / this.shipinmapData.length, // shipinlngSum / that.shipinmapData.length,
shipinlatSum / this.shipinmapData.length, // shipinlatSum / that.shipinmapData.length,
]; // ];
that.Mutil.setViewF({ // that.Mutil.setViewF({
center: shipincenter // center: center
}) // })
} }
} }
} }
......
...@@ -133,7 +133,6 @@ export default { ...@@ -133,7 +133,6 @@ export default {
{ cityId: "", countyId: "", provinceId: "" }, { cityId: "", countyId: "", provinceId: "" },
function (res) { function (res) {
if (res.code == 0) { if (res.code == 0) {
console.log(res,"res")
that.$data.enterpriseRegNum = res.data.enterpriseRegNum; that.$data.enterpriseRegNum = res.data.enterpriseRegNum;
that.$data.enterpriseCheckIngNum = res.data.enterpriseCheckIngNum; that.$data.enterpriseCheckIngNum = res.data.enterpriseCheckIngNum;
} }
...@@ -243,21 +242,20 @@ export default { ...@@ -243,21 +242,20 @@ export default {
/* height: 100%; */ /* height: 100%; */
padding: 0px !important; padding: 0px !important;
} }
.div-table .el-table tr >td { .pie .div-table .el-table tr >td {
background-color: #0b356d !important; background-color: #0b356d !important;
color: #fff; color: #fff;
border: 1px solid #8ec5fc; border: 1px solid #2e6099;
height: 50px; height: 50px;
padding: 4px 0 !important; padding: 4px 0 !important;
} }
.el-table th, .el-table tr { .pie .div-table .el-table tr >th {
background-color: #0b356d !important; border: 1px solid #2e6099;
}
.div-table .el-table tr >th {
border: 1px solid #8ec5fc;
} }
.div-table .el-table tr:hover >td { .pie .div-table .el-table tr:hover >td {
background-color: #2c5794 !important; background-color: #2c5794 !important;
/* color: #fff; */ }
.pie .div-table .el-table--border, .el-table--group {
border: 1px solid #2e6099 !important;
} }
</style> </style>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment