From ae608e04c021b0cfbea3ab222b7ccefc793c4310 Mon Sep 17 00:00:00 2001
From: fengerli <528575642@qq.com>
Date: Thu, 7 Aug 2025 11:48:58 +0800
Subject: [PATCH] =?UTF-8?q?210=E6=96=B0=E5=A2=9E=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E5=BC=B9=E6=A1=86=E6=8F=90=E7=A4=BA=EF=BC=8C?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/CustomPopup/CustomPopup.vue     | 101 ++++++++-------------
 components/custom-navbar/custom-navbar.vue |  21 ++++-
 pages.json                                 |   7 ++
 pages/210/deviceControl/index.vue          |  83 +++++++++++++----
 pages/210/historyRecords/index.vue         |   8 ++
 pages/common/index/index.vue               |   3 +-
 static/images/210/ls.png                   | Bin 0 -> 1038 bytes
 static/images/210/time.png                 | Bin 0 -> 510 bytes
 8 files changed, 140 insertions(+), 83 deletions(-)
 create mode 100644 pages/210/historyRecords/index.vue
 create mode 100644 static/images/210/ls.png
 create mode 100644 static/images/210/time.png

diff --git a/components/CustomPopup/CustomPopup.vue b/components/CustomPopup/CustomPopup.vue
index 3a50afd..2cafe95 100644
--- a/components/CustomPopup/CustomPopup.vue
+++ b/components/CustomPopup/CustomPopup.vue
@@ -1,87 +1,62 @@
 <template>
 	<view class="agreement-mask" v-if="show" @click.stop="closePopup">
 		<!-- 弹窗主体：支持自定义边框、背景 -->
-		<view 
-			class="agreement-popup" 
-			@click.stop
-			:style="{
+		<view class="agreement-popup" @click.stop :style="{
 				border: popupBorder,
 				backgroundColor: popupBg,
 				borderRadius: popupRadius
-			}"
-			:class="popupClass"
-		>
-			<view class="popup-content">
-				<!-- 动态图标：支持自定义大小、边距 -->
-				<image 
-					v-if="showIcon && icon" 
-					:src="icon" 
-					mode="aspectFit" 
-					class="svg"
-					:style="iconStyle"
-				></image>
-				
-				<view class="text-content">
-					<!-- 动态标题：支持自定义颜色、字体大小 -->
-					<view 
-						class="popup-Title" 
-						v-if="title"
-						:style="{
-							color: titleColor,
-							fontSize: titleSize,
-							padding: titlePadding
-						}"
-					>
-						{{ title }}
-					</view>
-					
+			}" :class="popupClass">
+			<view class="text-content">
+				<!-- 动态标题：支持自定义颜色、字体大小 -->
+				<view class="popup-Title" v-if="title" :style="{
+					color: titleColor,
+					fontSize: titleSize,
+					padding: titlePadding
+				}">
+					{{ title }}
+				</view>
+				<view class="popup-content">
+					<!-- 动态图标：支持自定义大小、边距 -->
+					<image v-if="showIcon && icon" :src="icon" mode="aspectFit" class="svg" :style="iconStyle"></image>
+
+
+
 					<!-- 动态消息内容：支持自定义颜色、换行、字体大小 -->
-					<view 
-						class="popup-Message" 
-						v-if="message"
-						:style="{
+					<view class="popup-Message" v-if="message" :style="{
 							color: messageColor,
 							fontSize: messageSize,
 							whiteSpace: messageWrap ? 'normal' : 'nowrap',
 							padding: messagePadding
-						}"
-					>
+						}">
 						{{ message }}
 					</view>
+					<!-- 倒计时显示 -->
+				<!-- 	<view v-if="showCountdown" class="countdown" :style="countdownStyle">
+						{{ countdownFormat.replace('{time}', currentCountdown) }}
+					</view> -->
 				</view>
 			</view>
-			
+
 			<!-- 按钮组：支持自定义按钮样式 -->
 			<view class="popup-buttons" :style="{ marginTop: buttonGroupMargin }">
-				<button 
-					v-if="showCancel" 
-					class="btn cancelBtn" 
-					@click="handleCancel"
-					:style="{
+				<button v-if="showCancel" class="btn cancelBtn" @click="handleCancel" :style="{
 						border: cancelBtnBorder,
 						color: cancelBtnColor,
 						backgroundColor: cancelBtnBg,
 						fontSize: cancelBtnSize,
 						borderRadius: buttonRadius,
 						margin: buttonMargin
-					}"
-					:class="cancelBtnClass"
-				>
+					}" :class="cancelBtnClass">
 					{{ cancelText }}
 				</button>
-				
-				<button 
-					class="btn agreeBtn" 
-					@click="handleConfirm"
-					:style="{
+
+				<button class="btn agreeBtn" @click="handleConfirm" :style="{
 						backgroundColor: confirmBtnBg,
 						color: confirmBtnColor,
 						fontSize: confirmBtnSize,
 						borderRadius: buttonRadius,
 						margin: buttonMargin
-					}"
-					:class="confirmBtnClass"
-				>
+					}" :class="confirmBtnClass">
 					{{ confirmText }}
 				</button>
 			</view>
@@ -106,6 +81,10 @@
 				type: String,
 				default: ''
 			},
+			showCountdown: {
+				type: Boolean,
+				default: false
+			},
 			confirmText: {
 				type: String,
 				default: '确定'
@@ -131,7 +110,7 @@
 				type: Boolean,
 				default: false // 默认不换行，true则自动换行
 			},
-			
+
 			// 弹窗样式自定义
 			popupBorder: {
 				type: String,
@@ -149,7 +128,7 @@
 				type: String,
 				default: ''
 			},
-			
+
 			// 标题样式自定义
 			titleColor: {
 				type: String,
@@ -163,7 +142,7 @@
 				type: String,
 				default: '10rpx 0 10rpx'
 			},
-			
+
 			// 消息样式自定义
 			messageColor: {
 				type: String,
@@ -177,7 +156,7 @@
 				type: String,
 				default: '10rpx 20rpx 30rpx'
 			},
-			
+
 			// 图标样式自定义
 			iconStyle: {
 				type: Object,
@@ -187,7 +166,7 @@
 					marginBottom: '20rpx'
 				})
 			},
-			
+
 			// 按钮组样式
 			buttonGroupMargin: {
 				type: String,
@@ -201,7 +180,7 @@
 				type: String,
 				default: '0 10rpx'
 			},
-			
+
 			// 确认按钮样式
 			confirmBtnBg: {
 				type: String,
@@ -219,7 +198,7 @@
 				type: String,
 				default: ''
 			},
-			
+
 			// 取消按钮样式
 			cancelBtnBorder: {
 				type: String,
diff --git a/components/custom-navbar/custom-navbar.vue b/components/custom-navbar/custom-navbar.vue
index 35b5593..102fe99 100644
--- a/components/custom-navbar/custom-navbar.vue
+++ b/components/custom-navbar/custom-navbar.vue
@@ -22,9 +22,17 @@
 				<text v-if="rightText" :style="{ color: rightColor }" @click="handleRightClick">
 					{{ rightText }}
 				</text>
+				<!-- 显示多个图标 -->
+				<template v-if="rightIcons && rightIcons.length > 0">
+					<image v-for="(icon, index) in rightIcons" :key="index" :src="icon.src"
+						@click="handleIconClick(index)" class="pathIMG" :style="{
+				              width: icon.size || '40rpx',
+				              height: icon.size || '40rpx',
+				              marginLeft: index > 0 ? '20rpx' : '0'
+				            }" />
+				</template>
 				<!-- 或显示图标 -->
-				<image v-if="rightIcon" :src="rightIcon" @click="handleRightClick"  mode=""
-					class="pathIMG">
+				<image v-if="rightIcon" :src="rightIcon" @click="handleRightClick" class="pathIMG">
 				</image>
 			</slot>
 		</view>
@@ -60,6 +68,11 @@
 			rightIconSize: { // 图标大小
 				type: Number,
 				default: 24
+			},
+			rightIcons: {
+				type: Array,
+				default: () => []
+				// 格式: [{src: '/path/icon1.png'}, {src: '/path/icon2.png'}]
 			}
 		},
 		data() {
@@ -76,6 +89,10 @@
 			},
 			handleRightClick() {
 				this.$emit('right-click'); // 触发右侧点击事件
+			},
+			// 新增图标点击方法
+			handleIconClick(index) {
+				this.$emit('icon-click', index)
 			}
 		}
 	}
diff --git a/pages.json b/pages.json
index 70f632a..dae6342 100644
--- a/pages.json
+++ b/pages.json
@@ -178,7 +178,14 @@
 			"style": {
 				"navigationBarTitleText": "添加联机设备"
 			}
+		},
+		{
+			"path": "pages/210/historyRecords/index",
+			"style": {
+				"navigationBarTitleText": "历史记录"
+			}
 		}
+		
 
 	],
 	"tabBar": {
diff --git a/pages/210/deviceControl/index.vue b/pages/210/deviceControl/index.vue
index 014cd2e..ac20085 100644
--- a/pages/210/deviceControl/index.vue
+++ b/pages/210/deviceControl/index.vue
@@ -5,9 +5,11 @@
 		</view>
 		<!-- 使用自定义导航栏 -->
 		<view v-show="!pageLoading">
-			<custom-navbar :title="navTitle" :showBack="true" color="#FFFFFF"
-				:rightIcon="isRightIconVisible ? '/static/images/common/shape.png' : ''"
-				@right-click="shareUp"></custom-navbar>
+			<custom-navbar :title="navTitle" :showBack="true" color="#FFFFFF" :rightIcons="[
+				    {src: '/static/images/210/ls.png'},
+				    ...(isRightIconVisible ? [{src: '/static/images/common/shape.png'}] : [])
+				  ]" @right-click="shareUp" @icon-click="handleIconClick"></custom-navbar>
+
 			<view class="device-detail-container" :style="{ paddingTop: navBarHeight + 'px' }">
 				<!-- 设备电量信息 -->
 				<view class="battery-section">
@@ -88,7 +90,7 @@
 							</view>
 						</view>
 						<view class="mode-v1">
-							<view class="mode-v2" @click="lasermode">
+							<view class="mode-v2" @click="automaticAlarm">
 								<image src="/static/images/210/zd.png" class="setIMG" mode="aspectFit"></image>
 								<view>
 									<view class="battery-v2">自动报警</view>
@@ -114,7 +116,7 @@
 						</view>
 						<view class="mode-v1">
 							<view class="mode-v2" @click="alarmTime">
-								<image src="/static/images/jg.png" class="setIMG" mode="aspectFit"></image>
+								<image src="/static/images/210/time.png" class="setIMG" mode="aspectFit"></image>
 								<view>
 									<view class="battery-v2">报警时长</view>
 									<view class="mode-v3">{{alarmTimeDisplay }}</view>
@@ -239,7 +241,7 @@
 				message: '信息发送成功',
 				showCancel: false
 			},
-			
+
 		},
 		// 开机log
 		logo: {
@@ -248,7 +250,7 @@
 				message: '上传成功',
 				showCancel: false
 			},
-			
+
 		},
 		bettery: {
 			config: {
@@ -265,6 +267,7 @@
 				return true; // 直接关闭
 			}
 		},
+
 		cancel: {
 			config: {
 				titleColor: 'rgba(224, 52, 52, 1)',
@@ -288,8 +291,28 @@
 			onConfirm() {
 				console.log('删除确认');
 			}
+		},
+		// 自动报警
+		autoAlarm: {
+			config: {
+				icon: '/static/images/6170/svg.png',
+				title: '报警信息',
+				message: '002号设备(ID:123456)\n出现报警', // 使用\n换行
+				showCountdown: true,
+				countdownTime: 59,
+				confirmText: '解除报警',
+				popupBorder: '1rpx solid rgba(224, 52, 52, 0.3)',
+				confirmBtnBg: 'rgba(224, 52, 52, 1)',
+				confirmBtnColor: "rgba(255, 255, 255, 0.87)",
+				showCancel: false,
+			},
+			onConfirm() {
+				console.log('自动报警确认');
+				// 这里可以添加自动报警的逻辑
+			}
 		}
 
+
 	}
 	import MqttClient from '@/utils/mqtt.js';
 	import {
@@ -371,7 +394,7 @@
 					callback: POPUP_CONFIGS[type].onConfirm
 				}
 			},
-			handleConfirm(){
+			handleConfirm() {
 				this.currentPopup.show = false;
 				console.log('这是点击了确认');
 			},
@@ -387,6 +410,10 @@
 				this.radioSelected = index;
 				console.log('选中了单选选项：', this.radioList[index]);
 			},
+			// 自动报警
+			automaticAlarm() {
+				this.showPopup('autoAlarm');
+			},
 			// *******定位******
 			gpsPosition() {
 				uni.navigateTo({
@@ -514,20 +541,38 @@
 				this.lightModeA = false;
 				console.log("保存的时间：", time);
 			},
+			handleIconClick(index) {
+				// 历史记录
+				if (index === 0) {
+					uni.navigateTo({
+						url: '/pages/210/historyRecords/index',
+						events: {
+							ack: function(data) {}
+						},
+						success: (res) => {
+							res.eventChannel.emit('share', {
+								data: this.itemInfo,
+							});
+						}
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pages/6170/share/index',
+						events: {
+							ack: function(data) {}
+						},
+						success: (res) => {
+							res.eventChannel.emit('share', {
+								data: this.itemInfo,
+							});
+						}
+					})
+				}
+			},
 
 			// 分享
 			shareUp() {
-				uni.navigateTo({
-					url: '/pages/6170/share/index',
-					events: {
-						ack: function(data) {}
-					},
-					success: (res) => {
-						res.eventChannel.emit('share', {
-							data: this.itemInfo,
-						});
-					}
-				})
+
 			},
 
 			// 操作说明
diff --git a/pages/210/historyRecords/index.vue b/pages/210/historyRecords/index.vue
new file mode 100644
index 0000000..02409e3
--- /dev/null
+++ b/pages/210/historyRecords/index.vue
@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/pages/common/index/index.vue b/pages/common/index/index.vue
index ce2ccfc..f9564ca 100644
--- a/pages/common/index/index.vue
+++ b/pages/common/index/index.vue
@@ -482,7 +482,8 @@
 							// 页面跳转成功后的回调函数
 							res.eventChannel.emit('deviceControl', {
 								data: item,
-								deviceType: deviceType
+								deviceType: deviceType,
+								apiType: 'listA' // 自定义标识
 							});
 						}
 					})
diff --git a/static/images/210/ls.png b/static/images/210/ls.png
new file mode 100644
index 0000000000000000000000000000000000000000..08926450058ae2e253d4050ab960e33d4961cc9e
GIT binary patch
literal 1038
zcmeAS@N?(olHy`uVBq!ia0vp^N<gf}!3HE3Uh}-dz`%Uf)5S5Qg7NJG#tAB(lT<u~
zx>wEI?e5}|mX;P43IydK@cj%eKncj`@NkeVX=!e5E-kxf&*VDqlNMfHT3+sd9%QA@
zq95fO{(3ynZBY08W%=)|z<<7N`&-k0b9wqdy3h78KjHVp1JMlqPb~l1G%T6_IG+8Z
z(k8HS_fLy{R(jeW?`Hd`wBfJVf!Uwee^>F0Ke(UgqdtT`XWkJ}`{SE!yR`4kdHz*&
z(!3+wZ54_+`&mCcvsu1=!WWe|j@$W+do0ht)K;<We9r&T>Bc{?d2c-rocF8}(r1Fm
zeFK^KxxIoBqHppN{zvgAzbQBNKfbxo>C)tixQ^$CzeO|TpWFO*572%04}3e$*#D#p
z=ozkg;*WlUT~d7Xyf@Hqy*c(mKP=|G1>4qAVV6_Sef}HBS^Jyc_A|?!6pdGW>1m^W
z<a6Th=n6GY`6K%$zunGoZ;tjnm6zHTejU$~fMId`qt7I}j(YXm{VaBUNHV$&=Fh>l
z{$mFD!t)aQ$2kJ$kAj^h>Obj==pXhCe|2p@?zdE&*Nrgv2Y&+8x?(3Aaj>VuZ9Ff9
ze~>@$ZTkn1WzSnG^tRn+swiGpF=@&A2lfqb^B>MssTDZS`7s6@Dls2HfmF|M`~D$g
z&tD4jgdgp^QOEt@?9NA?llC?JX8=X$q%V#@uN7|u#Z>Xp$ttz1{~196pz^XA;<X{+
zft2664em_+Pxc=_&+I=17!LdIho1n)`2OqXxet6(uDoc&1qvvk55+dO7X#zu=DsHJ
ziA&Tw>si4umj1i)L1)azLYv#5BoSBAQLhRPa{W8u9>7Frb!2}dI4yks{&`YeU%l*+
x{S$#vCC6zqNqZj4pE*m^Kdx{8F~6~%rL$Dw*ulfB62N@U;OXk;vd$@?2>?C!9^wE1

literal 0
HcmV?d00001

diff --git a/static/images/210/time.png b/static/images/210/time.png
new file mode 100644
index 0000000000000000000000000000000000000000..73d1f1f852a3e2ce6cd96130e391d63f7ecee675
GIT binary patch
literal 510
zcmeAS@N?(olHy`uVBq!ia0vp^CLqkh3?$9N*lqwR#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWND5xIb6XFV_Ra8`zk${$#7KGQ_+`MVirpJ#T2L}hYHaRQ;D&;K+@(X5Q
zPu=+DKU>N6|3I)taN|m#W#OJKjv*CudarEsV>aYr2#6NZ+PJ0t$Q4$tjhi<#yGY(l
zVAa}M&rpA$?zJPk+XRUpEp<#uZyeaoT5i4Wdf-(kblh{6!!m1I%WqF*ln=O7OaC#g
zlxB4LYteB3>M6l>^QT`rW$V@?mUu&3`Ae(yZoyy2_O9g!y^-mb(Wm|=#`=U*s`m48
zZ`rR8H@7$N-Tu{hHel^(>E1Ry*_%$!xAU!y>$r7qzRKKF{wvs;N|t4+ZPwhS6)H40
zuvIhYcWCp3SLqKX+?wcdJ-staCCd8yi_hmKta1`iRlXGeRe#auU){eR2;N~iviwX6
zU%Bmde@DFoPVJG8MAXiRoliNm;R9dSp<jA8@AtF5P3RBb5^R<iv_bKvf6RlTMIm{&
zXQ<vj##=l~_v)fe?t72<#j@|1Q>nCW-nNs<EL$Y3Z_KFU`Dt5vR`{@@VUXE(<(8En
nr%F_<4CK5!U6uJ;DUbczjLt>kpQqmehCPF)tDnm{r-UW|PJGf?

literal 0
HcmV?d00001