From 7a9efdaad9014432c1e01ed99af145c730c1e411 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com>
Date: Sat, 27 Sep 2025 11:23:01 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?=
=?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=99=A8=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/router/index.js | 8 ++++----
src/views/manage/deviceSet.vue | 7 +++++++
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 3c247d89..c7c881d3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -215,6 +215,10 @@ const routes = [
name: 'control',
component: control,
children: [{
+ path: '/targetTemperature',
+ name: 'targetTemperature',
+ component: () => import('../views/page/targetTemperature.vue')
+ },{
path: '/fan',
name: 'fan',
component: () => import('../views/page/fan.vue')
@@ -266,10 +270,6 @@ const routes = [
path: '/snowRemoval',
name: 'snowRemoval',
component: () => import('../views/wufang/snowRemoval.vue')
- },{
- path: '/targetTemperature',
- name: 'targetTemperature',
- component: () => import('../views/page/targetTemperature.vue')
},{
path: '/targetHumidity',
name: 'targetHumidity',
diff --git a/src/views/manage/deviceSet.vue b/src/views/manage/deviceSet.vue
index eb2c2bc1..f304f96c 100644
--- a/src/views/manage/deviceSet.vue
+++ b/src/views/manage/deviceSet.vue
@@ -32,6 +32,13 @@
+
From d008d56563bce307d3e4bfbc7e0a49f951c14add Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com>
Date: Fri, 10 Oct 2025 19:26:14 +0800
Subject: [PATCH 2/4] 1
---
src/views/page/largeScreen.vue | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/views/page/largeScreen.vue b/src/views/page/largeScreen.vue
index 7726845f..10e61056 100644
--- a/src/views/page/largeScreen.vue
+++ b/src/views/page/largeScreen.vue
@@ -3557,10 +3557,9 @@ window.open("http://localhost:8080/");
.liveVideo_content {
width: 4rem;
- height: 3.3rem;
+ height: 3.0rem;
background: url("../../assets/img/liveVideo_bg.png") center no-repeat;
background-size: 100% 100%;
- margin-top: 0.14rem;
display: flex;
flex-direction: column;
align-items: center;
@@ -3599,7 +3598,7 @@ window.open("http://localhost:8080/");
font-weight: 500;
color: #afd6ff;
line-height: 0.24rem;
- margin-top: 0.15rem;
+ margin-top: 0.05rem;
}
.swiper-button-next_video {
From 1c71f2c3f41f74b96aaa183e9e909ba7d913fcd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com>
Date: Sun, 12 Oct 2025 16:36:45 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=91=E6=8E=A7bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/page/videoMonitoring.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/page/videoMonitoring.vue b/src/views/page/videoMonitoring.vue
index ed67b923..8e77c4fb 100644
--- a/src/views/page/videoMonitoring.vue
+++ b/src/views/page/videoMonitoring.vue
@@ -261,11 +261,11 @@ export default {
let userInfo = JSON.parse(localStorage.getItem("userInfo"));
this.api.user_getjurisdiction(userInfo.userid).then((res1) => {
if (res1.data.code == 200) {
- this.limitUserId = (res1.data.data.filter(el => el.id == 2 || el.id == 1 || el.id == 5 || el.id == 7 || el.id == 8 || el.id == 9 || el.id == 10 || el.id == 11|| el.id == 12|| el.id == 13))[0].id;
+
this.url = res.data.data.ezopen
this.accesstoken = res.data.data.accesstoken
this.createVideoNew(res.data.data.accesstoken)
-
+ this.limitUserId = (res1.data.data.filter(el => el.id == 2 || el.id == 1 || el.id == 5 || el.id == 7 || el.id == 8 || el.id == 9 || el.id == 10 || el.id == 11|| el.id == 12|| el.id == 13))[0].id;
}
});
} else {
From 17d8f51f99de450468758565269b3ae6e27ea95d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com>
Date: Sun, 12 Oct 2025 16:38:50 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=91=E6=8E=A7bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/page/videoMonitoring.vue | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/page/videoMonitoring.vue b/src/views/page/videoMonitoring.vue
index 8e77c4fb..bbc174c2 100644
--- a/src/views/page/videoMonitoring.vue
+++ b/src/views/page/videoMonitoring.vue
@@ -259,12 +259,13 @@ export default {
if (res.data.code == 200) {
let userInfo = JSON.parse(localStorage.getItem("userInfo"));
+ this.url = res.data.data.ezopen
+ this.accesstoken = res.data.data.accesstoken
+ this.createVideoNew(res.data.data.accesstoken)
this.api.user_getjurisdiction(userInfo.userid).then((res1) => {
if (res1.data.code == 200) {
- this.url = res.data.data.ezopen
- this.accesstoken = res.data.data.accesstoken
- this.createVideoNew(res.data.data.accesstoken)
+
this.limitUserId = (res1.data.data.filter(el => el.id == 2 || el.id == 1 || el.id == 5 || el.id == 7 || el.id == 8 || el.id == 9 || el.id == 10 || el.id == 11|| el.id == 12|| el.id == 13))[0].id;
}
});