Skip to content

W
web-project
Commit 355b05f8 authored by qjeslks's avatar qjeslks
Browse files
Options

Merge branch 'master' of https://gitee.com/tj-wang-yahui/AMS_HeatSys_Vue_V10

parents ae7e1c51 aa61b149
Hide whitespace changes
Inline Side-by-side
Showing with 325 additions and 130 deletions
public/config.js
View file @ 355b05f8
export const ExternalSERVEICE='http://218.69.97.198:8001'
export const WithinSERVEICE='http://192.168.1.252:8001'
// export const ExternalSERVEICE='http://localhost:5013'
// export const WithinSERVEICE='http://localhost:5013'
// export const ExternalSERVEICE='http://218.69.97.198:8001'
// export const WithinSERVEICE='http://192.168.1.252:8001'
export const ExternalSERVEICE='http://localhost:5013'
export const WithinSERVEICE='http://localhost:5013'
export const CURRLOGO="LOGO_gangyi.png"
src/App.vue
View file @ 355b05f8
......@@ -8,14 +8,14 @@
padding: 0;
width: 100%;
height:100%;
overflow: hidden;
overflow:hidden;
text-align: left;
min-height: 100vh;
max-width: 100vw;
/* display: flex;
flex-direction: column; */
}
/*
::-webkit-scrollbar {
width: 0 !important;
}
......@@ -23,8 +23,8 @@
width: 0 !important;
height: 0;
}
::-webkit-scrollbar {
/*隐藏滚轮*/
::-webkit-scrollbar {
隐藏滚轮
display: none;
}
}*/
</style>
src/components/screenDisplay.vue
View file @ 355b05f8
......@@ -270,25 +270,20 @@ import AMapLoader from "@amap/amap-jsapi-loader";
<table v-show="menuGYTransfer == 1">
<tr>
<th>名称</th>
<th v-for="item in gYTransferHeatUC" :key="item.transferId">
{{ item.transferName }}
</th>
<th>平均温度℃</th>
<th>热单耗W/㎡</th>
</tr>
<tr>
<td>平均温度℃</td>
<td v-for="item in gYTransferHeatUC" :key="item.transferId">
<span v-if="item.temperature != 0">{{
parseFloat(item.temperature).toFixed(2)
}}</span>
<span v-else>-</span>
</td>
<tr v-for="item in gYTransferHeatUC" :key="item.transferId">
<td>{{ item.transferName }}</td>
<td>{{ item.temperature }}</td>
<td>{{ item.uc }}</td>
</tr>
<tr>
<!-- <tr>
<td>热单耗W/㎡</td>
<td v-for="item in gYTransferHeatUC" :key="item.transferId">
{{ item.uc }}
</td>
</tr>
</tr> -->
</table>
</div>
</div>
......@@ -345,7 +340,6 @@ import {
postTransferOpenValue,
postGYSupplyHeatUCDeviation,
} from "../api/screenDisplay";
export default defineComponent({
components: {},
data() {
......@@ -418,10 +412,21 @@ export default defineComponent({
this.login();
window.onresize = function () {
location.reload();
myChart.resize();
//myChart.resize();
};
},
methods: {
// 百度转换高德
bd_decrypt(bd_lng, bd_lat) {
var X_PI = (Math.PI * 3000.0) / 180.0;
var x = bd_lng - 0.0065;
var y = bd_lat - 0.006;
var z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * X_PI);
var theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * X_PI);
var gg_lng = z * Math.cos(theta);
var gg_lat = z * Math.sin(theta);
return { lng: gg_lng, lat: gg_lat };
},
mapinit: function () {
//let map = null;
let _this = this;
......@@ -448,11 +453,17 @@ export default defineComponent({
});
this.servicCenterList.forEach((element, index) => {
const amapGps = this.bd_decrypt(
element.longitude,
element.latitude
);
this.markerFun(
_this.map,
element.centerId,
element.longitude,
element.latitude,
amapGps.lng,
amapGps.lat,
// element.longitude,
// element.latitude,
element.centerName,
element.realHeat,
element.area,
......@@ -509,7 +520,7 @@ export default defineComponent({
'<div class="custom-content-marker markerPoints" id="' +
markerId +
'">' +
' <img src="/imgs/Gis/points1.png">' +
' <img src="/images/points1.png">' +
"</div>";
break;
case 2:
......@@ -518,7 +529,7 @@ export default defineComponent({
'<div class="custom-content-marker markerPoints" id="' +
markerId +
'">' +
' <img src="/imgs/Gis/points2.png">' +
' <img src="/images/points2.png">' +
"</div>";
break;
case 3:
......@@ -527,7 +538,7 @@ export default defineComponent({
'<div class="custom-content-marker markerPoints" id="' +
markerId +
'">' +
' <img src="/imgs/Gis/points3.png">' +
' <img src="/images/points3.png">' +
"</div>";
break;
}
......@@ -612,8 +623,8 @@ export default defineComponent({
// uuid: "04da48c6-99f9-4370-a33d-9cfcf67b59b7",
// };
// getToken(params).then((res) => {
// if (res.message == "操作成功") {
// sessionStorage.setItem("token", res.data.token);
//if (res.success === true) {
//sessionStorage.setItem("token", res.data.token);
this.postServicCenterList(); //获取服务中心列表
this.getForecast(); //获取室外温度
this.postGYPipeReal(); //获取实时数据
......@@ -623,15 +634,15 @@ export default defineComponent({
this.postGYSupplyWater(); //获取前12小时一次补水量曲线
this.postTransferOpenValue(); //换热站机组一网电调阀开度分布
this.postGYSupplyHeatUCDeviation(); //度日数热耗
// } else {
// console.log(res.message);
// }
// });
// } else {
// console.log(res.message);
// }
// });
},
//获取服务中心列表
postServicCenterList() {
postServicCenterList().then((res) => {
if (res.message == "操作成功" && res.status != 9) {
postServicCenterList().then((res) => {
if (res.success === true) {
this.servicCenterList = res.data;
this.servicCenterList.forEach((element, index) => {
element.markerId = "marker1_" + index;
......@@ -648,7 +659,7 @@ export default defineComponent({
postSupplylist(map, id, index) {
let _this = this;
postSupplylist(id).then((res) => {
if (res.message == "操作成功" && res.status != 9) {
if (res.success === true) {
this.supplylistList = res.data;
this.supplylistList.forEach((element, index) => {
element.markerId = "marker2_" + index;
......@@ -658,11 +669,17 @@ export default defineComponent({
res.data.forEach((element, index) => {
if (!element.openF) {
this.mapLevel = 2;
const amapGps = this.bd_decrypt(
element.longitude,
element.latitude
);
this.markerFun(
map,
element.supplyId,
element.longitude,
element.latitude,
// element.longitude,
// element.latitude,
amapGps.lng,
amapGps.lat,
element.supplyName,
element.realHeat,
element.area,
......@@ -702,7 +719,7 @@ export default defineComponent({
postTransferList(map, id, index) {
let _this = this;
postTransferList(id).then((res) => {
if (res.message == "操作成功" && res.status != 9) {
if (res.success === true) {
_this.transferList = res.data;
_this.transferList.forEach((element, index) => {
element.markerId = "marker3_" + index;
......@@ -712,11 +729,25 @@ export default defineComponent({
res.data.forEach((element, index) => {
if (!element.openF) {
this.mapLevel = 3;
const amapGps = this.bd_decrypt(
element.longitude,
element.latitude
);
console.log(amapGps);
if (amapGps.lng == NaN) {
amapGps.lng = element.location;
}
if (amapGps.lat == NaN) {
amapGps.lat = element.latitude;
}
console.log(amapGps);
this.markerFun(
map,
element.supplyId,
element.longitude,
element.latitude,
amapGps.lng,
amapGps.lat,
// element.longitude,
// element.latitude,
element.transferName,
element.realHeat,
element.area,
......@@ -742,7 +773,7 @@ export default defineComponent({
getForecast() {
getForecast().then((res) => {
this.leftLayer1Nodata = true;
if (res.message == "操作成功" && res.status != 9) {
if (res.success === true) {
res.data.forEach((element) => {
this.temperature.push(element.temperature);
});
......@@ -758,7 +789,7 @@ export default defineComponent({
//获取实时数据
postGYPipeReal() {
postGYPipeReal().then((res) => {
if (res.message == "操作成功" && res.status != 9) {
if (res.success === true) {
this.gYPipeReal = res.data;
} else if (res.status == 9) {
setInterval(function () {
......@@ -770,7 +801,7 @@ export default defineComponent({
//获取换热站工况数据接口1 -- 阀门开度
postGYTransferValue() {
postGYTransferValue().then((res) => {
if (res.message == "操作成功" && res.status != 9) {
if (res.success === true) {
this.gYTransferValue = res.data;
} else if (res.status == 9) {
setInterval(function () {
......@@ -782,7 +813,7 @@ export default defineComponent({
//获取换热站工况数据接口2 -- 热单耗
postGYTransferHeatUC(h) {
postGYTransferHeatUC(h).then((res) => {
if (res.message == "操作成功" && res.status != 9) {
if (res.success === true) {
this.gYTransferHeatUC = res.data;
} else if (res.status == 9) {
setInterval(function () {
......@@ -794,7 +825,7 @@ export default defineComponent({
//智慧调控
postAreaList() {
postAreaList().then((res) => {
if (res.message == "操作成功" && res.status != 9) {
if (res.success === true) {
this.areaList = res.data[0];
} else if (res.status == 9) {
setInterval(function () {
......@@ -806,7 +837,7 @@ export default defineComponent({
//度日数热耗
postGYSupplyHeatUCDeviation: function () {
postGYSupplyHeatUCDeviation().then((res) => {
if (res.message == "操作成功" && res.status != 9) {
if (res.success === true) {
let _this = this;
this.gYSupplyHeatUCDeviationSupplyName = [];
this.gYSupplyHeatUCDeviation = res.data;
......@@ -832,7 +863,7 @@ export default defineComponent({
postGYSupplyWater() {
postGYSupplyWater().then((res) => {
this.rightLayer2Nodata = true;
if (res.message == "操作成功" && res.status != 9) {
if (res.success === true) {
if (res.data.length == 0) {
this.rightLayer2Nodata = false;
return false;
......@@ -889,64 +920,63 @@ export default defineComponent({
//换热站机组一网电调阀开度分布
postTransferOpenValue() {
postTransferOpenValue().then((res) => {
console.log(res);
this.rightLayer4Nodata = true;
this.transferCount = [];
this.transferOpenValueLegend = [];
if (res.success === true) {
this.transferOpenValue = res.data;
// this.transferOpenValue = {
// success: true,
// status: 0,
// message: "操作成功",
// data: [
// {
// supplyId: "a523dc33-c8b8-41c2-9751-a32083627344",
// supplyName: "重阳里供热站",
// transferCount: 3,
// percentage0: 3,
// percentage25: 0,
// percentage50: 0,
// percentage75: 0,
// },
// {
// supplyId: "ccfb0595-86f7-4c0a-a134-8e945180ee48",
// supplyName: "行政区供热站",
// transferCount: 21,
// percentage0: 21,
// percentage25: 0,
// percentage50: 0,
// percentage75: 0,
// },
// {
// supplyId: "33104782-c1ad-432c-953e-e31c2e031be4",
// supplyName: "福苑里供热站",
// transferCount: 27,
// percentage0: 18,
// percentage25: 1,
// percentage50: 8,
// percentage75: 0,
// },
// {
// supplyId: "dfa20074-8731-457f-b63f-4e1858cfe266",
// supplyName: "东部供热站",
// transferCount: 84,
// percentage0: 49,
// percentage25: 1,
// percentage50: 13,
// percentage75: 21,
// },
// {
// supplyId: "b354f45b-23e5-42be-a210-0fb92394f457",
// supplyName: "小王庄供热站",
// transferCount: 6,
// percentage0: 6,
// percentage25: 0,
// percentage50: 0,
// percentage75: 0,
// },
// ],
// };
// this.transferOpenValue = {
// success: true,
// status: 0,
// message: "操作成功",
// data: [
// {
// supplyId: "a523dc33-c8b8-41c2-9751-a32083627344",
// supplyName: "重阳里供热站",
// transferCount: 3,
// percentage0: 3,
// percentage25: 0,
// percentage50: 0,
// percentage75: 0,
// },
// {
// supplyId: "ccfb0595-86f7-4c0a-a134-8e945180ee48",
// supplyName: "行政区供热站",
// transferCount: 21,
// percentage0: 21,
// percentage25: 0,
// percentage50: 0,
// percentage75: 0,
// },
// {
// supplyId: "33104782-c1ad-432c-953e-e31c2e031be4",
// supplyName: "福苑里供热站",
// transferCount: 27,
// percentage0: 18,
// percentage25: 1,
// percentage50: 8,
// percentage75: 0,
// },
// {
// supplyId: "dfa20074-8731-457f-b63f-4e1858cfe266",
// supplyName: "东部供热站",
// transferCount: 84,
// percentage0: 49,
// percentage25: 1,
// percentage50: 13,
// percentage75: 21,
// },
// {
// supplyId: "b354f45b-23e5-42be-a210-0fb92394f457",
// supplyName: "小王庄供热站",
// transferCount: 6,
// percentage0: 6,
// percentage25: 0,
// percentage50: 0,
// percentage75: 0,
// },
// ],
// };
var arr1 = [];
var arr2 = [];
var arr3 = [];
......@@ -1522,7 +1552,7 @@ export default defineComponent({
width: 95%;
height: 35px;
margin: 4% 0 0 5%;
background: url("/imgs/Gis/title_bg.png") top left no-repeat;
background: url("/images/title_bg.png") top left no-repeat;
}
.titleStyle p {
padding: 1% 5% 0 5%;
......@@ -1586,12 +1616,12 @@ export default defineComponent({
font-weight: bolder;
}
.btnGroup .btn1 {
background: url("/imgs/Gis/icon_btn1.png") center center no-repeat;
background: url("/images/icon_btn1.png") center center no-repeat;
color: #ffffff;
margin-bottom: 10px;
}
.btnGroup .btn2 {
background: url("/imgs/Gis/icon_btn2.png") center center no-repeat;
background: url("/images/icon_btn2.png") center center no-repeat;
color: #000000;
}
.jkBarBlock {
......
src/main.js
View file @ 355b05f8
import { createApp } from 'vue'
import './style/style.css'
import './style/index.less'
import './style/style.css'
import './style/index.less'
import './assets/css/main.css'
//import { detectZoom } from '@/plugins/screen';
// 引入Element Plus
import ElementPlus from 'element-plus'
......@@ -29,24 +30,6 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
}
app.component('Notification', Notification)
// app.config.globalProperties.$notify = (message, type = 'info') => {
// // 创建一个通知实例
// const NotificationConstructor = app.component('Notification')
// const notificationInstance = new NotificationConstructor({
// el: document.createElement('div'),
// propsData: { message, type }
// })
// // 添加到文档体中
// document.body.appendChild(notificationInstance.$el)
// // 自动关闭逻辑（例如：2秒后关闭）
// setTimeout(() => {
// notificationInstance.$el.remove()
// notificationInstance.$destroy()
// }, 2000)
// }
app.config.globalProperties.http = http;
......
src/router/index.js
View file @ 355b05f8
......@@ -5,12 +5,22 @@ import HomePage from '@/views/home.vue'
import AboutPage from '@/components/About.vue'
import store from '@/store'
//import nProgress from 'nprogress'
import screenDisplay from '@/views/Gis/screenDisplay.vue'
import iframe from '@/views/iframe.vue'
// 定义路由规则
const routes = [
{
path: '/',
component: HomePage
},
{
path: '/screenDisplay',
component: screenDisplay
},{
path:'/iframe',
name: 'iframe',
component: iframe
},
{
path: '/Login',
......
src/views/Gis/screenDisplay.vue
View file @ 355b05f8
<script setup>
import screenDisplay from '../../components/screenDisplay.vue'
import { detectZoom } from '../../plugins/screen';
const m = detectZoom();
if( window.screen.height * window.devicePixelRatio == 1080) {
document.body.style.zoom = 100 / Number(m);
}
var height = window.screen.height;
console.log(height);
if( window.screen.height * window.devicePixelRatio >= 1600) {
document.body.style.zoom = 132 / Number(m);
}
</script>
<template>
<main>
<screenDisplay />
</main>
</template>
\ No newline at end of file
</template>
<style>
body, div, p, img, span, table, tr, td {
margin: 0;
padding: 0;
}
html, body {
font-family: "Microsoft YaHei";
font-size: 16px;
}
ul, li {
list-style: none;
margin: 0;
padding: 0;
}
#app {
margin: 0;
padding: 0;
font-weight: normal;
}
.mypopup .leaflet-popup-content-wrapper {
border-radius: 0;
border: #fff solid 1px;
}
.mypopup {
padding: 5px 20px;
color: #ffffff !important;
text-shadow: 1px 1px 1px #333;
font-size: 15px;
font-weight: bold;
border: #fff solid 1px;
}
.mypopup1 {
width: 160px;
text-align: center;
background-color: rgba(96, 232, 96, .5);
box-shadow: inset 0 0 20px rgb(62, 127, 245);
}
.mypopup2 {
width: 160px;
text-align: center;
background-color: rgba(255, 255, 255, .5);
box-shadow: inset 0 0 20px rgb(62, 127, 245);
}
.amap-marker-label {
border: none;
background-color: transparent;
cursor: pointer;
}
@media (min-width: 2000px) {
html,
body {
font-size: 16px;
}
}
@media (min-width: 2200px) {
html,
body {
font-size: 17px;
}
.content {
min-height: 1125px !important;
}
}
@media (min-width: 2400px) {
html,
body {
font-size: 18px;
}
.content {
min-height: 1350px !important;
}
.rightLayer4Block {
height:26% !important;
margin-top:28% !important;
}
.rightLayer3Block {
margin-top: 12% !important;
}
.titleStyle p {
padding: 0.5% 5% 0 5% !important;
}
}
@media (min-width: 2600px) {
html,
body {
font-size: 19px !important;
}
.content {
min-height: 1463px;
}
.rightLayer4Block {
height:26% !important;
margin-top:30% !important;
}
}
@media (min-width: 2800px) {
html,
body {
font-size: 20px !important;
}
.content {
min-height: 1575px !important;
}
.rightLayer4Block {
height:26% !important;
margin-top:30% !important;
}
}
@media (min-width: 3000px) {
html,
body {
font-size: 26px !important;
}
.content {
min-height: 1688px !important;
}
.rightLayer4Block {
height:26% !important;
margin-top:30% !important;
}
}
@media (min-width: 3100px) {
html,
body {
font-size: 26px !important;
}
.content {
min-height: 1688px !important;
}
}
</style>
src/views/Video/VideoViewPage.vue
View file @ 355b05f8
<template>
海康视频
</template>
\ No newline at end of file
</template>
\ No newline at end of file
src/views/home.vue
View file @ 355b05f8
......@@ -35,7 +35,7 @@
</el-dropdown>
</div>
<div class="header-weather" id="">
<el-row style="left: 40%;widows: 60px;width: 60%;">
<el-row style="left: 37%;widows: 60px;width: 63%;">
<el-col :span="4" style="">
<div class="div-contain-titleAndText">
......@@ -518,7 +518,7 @@ export default defineComponent({
}
function openMap(){
const routePath = '/GisHome'; // 要导航到的路由路径
const routePath = '/iframe'; // 要导航到的路由路径
// 打开新窗口并导航到指定路由
window.open(
`${routePath}`,
......
src/views/iframe.vue 0 → 100644
View file @ 355b05f8
<template>
<div class="iframeBlock">
<iframe
src="/screenDisplay"
frameborder="0"
allowfullscreen>
</iframe>
</div>
</template>
<style>
iframe, div {
margin: 0;
padding: 0;
}
iframe {
width: 100%;
height: 100vh;
overflow: hidden;
}
html, body .iframeBlock {
overflow: hidden;
}
</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