From a70a36a747c8c6f1c0c3eee0e4b4123b9a5893c3 Mon Sep 17 00:00:00 2001
From: "978184212@qq.com" <978184212@qq.com>
Date: Fri, 5 Dec 2025 19:25:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=B5=8B=E7=AB=99=E7=82=B9=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packDetail/pages/sjdyj/index.vue |  6 +++---
 packDetail/pages/vidio/index.vue | 26 ++++++++++++++++++--------
 pages.json                       |  2 +-
 pages/index/index.vue            |  2 +-
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/packDetail/pages/sjdyj/index.vue b/packDetail/pages/sjdyj/index.vue
index f1833dd..6ec9092 100644
--- a/packDetail/pages/sjdyj/index.vue
+++ b/packDetail/pages/sjdyj/index.vue
@@ -165,7 +165,7 @@
 					xAxis: {
 						disableGrid: true,
 						itemCount: 8,
-						scrollShow: true,
+						scrollShow: false,
 						scrollAlign: 'left',
 						labelCount: 14,
 						boundaryGap: 'justify',
@@ -508,7 +508,7 @@
 							name: '最高阈值',
 							data: Array(this.timeList?.length || 0).fill(highValNum),
 							color: "#FF4242",
-							lineType: "solid",
+							lineType: "dashed",
 							showLabel: true,
 							dataLabel: false,
 						});
@@ -519,7 +519,7 @@
 							name: '最低阈值',
 							data: Array(this.timeList?.length || 0).fill(lowValNum),
 							color: "#19D58A",
-							lineType: "solid",
+							lineType: "dashed",
 							showLabel: true,
 							dataLabel: false,
 						});
diff --git a/packDetail/pages/vidio/index.vue b/packDetail/pages/vidio/index.vue
index 462dcda..d6aabed 100644
--- a/packDetail/pages/vidio/index.vue
+++ b/packDetail/pages/vidio/index.vue
@@ -74,7 +74,8 @@
 				show:false,
 				show1:false,
 				top:0,
-				list:[]
+				list:[],
+				listsiol:[]
 				}
 		},
 		onLoad() {
@@ -92,13 +93,22 @@
 		},
 		methods:{
 			getList(){
-				uni.showLoading({
-					title: '加载中'
-				});
-				this.$http.get('/applet/survStationInfo/deviceList').then(res =>{
-					this.list = res.data.data
-					uni.hideLoading();
-				})
+			    uni.showLoading({
+			        title: '加载中'
+			    });
+			    
+			    // 使用 Promise.all 同时发起两个请求
+			    Promise.all([
+			        this.$http.get('/applet/survStationInfo/deviceList'),
+			        this.$http.get('/applet/survStationInfo/fdeviceList')
+			    ]).then(([res1, res2]) => {
+			        // 合并两个数组
+			        this.list = res1.data.data.concat(res2.data.data);
+			        uni.hideLoading();
+			    }).catch(error => {
+			        console.error('请求失败:', error);
+			        uni.hideLoading();
+			    });
 			},
 			todetail(item,index){
 				uni.navigateTo({
diff --git a/pages.json b/pages.json
index 6e40d0f..8e543a9 100644
--- a/pages.json
+++ b/pages.json
@@ -133,7 +133,7 @@
 				{
 					"path": "pages/vidio/index",
 					"style": {
-						"navigationBarTitleText": "站点监测",
+						"navigationBarTitleText": "设备管理",
 						"navigationStyle": "default",
 						"navigationBarBackgroundColor":"#0F6EFF"
 					}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 01d0ef8..c58c11b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -150,7 +150,7 @@
 						path: '/packDetail/pages/Site/index'
 					},
 					{
-						name: '站点监测',
+						name: '设备管理',
 						img: require('../../static/home_icon_shebei.png'),
 						path: '/packDetail/pages/vidio/index'
 					},