diff --git a/common/js/config.js b/common/js/config.js index ff0d068..479c4fa 100644 --- a/common/js/config.js +++ b/common/js/config.js @@ -1,7 +1,7 @@ const debug = false // true 是连地服务端本地,false 是连接线上 const development = { - domain: 'http://192.168.1.115:10215', + domain: 'http://192.168.1.22:10215', } const production = { @@ -18,7 +18,6 @@ if (process.env.NODE_ENV === 'development') { } // #endif -config.static = config.domain + '/system-boot/image/toStream?bgImage=' - +config.static = config.domain + '/system-boot/file/download?filePath=' export default config diff --git a/manifest.json b/manifest.json index fabcc27..bea1cd6 100644 --- a/manifest.json +++ b/manifest.json @@ -143,8 +143,8 @@ "proxy" : { "/api" : { "https" : true, - // "target" : "https://pqmcn.com:8092/api", - "target" : "http://192.168.1.126:10215", + "target" : "https://pqmcn.com:8092/api", + // "target" : "http://192.168.1.22:10215", "changOrigin" : true, "pathRewrite" : { "/api" : "" diff --git a/pages/device/APF/report.vue b/pages/device/APF/report.vue index 1d697f7..2167a59 100644 --- a/pages/device/APF/report.vue +++ b/pages/device/APF/report.vue @@ -3,13 +3,8 @@ - + @@ -19,6 +14,8 @@ 工程名称:{{ item.engineeringName }} 项目名称:{{ item.projectName }} + 监测点名称:{{ item.lineName }} + 暂态事件类型:{{ item.showName.slice(0, -4) }} 🔍 @@ -41,10 +38,8 @@ --> - + @@ -115,10 +110,10 @@ export default { item.showName = '告警,告警码:' + item.code } if (this.type !== '0') { - item.subTitle = `于${item.startTime}发生${item.showName}` + item.subTitle = `于${item.startTime}` } else { item.subTitle = - `于${item.startTime}发生${item.showName}。` + + `于${item.startTime}。` + item.dataSet .map((item2) => { return ( @@ -161,10 +156,12 @@ export default { border-radius: 8rpx; border: 1px solid #ebeef5; background: #fff; + .content-item-header { display: flex; padding: 20rpx 0; border-bottom: 1px solid #ebeef5; + .content-item-header-icon { display: flex; align-items: center; @@ -174,30 +171,35 @@ export default { border-radius: 8rpx; background: $uni-theme-color; } + .content-item-header-right { flex: 1; display: flex; flex-direction: column; justify-content: space-between; - height: 100rpx; + // height: 140rpx; margin-left: 20rpx; + .content-item-header-right-title { font-size: 28rpx; font-weight: bold; color: #111; } + .content-item-header-right-des { font-size: 24rpx; color: #999; } } } + .content-item-footer { margin-top: 20rpx; font-size: 24rpx; color: #999; } } + // padding-top: 20rpx; } diff --git a/pages/device/DVR/detail.vue b/pages/device/DVR/detail.vue index 6bc1e0a..c8031a0 100644 --- a/pages/device/DVR/detail.vue +++ b/pages/device/DVR/detail.vue @@ -5,23 +5,17 @@ + src="http://localhost:8088/api/system-boot/file/download?filePath=topology/1aca98ceb22a1fc33b81d9101275ef1.png" + mode="widthFix" style="width: 100%" /> - {{ item.text }} + {{ item.text + }} @@ -221,9 +215,9 @@ export default {