Commit 8b4a1cd5 authored by yaqizhang's avatar yaqizhang

大屏右下角

parent d5eb15a4
...@@ -64,23 +64,6 @@ ...@@ -64,23 +64,6 @@
<el-table-column prop="" label="监管分类"></el-table-column> <el-table-column prop="" label="监管分类"></el-table-column>
<el-table-column prop="" label="危险源数量"></el-table-column> <el-table-column prop="" label="危险源数量"></el-table-column>
<el-table-column prop="" label="企业地址"> <el-table-column prop="" label="企业地址">
<!-- <template slot-scope="scope">
<font v-if="scope.row.accountStatus === '0'" class="colorM">
<i class="iconfont iconzhengchang"></i> 正常
</font>
<font v-else-if="scope.row.accountStatus == 2" class="colorP">
<i class="iconfont iconsuoding"></i> 已锁定
</font>
<font v-else-if="scope.row.accountStatus == 1" class="colorR">
<i class="iconfont iconicon_huabanfuben"></i> 已删除
</font>
<font v-else-if="scope.row.accountStatus == 3" class="colorP">
<i class="iconfont iconshenhe"></i> 审核中
</font>
<font v-else-if="scope.row.accountStatus == 4" class="colorR">
<i class="iconfont iconweitongguo"></i> 审核未通过
</font>
</template> -->
</el-table-column> </el-table-column>
<el-table-column label="操作" width="170" align="center"> <el-table-column label="操作" width="170" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
......
...@@ -65,18 +65,18 @@ ...@@ -65,18 +65,18 @@
<div class="markBox"> <div class="markBox">
<div style="float: left;background-color: aquamarine;text-align: center;"> <div class="markbox-div">
<el-tooltip :disabled="disabled" content="企业注册" placement="left" effect="light" style="margin-left: 25%;"> <el-tooltip :disabled="disabled" content="企业注册" placement="left" effect="light">
<div @click="mapqiye"> <div class="markbox-click" @click="mapqiye">
<img width="15px" src="@/assets/mark/markqy.png" /> <img width="15px" src="@/assets/mark/markqy.png" />
</div> </div>
</el-tooltip> </el-tooltip>
</div> </div>
<div style="float: right;text-align: center;line-height: ;"> <div class="markbox-span">
<span>{{tjNumberObj.enterpriseRegNum}}</span> <span>{{tjNumberObj.enterpriseRegNum}}</span>
</div> </div>
<div style="float: left;text-align: center;"> <div class="markbox-div">
<el-tooltip :disabled="disabled" content="危险源" placement="left" effect="light"> <el-tooltip :disabled="disabled" content="危险源" placement="left" effect="light">
<div @click="mapwxy"> <div @click="mapwxy">
<img width="20px" src="@/assets/mark/weixianyuan.png" /> <img width="20px" src="@/assets/mark/weixianyuan.png" />
...@@ -84,10 +84,10 @@ ...@@ -84,10 +84,10 @@
</el-tooltip> </el-tooltip>
</div> </div>
<div style="float: right;"> <div class="markbox-span">
<span>{{tjNumberObj.dangerNum}}</span> <span>{{tjNumberObj.dangerNum}}</span>
</div> </div>
<div style="float: left;"> <div class="markbox-div">
<el-tooltip :disabled="disabled" content="监控监测点" placement="left" effect="light"> <el-tooltip :disabled="disabled" content="监控监测点" placement="left" effect="light">
<div @click="mapshipin"> <div @click="mapshipin">
<img width="20px" src="@/assets/mark/jiankong.png" /> <img width="20px" src="@/assets/mark/jiankong.png" />
...@@ -95,10 +95,10 @@ ...@@ -95,10 +95,10 @@
</el-tooltip> </el-tooltip>
</div> </div>
<div style="float: right;"> <div class="markbox-span">
<span>{{tjNumberObj.cameraNum}}</span> <span>{{tjNumberObj.cameraNum}}</span>
</div> </div>
<div style="float: left;"> <div class="markbox-div">
<el-tooltip :disabled="disabled" content="职业危害场所" placement="left" effect="light"> <el-tooltip :disabled="disabled" content="职业危害场所" placement="left" effect="light">
<div> <div>
<img width="20px" src="@/assets/mark/weihaichangsuo.png" /> <img width="20px" src="@/assets/mark/weihaichangsuo.png" />
...@@ -106,10 +106,10 @@ ...@@ -106,10 +106,10 @@
</el-tooltip> </el-tooltip>
</div> </div>
<div style="float: right;"> <div class="markbox-span">
<span>2</span> <span>2</span>
</div> </div>
<div style="float: left;"> <div class="markbox-div">
<el-tooltip :disabled="disabled" content="隐患" placement="left" effect="light"> <el-tooltip :disabled="disabled" content="隐患" placement="left" effect="light">
<div> <div>
<img width="20px" src="@/assets/mark/yinhuan.png" /> <img width="20px" src="@/assets/mark/yinhuan.png" />
...@@ -117,17 +117,10 @@ ...@@ -117,17 +117,10 @@
</el-tooltip> </el-tooltip>
</div> </div>
<div style="float: right;"> <div class="markbox-span">
<span>2</span> <span>2</span>
</div> </div>
</div> </div>
<!-- <div id="pieReport" style="width: 480px;height: 200px;background-color: rgba(2, 20, 44, 0.5);margin-top: 30px;margin-left: 10px;"></div>
<div id="pieReport" style="width: 480px;height: 250px;background-color: rgba(2, 20, 44, 0.5);margin-top: 30px;margin-left: 10px;"></div>
<div id="pieReport" style="width: 480px;height: 250px;background-color: rgba(2, 20, 44, 0.5);margin-top: 30px;margin-left: 10px;"></div> -->
<!-- <QyMaptwo></QyMaptwo> -->
<!-- </div> -->
</div> </div>
</div> </div>
</template> </template>
...@@ -202,9 +195,9 @@ export default class GIS extends Vue { ...@@ -202,9 +195,9 @@ export default class GIS extends Vue {
@Provide() mouseTool: any; //测量工具 @Provide() mouseTool: any; //测量工具
@Provide() toolVisble: boolean = false; @Provide() toolVisble: boolean = false;
@Provide() tjNumberObj: any = {}; @Provide() tjNumberObj: any = {};
@Provide() qiyeVisble: boolean = true; @Provide() qiyeVisble: boolean = false;
@Provide() wxyVisble: boolean = true; @Provide() wxyVisble: boolean = false;
@Provide() shipinVisble: boolean = true; @Provide() shipinVisble: boolean = false;
getMapData() { getMapData() {
let that = this; let that = this;
...@@ -629,46 +622,7 @@ export default class GIS extends Vue { ...@@ -629,46 +622,7 @@ export default class GIS extends Vue {
.map-botton:nth-child(3){ .map-botton:nth-child(3){
left:270px; left:270px;
} }
/* // .BoxWrap{
// width: 200px;
// height: 200px;
// position: relative;
// }
// .horn{
// position: absolute;
// width: 100%;
// height: 100%;
// border:1px solid #00d3e7;
// }
// .horn>div{
// width: 10px;
// height: 10px;
// position:absolute;
// }
// .horn .lt{
// border-top: 3px solid #00d3e7;
// border-left: 3px solid #00d3e7;
// left: -2px;
// top: -2px;
// }
// .horn .rt{
// border-top: 3px solid #00d3e7;
// border-right: 3px solid #00d3e7;
// right: -2px;
// top: -2px;
// }
// .horn .rb{
// border-bottom:3px solid #00d3e7;
// border-right: 3px solid #00d3e7;
// right: -2px;
// bottom: -2px;
// }
// .horn .lb{
// border-bottom:3px solid #00d3e7;
// border-left: 3px solid #00d3e7;
// left: -2px;
// bottom: -2px;
// } */
#mapbox { #mapbox {
width: 100%; width: 100%;
height: 100%; height: 100%;
...@@ -689,15 +643,23 @@ export default class GIS extends Vue { ...@@ -689,15 +643,23 @@ export default class GIS extends Vue {
bottom: 10px; bottom: 10px;
right: 20px; right: 20px;
} }
.markBox div{ .markBox .markbox-div{
float: left;
width: 50%; width: 50%;
height: 50px; height: 50px;
text-align: center; text-align: center;
/* background: url(selected.png) right top no-repeat !important; */ background: url(selected.png) right top no-repeat !important;
background-size: 16px !important; background-size: 16px !important;
} }
.markBox span{ .markBox .markbox-span{
float: right; float: right;
width: 50%;
height: 50px;
text-align: center;
line-height: 50px;
font-size: 2rem;
font-family: 'UnidreamLED';
color: #fff;
} }
.markBox div img{ .markBox div img{
width: 25px; width: 25px;
......
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