Skip to content

Y
yindong-tongbai-automation
Commit b3d3f843 authored by forevertyler's avatar forevertyler
Browse files
Options

add:进出区域的历史数据

parents 27c55706 7db1f784
Expand all Show whitespace changes
Inline Side-by-side
Showing with 745 additions and 73 deletions
.env.development
View file @ b3d3f843
...@@ -14,5 +14,5 @@ VUE_APP_BASE_API = '/dev-api' ...@@ -14,5 +14,5 @@ VUE_APP_BASE_API = '/dev-api'
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true
# 开发环境的后端接口地址 # 开发环境的后端接口地址
VUE_APP_API_TARGET = http://192.168.2.37:9091 VUE_APP_API_TARGET = http://192.168.2.14:9091
# VUE_APP_API_TARGET = http://localhost:8080 # VUE_APP_API_TARGET = http://localhost:8080
\ No newline at end of file
src/api/tyler/hjjc.js
View file @ b3d3f843
...@@ -8,7 +8,15 @@ export function getRealData(query) { ...@@ -8,7 +8,15 @@ export function getRealData(query) {
params: query, params: query,
}); });
} }
// 查询设备25H数据
export function getDeviceData(query) {
return request({
url: "/business/screen/env/deviceData",
method: "get",
params: query,
});
}
// 查询历史数据右上 // 查询历史数据右上
export function getRtData(query) { export function getRtData(query) {
return request({ return request({
...@@ -25,3 +33,12 @@ export function getRcData(query) { ...@@ -25,3 +33,12 @@ export function getRcData(query) {
params: query, params: query,
}); });
} }
// 查询设备位置
export function getDeviceStatus(query) {
return request({
url: "/business/screen/env/deviceStatus",
method: "get",
params: query,
});
}
src/views/Screen/items/hjjc.vue
View file @ b3d3f843
This diff is collapsed.
src/views/Screen/items/psxt.vue
View file @ b3d3f843
<template> <template>
<div class="app-container home"> <div class="app-container home">
<div id="cesiumContainer"></div> <div id="cesiumContainer">
<div class="center-title-box">
<div class="control-state">
<p>
<span class="icon-img"></span>
<span>已开启智能控制</span>
</p>
</div>
<div class="title-box top">
<p class="title">液体高度:10m</p>
<p class="name">蓄水池</p>
</div>
<div class="title-box center">
<p class="title">液体高度:10m</p>
<p class="name">二中水仓</p>
</div>
<div class="title-box bottom">
<p class="title">液体高度:10m</p>
<p class="name">五中水仓</p>
</div>
</div>
<div class="water-pump pst1">
<div class="H36">
<div class="button on">开启</div>
<div class="button off">关闭</div>
</div>
<div class="H164">
<div class="phd-left"></div>
<div class="phd-right">
<div class="phd-top"></div>
<div class="water-pump-img-left"></div>
<p>5#水泵</p>
</div>
</div>
</div>
<div class="water-pump pst2">
<div class="H36">
<div class="button on">开启</div>
<div class="button off">关闭</div>
</div>
<div class="H164">
<div class="phd-left"></div>
<div class="phd-right">
<div class="phd-top"></div>
<div class="water-pump-img-left"></div>
<p>5#水泵</p>
</div>
</div>
</div>
<div class="water-pump pst3">
<div class="H36">
<div class="button on">开启</div>
<div class="button off">关闭</div>
</div>
<div class="H164">
<div class="phd-right">
<div class="phd-top"></div>
<div class="water-pump-img-right"></div>
<p>5#水泵</p>
</div>
<div class="phd-left"></div>
</div>
</div>
<div class="water-pump pst4">
<div class="H36">
<div class="button on">开启</div>
<div class="button off">关闭</div>
</div>
<div class="H164">
<div class="phd-left"></div>
<div class="phd-right">
<div class="phd-top"></div>
<div class="water-pump-img-left"></div>
<p>5#水泵</p>
</div>
</div>
</div>
<div class="water-pump pst5">
<div class="H36">
<div class="button on">开启</div>
<div class="button off">关闭</div>
</div>
<div class="H164">
<div class="phd-left"></div>
<div class="phd-right">
<div class="phd-top"></div>
<div class="water-pump-img-left"></div>
<p>5#水泵</p>
</div>
</div>
</div>
<div class="water-pump pst6">
<div class="H36">
<div class="button on">开启</div>
<div class="button off">关闭</div>
</div>
<div class="H164">
<div class="phd-right">
<div class="phd-top"></div>
<div class="water-pump-img-right"></div>
<p>5#水泵</p>
</div>
<div class="phd-left"></div>
</div>
</div>
<div class="water-pump pst7">
<div class="H36">
<div class="button on">开启</div>
<div class="button off">关闭</div>
</div>
<div class="H164">
<div class="phd-right">
<div class="phd-top"></div>
<div class="water-pump-img-right"></div>
<p>5#水泵</p>
</div>
<div class="phd-left"></div>
</div>
</div>
</div>
</div> </div>
</template> </template>
<script> <script>
...@@ -27,6 +146,165 @@ export default { ...@@ -27,6 +146,165 @@ export default {
height: 745px; height: 745px;
background: url("~@/assets/images/screen/psxt/gd.png") no-repeat center; background: url("~@/assets/images/screen/psxt/gd.png") no-repeat center;
background-size: 1800px 745px; background-size: 1800px 745px;
position: relative;
.center-title-box {
width: 200px;
height: 100%;
margin: auto;
position: relative;
.control-state {
width: 260px;
height: 44px;
background: url("~@/assets/images/screen/psxt/bg1.png") no-repeat center;
background-size: 100% 100%;
position: absolute;
top: 33px;
left: 342px;
p {
font-weight: 400;
font-size: 20px;
color: #ffd929;
line-height: 44px;
margin: 0px;
text-align: center;
.icon-img {
background: url("~@/assets/images/screen/psxt/icon1.png") no-repeat
center;
width: 20px;
height: 20px;
display: inline-block;
margin-bottom: -4px;
margin-right: 10px;
}
}
}
.title-box {
text-align: center;
.title {
font-family: Source Han Sans SC;
font-weight: 400;
font-size: 18px;
color: #11e0ff;
}
.name {
font-weight: 400;
font-size: 20px;
color: #ffffff;
}
}
.top {
margin-top: -35px;
}
.center {
margin-top: 273px;
}
.bottom {
margin-top: 270px;
}
}
.water-pump {
position: absolute;
width: 172px;
height: 200px;
// background: #ffffff;
.H36 {
height: 36px;
.button {
width: 86px;
height: 36px;
float: left;
line-height: 36px;
text-align: center;
font-weight: bold;
font-size: 18px;
color: #96aeba;
line-height: 32px;
text-shadow: 0px 1px 4px rgba(5, 38, 68, 0.73);
border: 2px solid #d8efff;
border-radius: 2px;
background: RGBA(0, 26, 49, 1);
}
.on {
&.active {
background: url("~@/assets/images/screen/psxt/button.png") no-repeat
center;
color: #ffffff;
}
}
.off {
border-left: none;
&.active {
background: url("~@/assets/images/screen/psxt/button2.png")
no-repeat center;
color: #ffffff;
}
}
}
.H164 {
height: calc(100% - 36px);
.phd-left {
width: 50px;
height: calc(100% - 36px);
float: left;
}
.phd-right {
width: 122px;
height: calc(100% - 36px);
float: left;
.phd-top {
height: 40px;
}
.water-pump-img-left {
width: 122px;
height: 70px;
background: url("~@/assets/images/screen/psxt/item.png") no-repeat
center;
}
.water-pump-img-right {
width: 122px;
height: 70px;
background: url("~@/assets/images/screen/psxt/item1.png") no-repeat
center;
}
p {
font-weight: 400;
font-size: 20px;
color: #ffffff;
line-height: 30px;
text-align: center;
margin-top: 3px;
}
}
}
&.pst1 {
top: 139px;
left: 143px;
}
&.pst2 {
top: 139px;
left: 582px;
}
&.pst3 {
top: 139px;
left: 1408px;
}
&.pst4 {
top: 480px;
left: 0px;
}
&.pst5 {
top: 480px;
left: 440px;
}
&.pst6 {
top: 480px;
left: 1188px;
}
&.pst7 {
top: 480px;
left: 1630px;
}
}
} }
} }
</style> </style>
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