- 累计热量
+ 累计参数
@@ -13,6 +14,7 @@
{{ item.name }}
{{ item.field1 }}
{{ item.field2 }}
+ {{ item.field3 }}
@@ -47,47 +49,56 @@ const waterData = ref([
{
name: '换热站1',
field1: '158889',
- field2: '2024-01-25'
+ field2: '25632',
+ field3: '2024-01-25'
},
{
- name: '换热站1',
- field1: '158889',
- field2: '2024-01-25'
+ name: '换热站2',
+ field1: '15888',
+ field2: '568',
+ field3: '2024-01-26'
},
{
- name: '换热站1',
- field1: '158889',
- field2: '2024-01-25'
+ name: '换热站3',
+ field1: '25889',
+ field2: '798',
+ field3: '2024-01-27'
},
{
- name: '换热站1',
- field1: '158889',
- field2: '2024-01-25'
+ name: '换热站4',
+ field1: '8889',
+ field2: '256',
+ field3: '2024-02-01'
},
{
- name: '换热站1',
- field1: '158889',
- field2: '2024-01-25'
+ name: '换热站5',
+ field1: '58889',
+ field2: '753',
+ field3: '2024-02-02'
},
{
- name: '换热站1',
- field1: '158889',
- field2: '2024-01-25'
+ name: '换热站6',
+ field1: '15889',
+ field2: '953',
+ field3: '2024-02-10'
},
{
- name: '换热站1',
- field1: '158889',
- field2: '2024-01-25'
+ name: '换热站7',
+ field1: '1988',
+ field2: '653',
+ field3: '2024-02-11'
},
{
- name: '换热站1',
- field1: '158889',
- field2: '2024-01-25'
+ name: '换热站8',
+ field1: '7889',
+ field2: '746',
+ field3: '2024-02-12'
},
{
- name: '换热站1',
- field1: '158889',
- field2: '2024-01-25'
+ name: '换热站9',
+ field1: '1899',
+ field2: '258',
+ field3: '2024-02-23'
}
]);
diff --git a/src/views/data-visual/components/hxPress.vue b/src/views/data-visual/components/hxPress.vue
index 6c3a83f..b964c4a 100644
--- a/src/views/data-visual/components/hxPress.vue
+++ b/src/views/data-visual/components/hxPress.vue
@@ -1003,6 +1003,13 @@ const options = {
},
tooltip: {
trigger: 'axis',
+ borderColor: 'gray',
+ backgroundColor: 'rgba(36, 52, 78, 0.8)',
+ backdropFilter: 'blur(10px)',
+ boxShadow: '0 0 80px rgba(0, 0, 0, 0.25)',
+ textStyle: {
+ color: '#fff'
+ },
axisPointer: {
type: 'cross'
}
diff --git a/src/views/data-visual/components/hxTemp.vue b/src/views/data-visual/components/hxTemp.vue
index 5f7c432..5b63ed3 100644
--- a/src/views/data-visual/components/hxTemp.vue
+++ b/src/views/data-visual/components/hxTemp.vue
@@ -497,6 +497,13 @@ const options = {
},
tooltip: {
trigger: 'axis',
+ borderColor: 'gray',
+ backgroundColor: 'rgba(36, 52, 78, 0.8)',
+ backdropFilter: 'blur(10px)',
+ boxShadow: '0 0 80px rgba(0, 0, 0, 0.25)',
+ textStyle: {
+ color: '#fff'
+ },
axisPointer: {
type: 'cross'
}
diff --git a/src/views/data-visual/components/priPress.vue b/src/views/data-visual/components/priPress.vue
index 52be76f..7c46ed6 100644
--- a/src/views/data-visual/components/priPress.vue
+++ b/src/views/data-visual/components/priPress.vue
@@ -18,6 +18,13 @@ const isCurrentRoute = ref(true);
const options = {
tooltip: {
trigger: 'axis',
+ borderColor: 'gray',
+ backgroundColor: 'rgba(36, 52, 78, 0.8)',
+ backdropFilter: 'blur(10px)',
+ boxShadow: '0 0 80px rgba(0, 0, 0, 0.25)',
+ textStyle: {
+ color: '#fff'
+ },
axisPointer: {
type: 'cross'
}
diff --git a/src/views/data-visual/components/priTemp.vue b/src/views/data-visual/components/priTemp.vue
index 8f69729..f019b36 100644
--- a/src/views/data-visual/components/priTemp.vue
+++ b/src/views/data-visual/components/priTemp.vue
@@ -17,6 +17,13 @@ const isCurrentRoute = ref(true);
const options = {
tooltip: {
trigger: 'axis',
+ borderColor: 'gray',
+ backgroundColor: 'rgba(36, 52, 78, 0.8)',
+ backdropFilter: 'blur(10px)',
+ boxShadow: '0 0 80px rgba(0, 0, 0, 0.25)',
+ textStyle: {
+ color: '#fff'
+ },
axisPointer: {
type: 'cross'
}
diff --git a/src/views/data-visual/components/secPress.vue b/src/views/data-visual/components/secPress.vue
index d571cf3..3944b59 100644
--- a/src/views/data-visual/components/secPress.vue
+++ b/src/views/data-visual/components/secPress.vue
@@ -18,6 +18,13 @@ const isCurrentRoute = ref(true);
const options = {
tooltip: {
trigger: 'axis',
+ borderColor: 'gray',
+ backgroundColor: 'rgba(36, 52, 78, 0.8)',
+ backdropFilter: 'blur(10px)',
+ boxShadow: '0 0 80px rgba(0, 0, 0, 0.25)',
+ textStyle: {
+ color: '#fff'
+ },
axisPointer: {
type: 'cross'
}
diff --git a/src/views/data-visual/components/secTemp.vue b/src/views/data-visual/components/secTemp.vue
index 9b95140..0dbc111 100644
--- a/src/views/data-visual/components/secTemp.vue
+++ b/src/views/data-visual/components/secTemp.vue
@@ -18,6 +18,13 @@ const isCurrentRoute = ref(true);
const options = {
tooltip: {
trigger: 'axis',
+ borderColor: 'gray',
+ backgroundColor: 'rgba(36, 52, 78, 0.8)',
+ backdropFilter: 'blur(10px)',
+ boxShadow: '0 0 80px rgba(0, 0, 0, 0.25)',
+ textStyle: {
+ color: '#fff'
+ },
axisPointer: {
type: 'cross'
}
diff --git a/src/views/data-visual/index.scss b/src/views/data-visual/index.scss
index 837f4f0..8cc0c9c 100644
--- a/src/views/data-visual/index.scss
+++ b/src/views/data-visual/index.scss
@@ -1,8 +1,8 @@
@import url('@/assets/fonts/font.css');
.screenContainer {
- // position: fixed;
- // left: 50%;
- // top: 50%;
+ position: fixed;
+ left: 50%;
+ top: 50%;
transform-origin: 0 0;
transition: 0.3s;
color: #fff;
diff --git a/src/views/data-visual/index.vue b/src/views/data-visual/index.vue
index 7a2d253..9d85f2b 100644
--- a/src/views/data-visual/index.vue
+++ b/src/views/data-visual/index.vue
@@ -32,11 +32,11 @@ const baseHeight = 1440;
// * 需保持的比例(默认32:9)
const baseProportion = parseFloat((baseWidth / baseHeight).toFixed(5));
onMounted(() => {
- // calcRate();
+ calcRate();
});
window.addEventListener('resize', () => {
// 监听窗口改变,改变后重新获取
- // resize();
+ resize();
});
function calcRate() {
const appRef = screenRef.value;
diff --git a/src/views/monitoring/components/header.vue b/src/views/monitoring/components/header.vue
index 6cbfd4d..f034f3f 100644
--- a/src/views/monitoring/components/header.vue
+++ b/src/views/monitoring/components/header.vue
@@ -228,9 +228,11 @@ onMounted(() => {
routerType.value = route.query?.id === undefined ? '0' : '1';
getWeatherData();
document.body.addEventListener('mousedown', function () {
- console.log('鼠标按下');
- alarsRef.value.play();
- alarsRef.value.muted = false;
+ if (alarsRef.value != null) {
+ console.log('鼠标按下');
+ alarsRef.value.play();
+ alarsRef.value.muted = false;
+ }
});
});
diff --git a/src/views/monitoring/screen/components/main.vue b/src/views/monitoring/screen/components/main.vue
index 5bd2ac1..004bb97 100644
--- a/src/views/monitoring/screen/components/main.vue
+++ b/src/views/monitoring/screen/components/main.vue
@@ -211,8 +211,8 @@ const userInfo = JSON.parse(userStorageInfo === null ? '' : userStorageInfo);
// const baseApi = "http://board.heatiot.cn:8001/prod-api"//websocket链接地址,与项目接口地址一致。
//const baseApi = import.meta.env.VITE_APP_BASE_API
//const apiUrl = baseApi.replace(/https?:/, '');
-// const wsUrl = `ws://${window.location.host}/ws/websocket/${userInfo.userName}`; //websocket地址
-const wsUrl = `ws://10.10.10.56:9010/websocket/${userInfo.userName}`; //websocket地址
+const wsUrl = `ws://${window.location.host}/ws/websocket/${userInfo.userName}`; //websocket地址
+// const wsUrl = `ws://10.10.10.56:9010/websocket/${userInfo.userName}`; //websocket地址
const emit = defineEmits(['tableHeaderData']);
// const listData = ref([
@@ -264,7 +264,7 @@ onMounted(() => {
sessionStorage.getItem('currentPage') === null ? 1 : Number(sessionStorage.getItem('currentPage'));
console.log(Number(sessionStorage.getItem('currentPage')));
tablePage.pageSize = sessionStorage.getItem('pageSize') === null ? 10 : Number(sessionStorage.getItem('pageSize'));
- // socket.initialize(wsUrl); //初始化websocket http://
+ socket.initialize(wsUrl); //初始化websocket http://
});
mitt.on('currentPageEmit', (res: any) => {
diff --git a/src/views/monitoring/screen/index.vue b/src/views/monitoring/screen/index.vue
index e744e7e..ff3ecc9 100644
--- a/src/views/monitoring/screen/index.vue
+++ b/src/views/monitoring/screen/index.vue
@@ -137,14 +137,14 @@ window.addEventListener('resize', () => {
console.log('监听sidebar:', sidebar.value?.offsetHeight);
});
-// onBeforeRouteLeave((to, from) => {
-// //监听离开页面
-// console.log('onBeforeRouteLeave--', to.path, from.path);
-// if (to.path != from.path) {
-// console.log('离开页面');
-// socket.close(false);
-// }
-// });
+onBeforeRouteLeave((to, from) => {
+ //监听离开页面
+ console.log('onBeforeRouteLeave--', to.path, from.path);
+ if (to.path != from.path) {
+ console.log('离开页面');
+ socket.close(false);
+ }
+});
function tableMenuData(data: any) {
//获取菜单数据