From 40899e6d552b8abed2c414b991fb1802bb4344b8 Mon Sep 17 00:00:00 2001 From: guanj Date: Thu, 2 Jul 2026 09:55:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- androidPrivacy.json | 4 +- common/js/config.js | 8 +- manifest.json | 8 +- pages/device/APF/comp/basic.vue | 6 +- pages/device/APF/comp/power.vue | 10 +- pages/device/APF/comp/xieBo.vue | 4 +- pages/device/APF/detail.vue | 2 +- pages/device/new.vue | 17 ++- pages/device/realTime/index.vue | 12 +- pages/index/comp/apply.vue | 2 +- pages/index/comp/device.vue | 7 +- pages/index/comp/monitoringPoint.vue | 77 ++++++++++--- pages/index/comp/steadyState.vue | 126 ++++++++++++++------- pages/index/comp/targetInfo.vue | 44 ++++++-- pages/index/comp/transient.vue | 160 +++++++++++++++++++-------- pages/index/message1.vue | 2 +- pages/message/feedbackDetail.vue | 9 +- pages/message1/steadyState.vue | 28 +++-- pages/mine/setupMessage.vue | 11 +- static/user_manual.docx | Bin 1661604 -> 1695377 bytes static/user_manual1.docx | Bin 0 -> 1661604 bytes 21 files changed, 380 insertions(+), 157 deletions(-) create mode 100644 static/user_manual1.docx diff --git a/androidPrivacy.json b/androidPrivacy.json index 5b1694d..c93bfad 100644 --- a/androidPrivacy.json +++ b/androidPrivacy.json @@ -2,14 +2,14 @@ "version" : "2", "prompt" : "template", "title" : "服务协议和隐私政策", - "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
　　你可阅读《服务协议》和《隐私政策》了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。", + "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
　　你可阅读《服务协议》和《隐私政策》了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。", "buttonAccept" : "同意并接受", "buttonRefuse" : "暂不同意", "hrefLoader" : "system|default", "backToExit" : "false", "second" : { "title" : "确认提示", - "message" : "　　进入应用前，你需先同意《用户协议》和《隐私政策》，否则将退出应用。", + "message" : "　　进入应用前，你需先同意《用户协议》和《隐私政策》，否则将退出应用。", "buttonAccept" : "同意并继续", "buttonRefuse" : "退出应用" }, diff --git a/common/js/config.js b/common/js/config.js index d028cad..7335445 100644 --- a/common/js/config.js +++ b/common/js/config.js @@ -1,12 +1,12 @@ -const debug = true // true 是连地服务端本地，false 是连接线上 +const debug = false // true 是连地服务端本地，false 是连接线上 const development = { - domain: 'http://192.168.1.103:10215', - // domain: 'http://192.168.1.102:27707/api', + // domain: 'http://192.168.1.103:10215', + domain: 'http://192.168.1.102:27707/api', } const production = { - domain: 'https://pqmcn.com:8092/api', + domain: 'http://www.pqmcc.com:27707/api', } const config = debug ? development : production diff --git a/manifest.json b/manifest.json index 2cc9eff..d4dc689 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "灿能物联", "appid" : "__UNI__88BC25B", "description" : "", - "versionName" : "1.6.83", - "versionCode" : 170, + "versionName" : "2.0.1", + "versionCode" : 176, "transformPx" : false, "sassImplementationName" : "node-sass", /* 5+App特有相关 */ @@ -142,9 +142,9 @@ "proxy" : { "/api" : { "https" : true, - // "target" : "https://pqmcn.com:8092/api", + "target" : "http://www.pqmcc.com:27707/api", // "target" : "http://192.168.1.102:27707/api", - "target" : "http://192.168.1.103:10215", + // "target" : "http://192.168.1.103:10215", "changOrigin" : true, "pathRewrite" : { "/api" : "" diff --git a/pages/device/APF/comp/basic.vue b/pages/device/APF/comp/basic.vue index 75e188d..073cb03 100644 --- a/pages/device/APF/comp/basic.vue +++ b/pages/device/APF/comp/basic.vue @@ -96,8 +96,8 @@ export default { return { sections: SECTIONS, phaseColors: [ - { name: 'A相', color: '#F1B22E' }, - { name: 'B相', color: '#2BA471' }, + { name: 'A相', color: '#DAA520' }, + { name: 'B相', color: '#2E8B57' }, { name: 'C相', color: '#D54941' }, ], renderData: { @@ -304,7 +304,7 @@ export default { } .phase-value-vertical { - font-size: 28rpx; + font-size: 26rpx; font-weight: 700; } diff --git a/pages/device/APF/comp/power.vue b/pages/device/APF/comp/power.vue index 544c04b..9839c10 100644 --- a/pages/device/APF/comp/power.vue +++ b/pages/device/APF/comp/power.vue @@ -83,8 +83,8 @@ export default { return { sections: SECTIONS, phaseColors: [ - { name: 'A相', color: '#F1B22E' }, - { name: 'B相', color: '#2BA471' }, + { name: 'A相', color: '#DAA520' }, + { name: 'B相', color: '#2E8B57' }, { name: 'C相', color: '#D54941' }, ], renderData: { @@ -173,9 +173,9 @@ export default { if (Number.isNaN(num)) return value if (divide) { // return (num / divide).toFixed(2) - return num != 0 ? (num / divide).toFixed(2) : num + return num != 0 ? (num / divide).toFixed(2) : num.toFixed(2) } - return num + return num.toFixed(2) }, chunkedChildren(children) { const result = [] @@ -290,7 +290,7 @@ export default { } .phase-value-vertical { - font-size: 28rpx; + font-size: 26rpx; font-weight: 700; } diff --git a/pages/device/APF/comp/xieBo.vue b/pages/device/APF/comp/xieBo.vue index c9aae52..d30fb75 100644 --- a/pages/device/APF/comp/xieBo.vue +++ b/pages/device/APF/comp/xieBo.vue @@ -1,8 +1,8 @@