合并主分支

# Conflicts: # pages/210/deviceControl/index.vue # pages/650/HBY650.vue # pages/common/index/index.vue # unpackage/dist/dev/app-plus/static/tabs/device-HL.png # unpackage/dist/dev/app-plus/static/tabs/device.png # unpackage/dist/dev/app-plus/static/tabs/my-HL.png # unpackage/dist/dev/app-plus/static/tabs/my.png # utils/BleReceive.js # utils/loading.js
2025-11-21 16:27:32 +08:00
parent 1558045882 2adc73cdab
commit ec6deab32a
107 changed files with 21932 additions and 1035 deletions
--- a/api/6170/deviceControl.js
+++ b/api/6170/deviceControl.js
@ -61,13 +61,4 @@ export function mapReverseGeocoding(data) {
    method: 'post',
 	data: data
  })
-}
-
-// 或者设备状态
-export function deviceRealTimeStatus(params) {
-  return request({
-    url: `/app/device/realTimeStatus`,
-    method: 'get',
-	data:params
-  })
-}
+}