分享管理修复bug,210历史记录功能开发

pages/6170/allShare/index.vue

@@ -17,7 +17,7 @@
 							<text>{{
 									  tabs[activeTab].name === '我的分享' 
 										? `分享给“${group.sharedTo}”的设备` 
-										: `来自“${group.sharedTo}”分享的设备`
+										: `来自“${group.othersharedTo}”分享的设备`
 									}}</text>
 							<text class="edit-btn"
 								@click="toggleEdit(groupIndex)">{{editingGroup === groupIndex ? '完成' : '编辑'}}</text>
@@ -41,11 +41,9 @@
 												<view class="ID">
 													ID:{{item.deviceImei}}</view>
 												<!-- 在线状态 -->
-												<view class="onlines"
-													v-if="item.onlineStatus==1">在线</view>
+												<view class="onlines" v-if="item.onlineStatus==1">在线</view>
 												<!-- 离线状态 -->
-												<view class="offlines"
-													v-if="item.onlineStatus==0">离线</view>
+												<view class="offlines" v-if="item.onlineStatus==0">离线</view>
 												<view>电量：{{item.battery || '0'}}%</view>
 											</view>
 										</view>
@@ -54,11 +52,6 @@
 							</view>
 						</block>
 					</view>
-					<!-- 加载状态提示 -->
-					<!-- 	<view class="loading-status">
-						<text v-if="loading">加载中...</text>
-						<text v-if="finished">没有更多数据了</text>
-					</view> -->
 				</view>
 				<view v-else class="noDATA">
 					<view>
@@ -122,10 +115,12 @@
 				const groups = {};
 				this.deviceList.forEach(device => {
 					// 这里假设device.sharedTo是分享目标的手机号
-					const key = device.sharedTo || '未分享';
+					const key = this.activeTab === 0 ? device.phonenumber : device.otherPhonenumber;
+					const displayName = this.activeTab === 0 ? device.phonenumber : device.otherPhonenumber;
 					if (!groups[key]) {
 						groups[key] = {
-							sharedTo: key,
+							sharedTo: displayName, // 显示用名称
+							othersharedTo: displayName, // 显示用名称
 							devices: []
 						};
 					}
@@ -218,7 +213,8 @@
 						const newDevices = res.rows.map(device => ({
 							...device,
 							showConfirm: false,
-							sharedTo: device.phonenumber || '未分享'
+							sharedTo: device.phonenumber,
+							othersharedTo: device.otherPhonenumber
 						}));
 						// 分页处理
 						if (this.page === 1) {

pages/6170/deviceControl/index.vue

@@ -67,7 +67,7 @@
 					</view>
 
 				</view>
-				<view class="callpolice" v-if="deviceInfo.onlineStatus==1">
+				<view class="callpolice" v-if="deviceInfo.onlineStatus==0">
 					<view class="">设备强制报警中</view>
 					<view>
 						<uni-icons type="closeempty" size="15" color="rgba(255, 255, 255, 0.9)"
@@ -271,7 +271,21 @@
 				@confirm="onPopupConfirmPolice" confirmBtnBg="rgba(224, 52, 52, 1)" confirmBtnColor="#fff" />
 		</view>
 		<!-- ===============进度条============== -->
-		<Progress :config="Progress"></Progress>
+		<view 
+		  v-if="Progress.show" 
+		  @click="closeProgress" 
+		  :style="{
+		    position: 'fixed',
+		    top: 0,
+		    left: 0,
+		    right: 0,
+		    bottom: 0,
+		    backgroundColor: Progress.maskBgColor,
+		    zIndex: 999
+		  }"
+		>
+		  <Progress :config="Progress" @click.stop />
+		</view>
 	</view>
 </template>
 
@@ -285,7 +299,6 @@
 		lightModeSettings, //灯光模式设置
 		laserModeSettings, //激光模式设置
 		lightBrightnessSettings, //灯光亮度设置
-		mapReverseGeocoding //地图逆解析
 	} from '@/api/6170/deviceControl.js'
 	import {
 		baseURL,
@@ -379,6 +392,9 @@
 				this.lightModeB = false;
 				this.lightModeC = false;
 			},
+			 closeProgress() {
+			    this.Progress.show = false; // 直接关闭进度条
+			  },
 			// *******定位******
 			gpsPosition(item) {
 				// 添加调试日志
@@ -409,7 +425,6 @@
 
 			cardTouchMove(e) {
 				if (!this.cardRect || e.touches.length === 0) return;
-
 				const deltaX = e.touches[0].clientX - this.touchStartX;
 				const deltaY = e.touches[0].clientY - this.touchStartY;
 

pages/6170/shareManagement/index.vue

@@ -86,7 +86,7 @@
 			},
 			getData(val) {
 				let data = {
-					deviceid: val
+					deviceId: val
 				}
 				deviceShareList(data).then((res) => {
 					if (res.code == 200) {