Merge branch 'main' of http://47.107.152.87:3000/dyf/APP

# Conflicts:
#	pages.json
#	unpackage/dist/dev/app-plus/app-config-service.js
#	unpackage/dist/dev/app-plus/app-service.js
#	unpackage/dist/dev/app-plus/app-view.js
#	unpackage/dist/dev/app-plus/manifest.json
#	utils/request.js

api/6170/callPolice.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+//报警
+export function deviceSendAlarmMessage(data) {
+  return request({
+    url: '/app/bjq/device/sendAlarmMessage',
+    method: 'post',
+    data: data
+  })
+}

api/6170/deviceControl.js

@@ -2,7 +2,7 @@
 import request from '@/utils/request'
 export function deviceDetail(id) {
   return request({
-    url: `/app/device/${id}`,
+    url: `/app/bjq/device/${id}`,
     method: 'get',
   })
 }
@@ -16,7 +16,7 @@ export function deviceShareId(id) {
 // 人员信息登记
 export function registerPersonInfo(data) {
   return request({
-    url: `/app/device/registerPersonInfo`,
+    url: `/app/bjq/device/registerPersonInfo`,
     method: 'post',
 	data: data
   })
@@ -24,8 +24,41 @@ export function registerPersonInfo(data) {
 // 发送信息
 export function deviceSendMessage(data) {
   return request({
-    url: `/app/device/sendMessage`,
+    url: `/app/bjq/device/sendMessage`,
     method: 'post',
 	data: data
   })
 }
+// 灯光模式设置
+export function lightModeSettings(data) {
+  return request({
+    url: `/app/bjq/device/lightModeSettings`,
+    method: 'post',
+	data: data
+  })
+}
+// 激光模式设置
+export function laserModeSettings(data) {
+  return request({
+    url: `/app/bjq/device/laserModeSettings`,
+    method: 'post',
+	data: data
+  })
+}
+// 灯光亮度设置
+
+export function lightBrightnessSettings(data) {
+  return request({
+    url: `/app/bjq/device/lightBrightnessSettings`,
+    method: 'post',
+	data: data
+  })
+}
+// 地图逆解析
+export function mapReverseGeocoding(data) {
+  return request({
+    url: `/app/bjq/device/mapReverseGeocoding`,
+    method: 'post',
+	data: data
+  })
+}