From 4e11e2f2fd3f8d283c28b68188f78a299a719647 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=B2=E4=B9=88=E4=BA=86?= <zhongchunyang@rocan.com.cn>
Date: Tue, 19 Sep 2023 09:47:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json               |  3 ++-
 pages/mine/setupMessage.vue | 24 ++++++++++++------------
 2 files changed, 14 insertions(+), 13 deletions(-)

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 @@
     <Cn-page :loading="loading">
         <view class="mine" slot="body">
             <view class="mine-nav" style="margin-top: 20rpx">
-                <view class="mine-nav-label">稳态越限</view>
-                <switch style="transform: scale(0.8)" color="#376cf3" @change="change('dataInfo')" :checked="config.dataInfo === 1"/>
+                <view class="mine-nav-label">运行事件</view>
+                <switch style="transform: scale(0.8)" color="#376cf3" @change="change('runInfo')" :checked="config.runInfo === 1"/>
             </view>
             <view class="mine-nav" style="border-bottom: none">
                 <view class="mine-nav-label">暂态事件</view>
                 <switch style="transform: scale(0.8)" color="#376cf3" @change="change('eventInfo')" :checked="config.eventInfo === 1"/>
             </view>
             <view class="mine-nav" style="border-bottom: none">
-                <view class="mine-nav-label">设备状态</view>
-                <switch style="transform: scale(0.8)" color="#376cf3" @change="change('deviceInfo')" :checked="config.deviceInfo === 1"/>
+                <view class="mine-nav-label">稳态事件</view>
+                <switch style="transform: scale(0.8)" color="#376cf3" @change="change('harmonicInfo')" :checked="config.harmonicInfo === 1"/>
             </view>
             <view class="mine-nav" style="border-bottom: none">
-                <view class="mine-nav-label">设备消息</view>
-                <switch style="transform: scale(0.8)" color="#376cf3" @change="change('systemInfo')" :checked="config.systemInfo === 1"/>
+                <view class="mine-nav-label">设备告警</view>
+                <switch style="transform: scale(0.8)" color="#376cf3" @change="change('alarmInfo')" :checked="config.alarmInfo === 1"/>
             </view>
         </view>
     </Cn-page>
@@ -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 ? '开启' : '关闭'}成功`)