root
/
agri-app
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into feasure 

# Conflicts:
#	App.vue
master
xce 2026-01-04 23:58:21 +08:00
parent 77a9977cc6 ead9717f22
commit be0492f952
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifest.json
View File

@ -41,7 +41,7 @@
}, },
"quickapp" : {}, "quickapp" : {},
"mp-weixin" : { "mp-weixin" : {
"appid" : "wxccd7e2a0911b3397", "appid" : "wxd86ebf13689eac0d",
"setting" : { "setting" : {
"urlCheck" : false, "urlCheck" : false,
"es6" : false, "es6" : false,

6
pages/control/index.vue
View File

@ -172,7 +172,7 @@ export default {
mqttClient: null, mqttClient: null,
temp: "", temp: "",
mqttConfig: { mqttConfig: {
host: '1.94.254.176', host: '122.51.109.52',
port: 9001, port: 9001,
username: 'admin', username: 'admin',
password: 'Admin#12345678', password: 'Admin#12345678',
@ -359,7 +359,7 @@ export default {
//todo //todo
// this.status[type] = this.status[type] === 0 ? 1 : 0; // this.status[type] = this.status[type] === 0 ? 1 : 0;
// this.show[type] = this.status[type] === 0 ? "运行" : "暂停"; // this.show[type] = this.status[type] === 0 ? "暂停" : "运行";
} }
} }
@ -475,7 +475,7 @@ export default {
if (isSuccess) { if (isSuccess) {
this.status[type] = this.status[type] === 0 ? 1 : 0; this.status[type] = this.status[type] === 0 ? 1 : 0;
this.show[type] = this.status[type] === 0 ? "运行" : "暂停"; this.show[type] = this.status[type] === 0 ? "暂停" : "运行";
} }
this.deviceType = ''; this.deviceType = '';
this.$modal.msgSuccess("设备操作成功！") this.$modal.msgSuccess("设备操作成功！")

2
pages/demo/index.vue
View File

@ -238,7 +238,7 @@ export default {
return { return {
// MQTT配置 // MQTT配置
mqttConfig: { mqttConfig: {
broker: 'ws://1.94.254.176:9001/mqtt', // 公共测试服务器 broker: 'ws://122.51.109.52:9001/mqtt', // 公共测试服务器
clientId: 'uniapp_mqtt_' + Math.random().toString(16).substr(2, 8), clientId: 'uniapp_mqtt_' + Math.random().toString(16).substr(2, 8),
username: 'admin', username: 'admin',
password: 'Admin#12345678', password: 'Admin#12345678',