Skip to content

Z
ZiBoYingJI
Commit b5070d72 authored by xinzhedeai's avatar xinzhedeai
Browse files
Options

Merge branch 'master' into rev2

parents 843542b9 2bf9672c
Hide whitespace changes
Inline Side-by-side
Showing with 164 additions and 47 deletions
public/datav/index.html
View file @ b5070d72
......@@ -120,8 +120,14 @@
margin-top:5vh;
width: 300px;
}
.a0a_ ul:first-child{margin-left:12vw;}
.a0a_ ul:last-child{margin-right:12vw;}
.a0a_ ul:first-child{
margin-left:12vw;
li{margin-right:50px;}
}
.a0a_ ul:last-child{
margin-right:12vw;
li{margin-left:50px;}
}
.a0a_ ul li{
cursor: pointer;
border-radius: 5px;
......@@ -136,7 +142,6 @@
border:1px solid green;
height:35px;
width:140px;
margin-left:50px;
}
.a0a_ ul .active{
background-image:url(static/img/h_btn_a.png);
......@@ -154,26 +159,58 @@
:class="isFullScreen?'tr-top':'tr-top-re'"
style="height: 120px;background-image: url('static/title.png');background-size: 100% 100%;">
<div style="margin-top: -44px;">中和地信企业管理平台</div>
<div class="floating-text">中和地信有限公司欢迎您</div>
<!-- <div class="floating-text">中和地信有限公司欢迎您</div> -->
<div class="a0a_" id="h_tab">
<ul>
<li data-id="1" class="active">应急管理</li>
<li data-id="2" class="" >自然资源</li></ul>
<!-- <div class="a0a_" id="h_tab">
<ul>
<li data-id="2" class="" >自然资源</li>
<li data-id="3" class="" >水利系统</li>
</ul>
<ul>
<li data-id="4" class="">电子档案</li>
<li data-id="5" class="" >后台管理</li>
</ul>
</div>
</div> -->
</div>
<!-- 选择列表 -->
<div class="selects" style="width:500px;text-align:center;position:relative;z-index:1000;margin:0 auto;padding-top:100px;">
<select style="margin:0 20px;">
<option value="1">淄博市</option>
</select>
<select style="margin:0 20px;">
<option value="370305">临淄区</option>
<option value="370306">周村区</option>
<option value="370302">淄川区</option>
<option value="370303">张店区</option>
<option value="370304">博山区</option>
<option value="370321">桓台县</option>
<option value="370322">高青县</option>
<option value="370323">沂源县</option>
</select>
<select style="margin:0 20px;" id="selectCompany">
<option value="1">请选择矿山企业</option>
<option value="2">测试企业1</option>
<option value="3">测试企业2</option>
<option value="4">测试企业3</option>
</select>
</div>
<div>
</div>
<div class="fixed flex-text maxIndex pointer" style="right: 30px;top: 45px;"
<!-- <div class="fixed flex-text maxIndex pointer" style="right: 30px;top: 45px;"
@click="gotoManagement()"
:class="isFullScreen?'tr-top':'tr-top-re'">
<img style="width: 24px;height: 24px;" src="static/backstage.png" alt="">
<div class="f20 color-theme ml10">后台管理</div>
</div> -->
<div class="fixed flex-text maxIndex pointer" style="left: 30px;top: 45px;"
@click="gotoManagement1()"
:class="isFullScreen?'tr-top':'tr-top-re'">
<img style="width: 24px;height: 24px;" src="static/backstage.png" alt="">
<div class="f20 color-theme ml10">返回分区页</div>
</div>
<div class="wp100 hv100 fixed" style="left: 0;top: 0;" id="map"></div>
......@@ -300,14 +337,14 @@
<!-- center -->
<div class="relative maxIndex flex-1" style="pointer-events:none;" :style="{ height: 980 / heightScale + 'px' }">
<div class="flex-text mt10" :style="{ transform: 'scale(' + (widthScale > 1 ? 1 : widthScale) + ')' }">
<div>
<div style="display:none;">
<!-- notice -->
<div class="wp100 h50 round flex-text pointer" style="background-color: rgba(13,27,48,.7);pointer-events:auto;">
<div class="flex-1" v-if="isReady">
<van-notice-bar background="none" left-icon="volume-o" color="#ffffff" :speed="80" :text="(notice.type?'【'+notice.type+'】':'')+notice.title" @click="noticeMask = true"/>
</div>
</div>
<div class="flex-text mt10">
<div style="width: 80px;" ref="control"></div>
<div class="h50 round flex-text pointer"
......@@ -988,14 +1025,10 @@
this.noticeIndex = this.noticeIndex + 1;
}, 10 * 1000);
// tab event
/* // tab event
var h_tab = this.$el.querySelector("#h_tab");
console.log('h_tab ________________ ', h_tab);
h_tab.onclick = function(e){
var tag = e.target || e.srcElement;
console.log('tag ________________ ', tag);
if(tag.nodeName === 'LI'){
var did = ~~tag.dataset.id;
......@@ -1003,9 +1036,18 @@
window.open('/datav/natural.html')
}else if(did === 3){
window.open('/datav/watersource.html')
}else if(did === 5){
window.open('/')
};
};
};
}; */
// 企业选择列表
var selectCompany = document.getElementById("selectCompany");
selectCompany.onchange = function(e){
var tag = e.target || e.srcElement;
window.location.reload()
}
},
methods: {
querySearchAsync(queryString, cb) {
......@@ -1040,6 +1082,10 @@
gotoManagement() {
window.open('http://192.168.13.200:8057', '_self')
},
gotoManagement1(){
window.location.href = '/#/login4Index';
},
// 设置地图
setMap() {
map = new AMap.Map('map', {
......
public/datav/natural.html
View file @ b5070d72
......@@ -92,11 +92,11 @@
background-size:auto 1.06rem;
display:flex;justify-content:center;pointer-events:none;
/* &:before{
&:before{
content:"";position:absolute;top:0;left:0;height:1.50rem;width:100%;
background:no-repeat top center url('static/natural/top_ttl.png');
background-size:100%;z-index:-1;
} */
}
h2{
font-size:.38rem;line-height:1;margin:.19rem 0 0 .04rem;font-weight:bold;
......@@ -160,7 +160,7 @@
border-color:transparent;
}
display:none;
//display:none;
}
}
}
......@@ -380,14 +380,18 @@
dt{
border:1px solid #04d6d9;border-radius:.04rem;
margin-top:.05rem;color:#3fecf1;
display:grid;grid-template-columns:33% 22% 15% 15% 15%;
display:grid;grid-template-columns:18.4% 18.4% 18.4% 14.2% 10% 10% 10%;
background-image:linear-gradient(to bottom, rgba(19,133,144,.5), rgba(19,133,144,.8));
span:first-child{text-align:center;}
}
dd{
margin-bottom:.08rem;color:#fff;margin-right:.03rem;
display:grid;grid-template-columns:33% 22% 15% 15% 15%;
span{margin-right:.10rem;display:flex;align-items:center;}
display:grid;grid-template-columns:18.4% 18.4% 18.4% 14.2% 10% 10% 10%;
span{
margin-right:.10rem;display:flex;align-items:center;
white-space:normal;
word-break:break-all;
}
span:first-child{justify-content:center;}
}
}
......@@ -407,11 +411,11 @@
height:5.02rem;
dl.scrolling4{
dt{
grid-template-columns:33.33% 33.33% 33.33%;
grid-template-columns:25% 25% 25% 25%;
span{text-align:center;}
}
dd{
grid-template-columns:33.33% 33.33% 33.33%;
grid-template-columns:25% 25% 25% 25%;
span{text-align:center;display:block;}
}
}
......@@ -421,11 +425,11 @@
height:4.20rem;
dl.scrolling4{
dt{
grid-template-columns:33.33% 33.33% 33.33%;
grid-template-columns:25% 25% 25% 25%;
span{text-align:center;}
}
dd{
grid-template-columns:33.33% 33.33% 33.33%;
grid-template-columns:25% 25% 25% 25%;
span{text-align:center;display:block;}
}
}
......@@ -765,27 +769,34 @@
</div>
<div class="a0a_" id="a0a_">
<ul>
<li><a href="/datav/index.html">返回首页</a></li>
<li><a href="/#/login4Index">返回分区页</a></li>
</ul>
<ul>
<li><a href="/#/dashboard">后台管理</a></li>
<!-- <li><a href="/#/dashboard">后台管理</a></li> -->
</ul>
</div>
<div class="selects">
<select>
<option value="1">淄川区</option>
<option value="2">张店区</option>
<select style="margin:0 20px;">
<option value="1">淄博市</option>
</select>
<select>
<option value="1">请选择区县</option>
<option value="2">2</option>
<select style="margin:0 20px;">
<option value="370305">临淄区</option>
<option value="370306">周村区</option>
<option value="370302">淄川区</option>
<option value="370303">张店区</option>
<option value="370304">博山区</option>
<option value="370321">桓台县</option>
<option value="370322">高青县</option>
<option value="370323">沂源县</option>
</select>
<select>
<select style="margin:0 20px;" id="selectCompany">
<option value="1">请选择矿山企业</option>
<option value="2">2</option>
<option value="2">测试企业1</option>
<option value="3">测试企业2</option>
<option value="4">测试企业3</option>
</select>
</div>
</div>
</header>
</div>
</div>
......@@ -808,6 +819,8 @@
<div class="wrap">
<dl class="scrolling4">
<dt>
<span>所属企业</span>
<span>所属矿山</span>
<span>站点编号</span>
<span>测点名称</span>
<span>X位移</span>
......@@ -815,6 +828,8 @@
<span>Z位移</span>
</dt>
<dd v-for="(item, i) in dm1.list">
<span>{{item.enterpriseName}}</span>
<span>{{item.mineName}}</span>
<span>{{item.code}}</span>
<span>{{item.name}}</span>
<span>{{item.x}}mm</span>
......@@ -862,11 +877,13 @@
<div class="wrap">
<dl class="scrolling4">
<dt>
<span>所属企业</span>
<span>站点编号</span>
<span>测点名称</span>
<span>实时温度</span>
</dt>
<dd v-for="(item, i) in dm3.list">
<span>{{item.enterpriseName}}</span>
<span>{{item.code}}</span>
<span>{{item.name}}</span>
<span>{{item.value}}°C</span>
......@@ -892,11 +909,13 @@
<div class="wrap">
<dl class="scrolling4">
<dt>
<span>站点编号</span>
<span>站点编号</span>
<span>测点名称</span>
<span>实时温度</span>
</dt>
<dd v-for="(item, i) in dm4.list">
<span>{{item.enterpriseName}}</span>
<span>{{item.code}}</span>
<span>{{item.name}}</span>
<span>{{item.value}}m/s</span>
......@@ -1213,8 +1232,15 @@
self.dm4 = res;
});
})();
// 企业选择列表
var selectCompany = document.getElementById("selectCompany");
selectCompany.onchange = function(e){
var tag = e.target || e.srcElement;
window.location.reload()
}
return ;
if (!token) {
window.open(host + '/#/login', '_self')
......@@ -1615,7 +1641,6 @@
console.log('destroyed ________________ ', 1111111111);
},
})
});
</script>
......
public/datav/watersource.html
View file @ b5070d72
......@@ -83,7 +83,7 @@
header{
position:absolute;top:0;left:0;height:0;width:100%;z-index:5;
display:flex;user-select:none;
display:flex;user-select:none;justify-content:center;
.b1_bg{
position:relative;height:1.06rem;width:100%;
......@@ -97,6 +97,12 @@
background:no-repeat top center url('static/water/top_ttl.png');
background-size:100%;z-index:-1;
} */
&:before{
content:"";position:absolute;top:.93rem;height:.58rem;width:6.27rem;
background:no-repeat top center url('static/water/top_ttl.png');
background-size:100%;z-index:-1;
}
h2{
font-size:.38rem;line-height:1;margin:.19rem 0 0 .04rem;font-weight:bold;
font-family:'element-icons';color:#fff;
......@@ -149,11 +155,22 @@
}
}
}
.selects{
display:flex;justify-content:center;
position:absolute;height:auto;width:6rem;top:1.05rem;padding-left:.20rem;
select{
margin-right:.20rem;
background-color:transparent;color:#59edff;
border-color:transparent;
}
//display:none;
}
}
}
}
.b_0{
display:flex;top:0.96rem;left:0;bottom:0;width:0;background-color:rgba(0,0,0,.15);z-index:2;
......@@ -777,12 +794,34 @@
</div>
<div class="a0a_" id="a0a_">
<ul>
<li><a href="/datav/index.html">返回首页</a></li>
<li><a href="/#/login4Index">返回分区页</a></li>
</ul>
<ul>
<li><a href="/#/dashboard">后台管理</a></li>
<!-- <li><a href="/#/dashboard">后台管理</a></li> -->
</ul>
</div>
<div class="selects">
<select style="margin:0 20px;">
<option value="1">淄博市</option>
</select>
<select style="margin:0 20px;">
<option value="370305">临淄区</option>
<option value="370306">周村区</option>
<option value="370302">淄川区</option>
<option value="370303">张店区</option>
<option value="370304">博山区</option>
<option value="370321">桓台县</option>
<option value="370322">高青县</option>
<option value="370323">沂源县</option>
</select>
<select style="margin:0 20px;" id="selectCompany">
<option value="1">请选择矿山企业</option>
<option value="2">测试企业1</option>
<option value="3">测试企业2</option>
<option value="4">测试企业3</option>
</select>
</div>
</header>
</div>
</div>
......@@ -808,7 +847,7 @@
<div class="a-md33" id="amd33">
<div class="abs-full">
<div class="m-tt">
<h4>位移报警趋势</h4>
<h4>24小时各监测点降水量</h4>
</div>
<div class="m-body">
<div class="wrap">
......@@ -1140,6 +1179,13 @@
});
})();
// 企业选择列表
var selectCompany = document.getElementById("selectCompany");
selectCompany.onchange = function(e){
var tag = e.target || e.srcElement;
window.location.reload()
}
return ;
if (!token) {
......
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