解决版本冲突

pages/common/send/index.vue

@@ -2,9 +2,9 @@
 	<view class="container">
 		<!-- 设备列表 -->
 		<scroll-view class="device-list" scroll-y>
-			<view class="device-card" v-for="(item, index) in deviceList" :key="index" @click="toggleSelect(index)">
+			<view class="device-card" v-for="(item, index) in deviceList" :key="index" @click="item.onlineStatus === 1 ? toggleSelect(index) : null">
 				<!-- 复选框 -->
-				<view class="checkbox" :class="{ checked: item.checked }">
+				<view class="checkbox" :class="{ checked: item.checked,disabled: item.onlineStatus !== 1  }">
 					<uni-icons v-if="item.checked" type="checkmarkempty" size="18" color="rgb(0, 0, 0)"></uni-icons>
 				</view>
 				<!-- 设备信息 -->
@@ -14,15 +14,13 @@
 							<image :src="item.devicePic" class="IMG" mode="aspectFit"></image>
 						</view>
 						<view class="device-name">
-							<view>设备:{{item.deviceName}}</view>
+							<view>设备:{{ item.deviceName }}</view>
 							<view class="ID">
-								<view class="ID">ID:{{item.deviceImei}}</view>
-								<view class="onlines"
-									v-if="item.onlineStatus==1">在线</view>
+								<view class="ID">ID:{{ item.deviceImei }}</view>
+								<view class="onlines" v-if="item.onlineStatus == 1">在线</view>
 								<!-- 离线状态 -->
-								<view class="unlines"
-									v-if="item.onlineStatus==0">离线</view>
-								<view>电量：{{item.battery || '0'}}%</view>
+								<view class="unlines" v-if="item.onlineStatus == 0">离线</view>
+								<view>电量：{{ item.battery || '0' }}%</view>
 							</view>
 						</view>
 					</view>
@@ -32,14 +30,15 @@
 				<view class="ql-editor">编辑信息</view>
 				<view class="ql-input">
 					<textarea placeholder-style="color:rgba(255, 255, 255, 0.4)" placeholder="请输入内容" class="textarea"
-						v-model="messageToSend"  :maxlength="20"/>
+						v-model="messageToSend" :maxlength="20" />
 				</view>
-				<button class="login-btn" @click="sendTextMessage">发送</button>
+				<button class="login-btn" @click.stop="sendTextMessage">发送</button>
 			</view>
 		</scroll-view>
 		<!-- 成功提示弹框 -->
-		<CustomPopup :show="showPopupFlag" :title="popupTitle" :message="popupMessage"  icon="/static/images/common/sendSucc.png"
-			:confirm-text="popupConfirmText" :show-cancel="false" @confirm="onPopupConfirm" />
+		<CustomPopup :show="showPopupFlag" :title="popupTitle" :message="popupMessage"
+			icon="/static/images/common/sendSucc.png" :confirm-text="popupConfirmText" :show-cancel="false"
+			@confirm="onPopupConfirm" />
 	</view>
 </template>
 
@@ -49,12 +48,16 @@
 		deviceInfo,
 	} from '@/api/common/index.js'
 	import {
-		deviceSendMessage
+		deviceSendMessage,
+		deviceRealTimeStatus //设备状态
 	} from '@/api/6170/deviceControl.js'
+	import {
+		generateShortId
+	} from '@/utils/function.js';
 	export default {
-		  components: {
-		    CustomPopup
-		  },
+		components: {
+			CustomPopup
+		},
 		data() {
 			return {
 				deviceList: [],
@@ -62,10 +65,55 @@
 				showPopupFlag: false,
 				popupTitle: '',
 				popupMessage: '信息发送成功！',
-				popupConfirmText: '确认'
+				popupConfirmText: '确认',
+				isSending: false,
+				sendInfo: {}
 			}
 		},
 		methods: {
+			onPullDownRefresh() {
+				// 执行下拉刷新时的操作，比如重新获取数据
+				this.getData();
+			},
+			/**
+			 * 获取设备状态（带自动轮询）
+			 * @param {number} val - 功能模式
+			 * @param {string} batchId - 批次ID
+			 * @param {number} [interval=1000] - 轮询间隔（毫秒）
+			 */
+			async getdeviceSTatus(val, batchId, interval = 800) {
+				const checkStatus = async () => {
+					try {
+						const data = {
+							functionMode: val,
+							batchId: batchId,
+							typeName: this.sendInfo.typeName,
+							deviceImei: this.sendInfo.deviceImei
+						};
+						const res = await deviceRealTimeStatus(data);
+						if (res.code !== 200) {
+							throw new Error(res.msg || '请求失败');
+						}
+						switch (res.data.functionAccess) {
+							case 'OK':
+								return res; // 成功完成
+							case 'ACTIVE':
+								await new Promise(r => setTimeout(r, interval));
+								return checkStatus(); // 继续轮询
+							case 'FAILED':
+								throw new Error('设备操作失败');
+							case 'TIMEOUT':
+								throw new Error('设备响应超时');
+							default:
+								throw new Error('未知状态');
+						}
+					} catch (error) {
+						throw error;
+					}
+				};
+				return checkStatus();
+			},
+
 			toggleSelect(index) {
 				this.deviceList[index].checked = !this.deviceList[index].checked
 				this.$forceUpdate()
@@ -75,7 +123,7 @@
 				this.loading = true;
 				let data = {
 					pageNum: 1,
-					pageSize: 20,
+					pageSize: 50,
 					deviceType: deviceType
 				}
 				deviceInfo(data).then((res) => {
@@ -93,9 +141,12 @@
 				});
 			},
 			// 发送文本消息
-			sendTextMessage() {
+			async sendTextMessage() {
+				// 防重复提交
+				if (this.isSending) return;
 				const selectedDevices = this.deviceList.filter(item => item.checked)
 				const deviceIds = selectedDevices.map(item => item.id);
+				const deviceImeiList = selectedDevices.map(item => item.deviceImei);
 				if (selectedDevices.length === 0) {
 					uni.showToast({
 						title: '请选择一个设备',
@@ -105,25 +156,53 @@
 				}
 				if (!this.messageToSend) {
 					uni.showToast({
-						title: '请输入要发送的内容',
+						title: '请输入要发送的文字',
 						icon: 'none'
 					});
 					return;
 				}
-				let data = {
-					sendMsg: this.messageToSend,
-					deviceIds: deviceIds
-				}
-				deviceSendMessage(data).then((res) => {
-					if (res.code == 200) {
-						this.showPopupFlag = true
-					} else {
+				this.isSending = true;
+				let loadingShown = false;
+				try {
+					uni.showLoading({
+						title: '发送中...',
+						mask: true
+					});
+					loadingShown = true;
+					// 2. 准备请求数据
+					const batchId = generateShortId();
+					const data = {
+						sendMsg: this.messageToSend,
+						deviceIds: deviceIds,
+						batchId: batchId,
+						typeName: this.sendInfo.typeName,
+						batchId: batchId,
+						deviceImeiList: deviceImeiList
+					};
+					// 3.人员信息
+					const registerRes = await deviceSendMessage(data);
+					if (registerRes.code !== 200) {
 						uni.showToast({
-							title: res.msg,
+							title: registerRes.msg,
 							icon: 'none'
-						});
+						})
+						return
 					}
-				})
+					// 4. 获取设备状态
+					const statusRes = await this.getdeviceSTatus(2, batchId);
+					if (statusRes.data.functionAccess === 'OK') {
+						// 5. 显示成功弹窗
+						this.showPopupFlag = true
+					}
+				} catch (error) {
+					uni.showToast({
+						title: error.message,
+						icon: 'none'
+					});
+				} finally {
+					uni.hideLoading();
+					this.isSending = false;
+				}
 			},
 			onPopupConfirm() {
 				this.showPopupFlag = false
@@ -137,7 +216,8 @@
 			// 监听 'deviceSend' 事件，获取传过来的数据
 			eventChannel.on('deviceSend', (data) => {
 				console.log('Received detail data:', data);
-				this.getData(data.data)
+				this.getData(data.data.id)
+				this.sendInfo = data.data
 			});
 			// 如果需要向调用页面返回数据，可以触发 'ack' 事件
 			eventChannel.emit('ack', {})
@@ -342,4 +422,14 @@
 		border-radius: 50rpx;
 		width: 90%;
 	}
+	.checkbox.disabled {
+	  opacity: 0.5;
+	  background-color: rgba(255, 255, 255, 0.1) !important;
+	  border-color: rgba(255, 255, 255, 0.2) !important;
+	  pointer-events: none; /* 阻止点击事件 */
+	}
+	/* 可选：离线设备的卡片整体置灰 */
+	.device-card[data-offline="true"] {
+	  opacity: 0.6;
+	}
 </style>

pages/common/user/index.vue

@@ -6,7 +6,7 @@
 				<image src="/static/images/common/logo.png" class="logo"></image>
 			</view>
 			<view class="user-right">
-				<view class="user-title">富源晟科技</view>
+				<view class="user-title">武汉研创</view>
 				<view class="ID">ID:123456</view>
 			</view>
 		</view>