Skip to content

X
xt-whp
Commit 32dd9971 authored by jianqian's avatar jianqian
Browse files
Options

企业统计更新，一起一档修改

parent 2da12654
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 473 additions and 232 deletions
dcit-hcsystem-hcsystem-master/src/views/guarantee/dangerMap.vue
View file @ 32dd9971
<template>
<div class="gis">
<div class="gis" style="padding: 0px;">
<div id="mapbox">
<div style="position:absolute;left:-30px;top:10px">
<button @click="Mutil.tianSlA()" class="map-botton">卫星地图</button>
......@@ -871,7 +871,7 @@
background: url('../../assets/z3.png') 100% 100%;
position: absolute;
top: -0px;
right: 10px;
right: 0px;
}
.markBox .markbox-div {
......
dcit-hcsystem-hcsystem-master/src/views/qyMap/qyMap.vue
View file @ 32dd9971
<template>
<div class="gis">
<div class="gis" style="padding: 0px">
<div id="mapbox" style="margin: 0">
<div style="position:absolute;left:500px;top:10px">
<button @click="Mutil.tianSlA()" id="but1" class="map-botton">卫星地图</button>
......@@ -21,12 +21,12 @@
</div>
<div style="">
<div id="bluebox"
style="width: 500px;height: 100%;z-index: 11;background-color: rgba(2, 40, 90, 0.7);position: absolute;top: 0;left: 10px;float: left;">
style="width: 500px;height: 100%;z-index: 11;background-color: rgba(2, 40, 90, 0.7);position: absolute;top: 0;float: left;">
<QyMapone></QyMapone>
</div>
<div @click="kongzhi" id="bluebox2"
style="width: 30px;height: 10%;z-index: 11;background-color: rgba(2, 40, 90, 0.7);position: absolute;top: 0;left: 510px;float: left;top:45%">
<img style="height: 100%;width: 100%" src="@/assets/mark/markqy.png"/>
style="width: 30px;height: 8%;z-index: 11;background-color: rgba(2, 40, 90, 0.9);position: absolute;top: 0;left: 500px;float: left;top:45%;border-radius: 5px;">
<img id ="ko" style="height: 100%;width: 100%" src="@/assets/Subtract-1.png"/>
</div>
<div class="markBox">
......@@ -477,22 +477,24 @@
}
//隐藏企业信息
kongzhi(){
// var a = document.getElementById("bluebox").style.left;
//var a = document.getElementById("bluebox").style.left;
// this.kongzhi2(10)
var a = document.getElementById("bluebox").style.left
if(a=="10px"){
if(a=="0px"||a==''){
document.getElementById('ko').src = require('@/assets/Subtract.png');
document.getElementById("bluebox").style.left="-500px"
document.getElementById("bluebox2").style.left="10px"
document.getElementById("bluebox2").style.left="0px"
document.getElementById("but1").style.left="-450px"
document.getElementById("but2").style.left="-340px"
//console.log(document.getElementsByClassName("ol-unselectable").item(1));
this.removeClass(document.getElementsByClassName('ol-zoom').item(0), 'ol-zoom');
}else {
document.getElementById("bluebox").style.left="10px"
document.getElementById("bluebox2").style.left="510px"
document.getElementById("bluebox").style.left="0px"
document.getElementById("bluebox2").style.left="500px"
document.getElementById("but1").style.left="50px"
document.getElementById("but2").style.left="160px"
this.addClass(document.getElementsByClassName('ol-unselectable').item(1), 'ol-zoom');
document.getElementById('ko').src = require('@/assets/Subtract-1.png');
//this.addClass(document.getElementsByClassName('ol-unselectable').item(0), 'ol-zoom');
}
return;
......@@ -1204,7 +1206,7 @@
background: url('../../assets/z3.png') 100% 100%;
position: absolute;
top: -67px;
right: 10px;
right: 0px;
}
.markBox .markbox-div {
......
dcit-hcsystem-hcsystem-master/src/views/qyMap/qyMapone.vue
View file @ 32dd9971
......@@ -36,12 +36,12 @@
<div id="main2" style="width:450px;height:calc(100vh - 670px);"></div>
</div>
</dv-border-box-12>
<div class="div-table" style="width:480px;margin-top: 15px;background-color: rgb(0, 0, 0,0);position: fixed;bottom: 0;right: 0;margin-right: 20px;">
<div class="div-table" style="width:480px;margin-bottom: 20px;background-color: rgb(0, 0, 0,0);position: fixed;bottom: 0;right: 0;margin-right: 10px;">
<div style="width: 100%;height: 38px;text-align: left;font-size: 16px; line-height: 38px;color: #fff;font-weight: 900;background: #013056;opacity: 0.8;"><span style="margin-left: 10px;">预警信息</span></div>
<el-table :data="$data.tableData" stripe border :header-cell-style="{background:'#02285a',color:'#fff',}">
<el-table :data="$data.tableData" ref="tableList" stripe border :header-cell-style="{background:'#02285a',color:'#fff',}" >
<el-table-column prop="unitName" label="企业名称" width="110"></el-table-column>
<el-table-column prop="alarmInfo" label="预警信息" width="110">
<template slot-scope="scope">
<template slot-scope="scope" >
<font class="dg">{{scope.row.alarmInfo}}</font>
</template>
</el-table-column>
......@@ -96,12 +96,14 @@ echarts.use(
// require('echarts/lib/component/tooltip')
// require('echarts/lib/component/title')
import METHOD from "@/utils/methods";
import elTableInfiniteScroll from 'el-table-infinite-scroll';
import VueEllipseProgress from 'vue-ellipse-progress';
// Vue.prototype.$echarts = echarts;
Vue.use(VueEllipseProgress);
export default {
data(){
return{
tableData:[],
......@@ -120,19 +122,33 @@ export default {
this.getStatiData()
},
methods:{
getTableData() {
let that = this;
that.loading = true;
METHOD.axiosPost(
that,
`/alarmInfo/getAlarmInfoList`,{},
function(res) {
console.log(res)
if (res.code == 0) {
that.$data.tableData = res.data.pageData;
}
});
async getTableData() {
let that = this;
that.loading = true;
await METHOD.axiosPost(
that,
`/alarmInfo/getAlarmInfoList`,{},
function(res) {
console.log(res)
if (res.code == 0) {
that.$data.tableData = res.data.pageData;
that.goscroll();
}
});
},
goscroll(){
let _this = this;
let divData = this.$refs.tableList.bodyWrapper ;
console.log(divData)
this.dibiao_clear=setInterval(() => {
divData.scrollTop += 1
if (divData.clientHeight + divData.scrollTop == divData.scrollHeight) {
divData.scrollTop = 0
}
}, 100);
},
getStatiData() {
let that = this;
METHOD.axiosPost(
......
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