diff --git a/App.vue b/App.vue index 31fcb8a..25b96d9 100644 --- a/App.vue +++ b/App.vue @@ -1,6 +1,6 @@ diff --git a/manifest.json b/manifest.json index abfe794..36b02cc 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "灿能物联", "appid" : "__UNI__88BC25B", "description" : "", - "versionName" : "1.3.2", - "versionCode" : 132, + "versionName" : "1.3.4", + "versionCode" : 134, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -139,8 +139,8 @@ "proxy" : { "/api" : { "https" : true, - // "target" : "https://pqmcn.com:8092/api", - "target" : "http://192.168.1.115:10215", + "target" : "https://pqmcn.com:8092/api", + // "target" : "http://192.168.1.13:10215", "changOrigin" : true, "pathRewrite" : { "/api" : "" diff --git a/pages/message/report.vue b/pages/message/report.vue index 0bd8c62..cd7fc96 100644 --- a/pages/message/report.vue +++ b/pages/message/report.vue @@ -7,7 +7,7 @@ show-badge badgeType="error" :badge-text="item.status == 1 ? '' : '未读'" - :title="item.showName" + :title="'告警代码:'+item.code" :note="item.startTime" @click="jump(item)" clickable diff --git a/pages/message/reportDetail.vue b/pages/message/reportDetail.vue index f83f3e2..ba5f937 100644 --- a/pages/message/reportDetail.vue +++ b/pages/message/reportDetail.vue @@ -10,7 +10,7 @@ 设备名称:{{ detail.equipmentName }} 项目名称:{{ detail.projectName }} 工程名称:{{ detail.engineeringName }} - 告警名称:{{ detail.showName }} + 告警代码:{{ detail.code }} {{ item.showName + ':' + (item.value == 3.1415926 ? '-' : item.value) + (item.unit || '') }} diff --git a/static/logo_216的副本.png b/static/logo_216的副本.png deleted file mode 100644 index c02fff4..0000000 Binary files a/static/logo_216的副本.png and /dev/null differ diff --git a/static/logo_216的副本2.png b/static/logo_216的副本2.png deleted file mode 100644 index c02fff4..0000000 Binary files a/static/logo_216的副本2.png and /dev/null differ