测试bug修改

This commit is contained in:
仲么了
2023-08-17 09:24:59 +08:00
parent 792e1ce7d7
commit 6bc28e4f44
33 changed files with 1066 additions and 826 deletions

View File

@@ -1,11 +1,16 @@
<template>
<Cn-page :loading="loading" noPadding>
<view slot="body">
<view class="detail">
<view class="detail" :style="{ opacity: domLoading ? '0' : '1' }">
<view class="detail-header">
<Cn-htmlToImg domId="header" @renderFinish="renderFinish">
<view class="header" ref="header" @click="previewImg">
<img :src="deviceInfo.filePath" style="width: 375px" mode="widthFix" />
<view class="header" id="header" ref="header" @click="previewImg">
<img
:src="deviceInfo.filePath"
style="width: 375px; display: block"
mode="widthFix"
@load="domLoading = false"
/>
<view
class="point"
:style="{ left: item.lat + 'px', top: item.lng + 'px' }"
@@ -36,18 +41,6 @@
<view style="width: 30rpx"> 0 </view>
<view> °C </view>
</view>
<view class="item">模块三</view>
<view class="item">
<view class="status-point-success mr10"></view>
<view style="width: 30rpx"> 15 </view>
<view> °C </view>
</view>
<view class="item">模块四</view>
<view class="item">
<view class="status-point-success mr10"></view>
<view style="width: 30rpx"> 15 </view>
<view> °C </view>
</view>
</view>
</view>
</view>
@@ -78,10 +71,10 @@
<view v-else-if="navMenuActive == 2">
<power :deviceInfo="deviceInfo"></power>
</view>
<view v-else-if="navMenuActive == 3">
<!-- <view v-else-if="navMenuActive == 3">
<oscillogram></oscillogram>
</view>
<view v-else-if="navMenuActive == 4">
</view> -->
<view v-else-if="navMenuActive == 3">
<IO :deviceInfo="deviceInfo"></IO>
</view>
<view style="height: 20rpx"></view>
@@ -111,7 +104,7 @@ import IO from './comp/IO.vue'
import { queryTopologyDiagram, deleteDevice } from '@/common/api/device'
import { MQTT_IP, MQTT_OPTIONS } from '@/common/js/mqtt.js'
import mqtt from 'mqtt/dist/mqtt.js'
import { base64ToPath } from 'image-tools'
import { base64ToPath, pathToBase64 } from 'image-tools'
export default {
components: {
basic,
@@ -122,6 +115,7 @@ export default {
},
data() {
return {
domLoading: true,
loading: true,
deviceInfo: {},
navMenuActive: 0,
@@ -364,7 +358,7 @@ export default {
this.init()
queryTopologyDiagram(options.id).then((res) => {
this.deviceInfo = res.data
console.log(this.dictData)
uni.setNavigationBarTitle({ title: this.deviceInfo.devName || '设备详情' })
this.dictData.forEach((item) => {
if (item.code == 'Line_Position') {
item.children.forEach((item2) => {
@@ -377,16 +371,6 @@ export default {
}
})
this.initMqtt()
console.log(this.loading, 'loading')
// this.$nextTick(() => {
// // 获取nav高度
// uni.createSelectorQuery()
// .select('.nav')
// .boundingClientRect((rect) => {
// this.navHeight = rect.height
// })
// .exec()
// })
})
},
}
@@ -438,7 +422,7 @@ export default {
.module {
position: absolute;
bottom: 0;
right: 20rpx;
right: 10rpx;
width: 200rpx;
.grid-card-content-2,