diff --git a/common/api/harmonic.js b/common/api/harmonic.js index af0e0bc..e02d680 100644 --- a/common/api/harmonic.js +++ b/common/api/harmonic.js @@ -55,3 +55,11 @@ export function analyseWave(params) { params, }) } +// App-》工程下所有监测点数据 +export function getLineDataByEngineer(params) { + return request({ + url: '/cs-harmonic-boot/data/getLineDataByEngineer', + method: 'post', + params, + }) +} diff --git a/common/js/cacheKey.js b/common/js/cacheKey.js index bf380e0..0b1897e 100644 --- a/common/js/cacheKey.js +++ b/common/js/cacheKey.js @@ -1,10 +1,11 @@ -export default { - config: 'config', // 全剧配置 - userInfo: 'userInfo', // 用户信息 - engineering: 'engineering', // 工程信息 - access_token: 'access_token', // token - refresh_token: 'refresh_token', // 刷新token - dictData: 'dictData', // 字典数据 - messageCount: 'messageCount', // 消息数量 - serverConfig: 'serverConfig', // 服务内容配置 -} +export default { + config: 'config', // 全剧配置 + userInfo: 'userInfo', // 用户信息 + engineering: 'engineering', // 工程信息 + access_token: 'access_token', // token + refresh_token: 'refresh_token', // 刷新token + dictData: 'dictData', // 字典数据 + messageCount: 'messageCount', // 消息数量 + serverConfig: 'serverConfig', // 服务内容配置 + monitorSelectedIndicators: 'monitorSelectedIndicators', // 监测点已选展示指标 +} diff --git a/common/js/config.js b/common/js/config.js index ad3033a..f346d07 100644 --- a/common/js/config.js +++ b/common/js/config.js @@ -1,7 +1,7 @@ const debug = true // true 是连地服务端本地，false 是连接线上 const development = { - domain: 'http://192.168.1.103:10215', + domain: 'http://192.168.2.126:10215', } const production = { diff --git a/components/Cn-icon-transient/Cn-icon-transient.vue b/components/Cn-icon-transient/Cn-icon-transient.vue index 2441625..f4a775f 100644 --- a/components/Cn-icon-transient/Cn-icon-transient.vue +++ b/components/Cn-icon-transient/Cn-icon-transient.vue @@ -118,9 +118,19 @@ export default { Ib: 124.7A Ic: 125.1A +` + } else if (this.name == '报告1') { + return ` + + + + + + + ` } else if (this.name == '报告') { - return ` + return ` diff --git a/manifest.json b/manifest.json index ae156a3..70ba654 100644 --- a/manifest.json +++ b/manifest.json @@ -139,8 +139,7 @@ "/api" : { "https" : true, // "target" : "https://pqmcn.com:8092/api", - // "target" : "http://192.168.1.103:10215", - "target" : "http://192.168.1.103:10215", + "target" : "http://192.168.2.126:10215", "changOrigin" : true, "pathRewrite" : { "/api" : "" diff --git a/pages.json b/pages.json index 9826f01..50cfe05 100644 --- a/pages.json +++ b/pages.json @@ -125,7 +125,13 @@ { "path": "pages/index/comp/monitoringPoint", "style": { - "navigationBarTitleText": "监测点电能质量信息" + "navigationBarTitleText": "监测点电能质量信息", + "enablePullDownRefresh": true, + "pullToRefresh": { + "support":true, + "style": "circle", + "color":"#007aff" + } } }, { diff --git a/pages/device/APF/comp/IO.vue b/pages/device/APF/comp/IO.vue index e0ef3d4..665e7e1 100644 --- a/pages/device/APF/comp/IO.vue +++ b/pages/device/APF/comp/IO.vue @@ -3,7 +3,9 @@ - 温度 + + 温度 + - 负载电流 + + + 负载电流 + + 名称 有效值(A) @@ -63,7 +75,11 @@ - 补偿电流 + + + 补偿电流 + + 名称 有效值(A) @@ -180,5 +196,24 @@ export default { } diff --git a/pages/device/APF/comp/power.vue b/pages/device/APF/comp/power.vue index ea800d5..6e536fa 100644 --- a/pages/device/APF/comp/power.vue +++ b/pages/device/APF/comp/power.vue @@ -3,7 +3,9 @@ - 电网侧 + + 电网侧 + 名称 有功功率(kW) @@ -26,7 +28,9 @@ - 负载侧 + + 负载侧 + 名称 有功功率(kW) @@ -40,7 +44,7 @@ {{ item['Apf_Q_Load(Var)'] == '-' ? '-' : (item['Apf_Q_Load(Var)'] / 1000).toFixed(2) - }} + }} {{ item['Apf_S_Load(VA)'] == '-' ? '-' : (item['Apf_S_Load(VA)'] / 1000).toFixed(2) }} @@ -130,5 +134,24 @@ export default { } diff --git a/pages/device/realTime/index.vue b/pages/device/realTime/index.vue index 21febb7..b7f9c5a 100644 --- a/pages/device/realTime/index.vue +++ b/pages/device/realTime/index.vue @@ -163,14 +163,14 @@ export default { userInfo: {}, realTime: '', realTimeData: [ - { name: '电压有效值(kV)', A: '/', B: '/', C: '/' }, - { name: '电流有效值(A)', A: '/', B: '/', C: '/' }, - { name: '基波电压幅值(kV)', A: '/', B: '/', C: '/' }, - { name: '基波电流幅值(A)', A: '/', B: '/', C: '/' }, - { name: '基波电压相位(°)', A: '/', B: '/', C: '/' }, - { name: '基波电流相位(°)', A: '/', B: '/', C: '/' }, - { name: '电压偏差(%)', A: '/', B: '/', C: '/' }, - { name: '电压总谐波畸变率(%)', A: '/', B: '/', C: '/' }, + { name: '电压有效值(kV)', A: '-', B: '-', C: '-' }, + { name: '电流有效值(A)', A: '-', B: '-', C: '-' }, + { name: '基波电压幅值(kV)', A: '-', B: '-', C: '-' }, + { name: '基波电流幅值(A)', A: '-', B: '-', C: '-' }, + { name: '基波电压相位(°)', A: '-', B: '-', C: '-' }, + { name: '基波电流相位(°)', A: '-', B: '-', C: '-' }, + { name: '电压偏差(%)', A: '-', B: '-', C: '-' }, + { name: '电压总谐波畸变率(%)', A: '-', B: '-', C: '-' }, ], phaseColors: [ { name: 'A相', color: '#F1B22E' }, @@ -876,14 +876,14 @@ export default { clear() { this.realTime = '' this.realTimeData = [ - { name: '电压有效值(kV)', A: '/', B: '/', C: '/' }, - { name: '电流有效值(A)', A: '/', B: '/', C: '/' }, - { name: '基波电压幅值(kV)', A: '/', B: '/', C: '/' }, - { name: '基波电流幅值(A)', A: '/', B: '/', C: '/' }, - { name: '基波电压相位(°)', A: '/', B: '/', C: '/' }, - { name: '基波电流相位(°)', A: '/', B: '/', C: '/' }, - { name: '电压偏差(%)', A: '/', B: '/', C: '/' }, - { name: '电压总谐波畸变率(%)', A: '/', B: '/', C: '/' }, + { name: '电压有效值(kV)', A: '-', B: '-', C: '-' }, + { name: '电流有效值(A)', A: '-', B: '-', C: '-' }, + { name: '基波电压幅值(kV)', A: '-', B: '-', C: '-' }, + { name: '基波电流幅值(A)', A: '-', B: '-', C: '-' }, + { name: '基波电压相位(°)', A: '-', B: '-', C: '-' }, + { name: '基波电流相位(°)', A: '-', B: '-', C: '-' }, + { name: '电压偏差(%)', A: '-', B: '-', C: '-' }, + { name: '电压总谐波畸变率(%)', A: '-', B: '-', C: '-' }, ] this.echartsDataV1.series[0].data[0].value = 0 this.echartsDataV2.series[0].data[0].value = 0 diff --git a/pages/engineering/setting.vue b/pages/engineering/setting.vue index 898ffcb..5ccb3aa 100644 --- a/pages/engineering/setting.vue +++ b/pages/engineering/setting.vue @@ -117,7 +117,7 @@ export default { uni.removeStorage({ key: this.$cacheKey.engineering, }) - } else if (engineering && !res.data.some((item) => (item.id = engineering.id))) { + } else if (engineering && !res.data.some((item) => (item.id == engineering.id))) { uni.removeStorage({ key: this.$cacheKey.engineering, }) diff --git a/pages/index/comp/engineering.vue b/pages/index/comp/engineering.vue index 3029656..6dde6b6 100644 --- a/pages/index/comp/engineering.vue +++ b/pages/index/comp/engineering.vue @@ -209,7 +209,7 @@ export default { } .project-name { - font-size: 28rpx; + font-size: 30rpx; font-weight: 700; color: #333333; margin-bottom: 20rpx; @@ -232,14 +232,14 @@ export default { } .stat-value { - font-size: 36rpx; + font-size: 32rpx; font-weight: 700; } .stat-label { - font-size: 26rpx; + font-size: 24rpx; margin-top: 5rpx; - // color: #666666; + color: #666666; } .blue { diff --git a/pages/index/comp/indexGongCheng.vue b/pages/index/comp/indexGongCheng.vue index fd775fc..e573a36 100644 --- a/pages/index/comp/indexGongCheng.vue +++ b/pages/index/comp/indexGongCheng.vue @@ -1,7 +1,10 @@