diff --git a/manifest.json b/manifest.json index 8e35901..1da45ef 100644 --- a/manifest.json +++ b/manifest.json @@ -134,7 +134,8 @@ "proxy" : { "/api" : { "https" : true, - "target" : "https://pqmcn.com:8092/api", + // "target" : "https://pqmcn.com:8092/api", + "target" : "http://192.168.1.115:10215", "changOrigin" : true, "pathRewrite" : { "/api" : "" diff --git a/pages/mine/setupMessage.vue b/pages/mine/setupMessage.vue index 36eb3a2..9f7e15f 100644 --- a/pages/mine/setupMessage.vue +++ b/pages/mine/setupMessage.vue @@ -2,20 +2,20 @@ - 稳态越限 - + 运行事件 + 暂态事件 - 设备状态 - + 稳态事件 + - 设备消息 - + 设备告警 + @@ -45,17 +45,17 @@ export default { updatePushConfig(this.config).then(res => { let str = '' switch (type){ - case 'dataInfo': - str = '稳态越限' + case 'runInfo': + str = '运行事件' break case 'eventInfo': str = '暂态事件' break - case 'deviceInfo': - str = '设备状态' + case 'harmonicInfo': + str = '稳态事件' break - case 'systemInfo': - str = '设备消息' + case 'alarmInfo': + str = '设备告警' break } this.$util.toast(`${str}推送${this.config[type] === 1 ? '开启' : '关闭'}成功`)