Merge branch 'liubiao-new-20250827'

config/index.js

@@ -2,11 +2,11 @@
 const config = {
 	// 开发环境
 	development: {
-		BASE_URL: 'http://192.168.110.54:8000',
+		BASE_URL: 'http://192.168.2.34:8000',
 		API_PREFIX: '',
 		// MQTT 配置
 		MQTT_HOST: '47.120.79.150',
-		MQTT_PORT: 8083,
+		MQTT_PORT: 9083,
 		MQTT_USERNAME: 'admin',
 		MQTT_PASSWORD: '#YtvpSfCNG'
 	},
@@ -16,7 +16,7 @@ const config = {
 		API_PREFIX: '',
 		// MQTT 配置
 		MQTT_HOST: '47.120.79.150',
-		MQTT_PORT: 8083,
+		MQTT_PORT: 9083,
 		MQTT_USERNAME: 'admin',
 		MQTT_PASSWORD: '#YtvpSfCNG'
 	}

pages/6170/callPolice/index.vue

@@ -188,7 +188,7 @@
 					const statusRes = await getdeviceSTatus({
 							functionMode: 2,
 							batchId,
-							typeName,
+							typeName:'FunctionAccessBatchStatusRule',
 							deviceImei,
 							interval: 500
 						},
@@ -236,7 +236,7 @@
 <style scoped>
 	.container {
 		min-height: 100vh;
-		background-color: #1A1D24;
+		background-color:rgb(18, 18, 18);
 		box-sizing: border-box;
 		overflow-x: hidden;
 
@@ -280,7 +280,7 @@
 	}
 
 	.device-content {
-		background-color: rgba(30, 33, 40, 0.8);
+		background-color: rgb(26, 26, 26);
 		border-radius: 16rpx;
 		position: relative;
 		/* display: flex; */

pages/6170/deviceControl/index.vue

@@ -725,12 +725,12 @@
 									// 获取设备状态
 									// 4. 获取设备状态
 									let deviceImei = this.itemInfo.deviceImei
-									let typeName = this.itemInfo.typeName
+									//let typeName = this.itemInfo.typeName
 									let batchId = ''
 									const statusRes = await getdeviceSTatus({
 											functionMode: 1,
 											batchId,
-											typeName,
+											typeName:'FunctionAccessStatusRule',
 											deviceImei,
 											interval: 800
 										},
@@ -907,13 +907,13 @@
 						})
 						return
 					}
-					// 4. 获取设备状态
+					// 4. 获取设备状态FunctionAccessBatchStatusRule 批量
 					let deviceImei = this.itemInfo.deviceImei
 					let typeName = this.itemInfo.typeName
 					const statusRes = await getdeviceSTatus({
 							functionMode: 2,
 							batchId,
-							typeName,
+							typeName:'FunctionAccessBatchStatusRule',
 							deviceImei,
 							interval: 500
 						},
@@ -991,11 +991,11 @@
 					}
 					// 4. 获取设备状态
 					let deviceImei = this.itemInfo.deviceImei
-					let typeName = this.itemInfo.typeName
+					//let typeName = this.itemInfo.typeName
 					const statusRes = await getdeviceSTatus({
 							functionMode: 2,
 							batchId,
-							typeName,
+							typeName:'FunctionAccessBatchStatusRule',
 							deviceImei,
 							interval: 500
 						},

pages/common/login/index.vue

@@ -60,7 +60,7 @@
 		data() {
 			return {
 				showView: false,
-				phone: '17671332251', //手机号码
+				phone: '13800138002', //手机号码
 				code: "123456", //验证码
 				agreed: false,
 				isCounting: false,

pages/common/send/index.vue

@@ -157,7 +157,7 @@ export default {
 					const statusRes = await getdeviceSTatus({
 							functionMode: 2,
 							batchId,
-							typeName,
+							typeName:'FunctionAccessBatchStatusRule',
 							deviceImei,
 							interval: 500
 						},

utils/mqtt.js

@@ -119,9 +119,8 @@ import Paho from 'paho-mqtt';
 import allConfigs from '../config/index.js';
 
 // 根据环境选择正确的配置
-const env = 'development'; //production  //开发of线上 改这里就行
+const env = 'production'; //production  //开发of线上 改这里就行
 const config = allConfigs[env];
-
 class MqttClient {
 	constructor() {
 		this.client = null;

utils/request.js

@@ -1,5 +1,5 @@
 import config from '../config/index.js';
-const env = 'development'; //production development  //开发of线上 改这里就行
+const env = 'production'; //production development  //开发of线上 改这里就行
 const BASE = config[env];
 const request = (options) => {
 	console.log("options"+JSON.stringify(options),BASE.BASE_URL)