+
+
@@ -104,6 +104,26 @@
>
+
+
@@ -933,8 +953,11 @@ export default {
],
};
},
- mounted() {
+ beforeMount(){
this.login();
+ },
+ mounted() {
+ // this.login();
this.getTime();
@@ -1900,7 +1923,7 @@ export default {
.e_content {
width: 100%;
- height: 2.53rem;
+ //height: 2.53rem;
display: flex;
flex-wrap: wrap;
From 36a225344565ca76ade27e44397002f8145c50af Mon Sep 17 00:00:00 2001
From: pangdundun <664790274@qq.com>
Date: Fri, 12 Jan 2024 09:17:29 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A6=E8=BE=B9?=
=?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=BB=9A=E5=8A=A8=E9=97=B4=E9=9A=99=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/page/largeScreen.vue | 29 +++++++++++++++++++++++------
1 file changed, 23 insertions(+), 6 deletions(-)
diff --git a/src/views/page/largeScreen.vue b/src/views/page/largeScreen.vue
index 08d7ee3..2912376 100644
--- a/src/views/page/largeScreen.vue
+++ b/src/views/page/largeScreen.vue
@@ -109,7 +109,7 @@
@@ -475,7 +475,7 @@ export default {
defaultOption() {
return {
step: 0.3, // 数值越大速度滚动越快
- limitMoveNum: 8, // 开始无缝滚动的数据量 this.dataList.length
+ limitMoveNum: this.limitUserId != 5 ? 8 : 18, // 开始无缝滚动的数据量 this.dataList.length
hoverStop: true, // 是否开启鼠标悬停stop
direction: 1, // 0向下 1向上 2向左 3向右
openWatch: true, // 开启数据实时监控刷新dom
@@ -1012,11 +1012,11 @@ export default {
this.getWeatherData(2023112911050004);
}else if (limitUserId == 5) {
// 石门
- this.get_weather_echart_data(2023042214250070);
- this.get_thisWeekTemperature_echart_data(2023042214250070);
+ // this.get_weather_echart_data(2023042214250070);
+ // this.get_thisWeekTemperature_echart_data(2023042214250070);
this.get_environmentData(2023042214250070);
this.get_readControl_getState(2023042214250070);
- this.getWeatherData(2023042214250070);
+ // this.getWeatherData(2023042214250070);
}
}
});
@@ -1273,7 +1273,6 @@ export default {
// id == 1 丽水;
// id == 5 石门;
this.limitUserId = (res.data.data.filter(el=>el.id == 2 || el.id == 1 || el.id == 5))[0].id;
-
if (this.limitUserId == 1) {
this.drag_boxHandler();
this.dataInit(userId, this.limitUserId);
@@ -1572,11 +1571,29 @@ export default {
温室环境数据