提交 上传华为app问题整改

pages/device/APF/detail.vue

@@ -80,14 +80,15 @@
 					</view>
 					<view style="height: 20rpx"></view>
 				</view>
-				<uni-fab
+			<!-- 	<uni-fab
 					ref="fab"
 					direction="vertical"
 					horizontal="right"
 					vertical="bottom"
 					:content="content"
 					@trigger="trigger"
-				/>
+				/> -->
+			<hover-menu :btnList="content" @trigger='trigger'></hover-menu>
 				<uni-popup ref="share" type="share" :safe-area="false">
 					<uni-popup-share title="分享到"></uni-popup-share>
 					<view style="height: 40rpx; background: #fff"></view>
@@ -139,7 +140,7 @@ import { manualAccess } from '@/common/api/accessBoot'
 import { MQTT_IP, MQTT_OPTIONS } from '@/common/js/mqtt.js'
 import mqtt, { log } from 'mqtt/dist/mqtt.js'
 import { base64ToPath, pathToBase64 } from 'image-tools'
-
+import hoverMenu from '@/hover-menu/components/hover-menu/hover-menu.vue';
 export default {
 	components: {
 		basic,
@@ -147,6 +148,7 @@ export default {
 		power,
 		oscillogram,
 		IO,
+		hoverMenu
 	},
 	data() {
 		return {
@@ -195,6 +197,7 @@ export default {
 					iconPath: '/static/access.png',
 					text: '接入',
 				},
+				
 			],
 			client: null,
 			timer: null,
@@ -206,14 +209,15 @@ export default {
 			basicData: [],
 			IOData: [],
 			pageOptions: {},
+			
 		}
 	},
 	methods: {
 		trigger(e) {
 			console.log(e)
-			if (e.item.text === '分享') {
+			if (e.text === '分享') {
 				uni.navigateTo({ url: '/pages/device/share?id=' + this.devId })
-			} else if (e.item.text === '删除') {
+			} else if (e.text === '删除') {
 				uni.showModal({
 					title: '提示',
 					content: '确定删除该设备吗？',
@@ -234,27 +238,27 @@ export default {
 						}
 					},
 				})
-			} else if (e.item.text === '下载') {
+			} else if (e.text === '下载') {
 				this.$util.toast('下载成功')
-			} else if (e.item.text === '记录') {
+			} else if (e.text === '记录') {
 				uni.navigateTo({ url: '/pages/device/APF/record' })
-			} else if (e.item.text === '告警') {
+			} else if (e.text === '告警') {
 				uni.navigateTo({ url: '/pages/device/APF/report?id=' + this.devId })
-			} else if (e.item.text === '关于') {
+			} else if (e.text === '关于') {
 				uni.navigateTo({ url: '/pages/device/APF/about?id=' + this.devId })
-			} else if (e.item.text === '移交') {
+			} else if (e.text === '移交') {
 				uni.navigateTo({ url: '/pages/device/transfer?id=' + this.devId })
-			} else if (e.item.text === '反馈') {
+			} else if (e.text === '反馈') {
 				uni.navigateTo({ url: '/pages/device/feedback' })
-			} else if (e.item.text === '用户') {
+			} else if (e.text === '用户') {
 				uni.navigateTo({ url: '/pages/device/user?id=' + this.devId + '&isPrimaryUser=' + this.isPrimaryUser })
-			} else if (e.item.text === '报表') {
+			} else if (e.text === '报表') {
 				this.$util.toast('效果是直接打开报表')
-			} else if (e.item.text === '版本') {
+			} else if (e.text === '版本') {
 				this.$util.toast('功能暂未开放')
-			} else if (e.item.text === '模版') {
+			} else if (e.text === '模版') {
 				this.$util.toast('效果是功能暂未开放直接打开报表')
-			} else if (e.item.text === '编辑') {
+			} else if (e.text === '编辑') {
 				let data = JSON.parse(JSON.stringify(this.deviceInfo))
 				data.appsLineTopologyDiagramPO.forEach((item) => {
 					delete item.value
@@ -262,17 +266,20 @@ export default {
 				uni.navigateTo({
 					url: '/pages/device/edit?deviceInfo=' + encodeURIComponent(JSON.stringify(data)),
 				})
-			} else if (e.item.text === '取消调试') {
+			} else if (e.text === '取消调试') {
 				this.cancelDebug()
-			} else if (e.item.text === '完成调试') {
+			} else if (e.text === '完成调试') {
 				this.finishDebug()
-			} else if (e.item.text === '接入') {
+			} else if (e.text === '接入') {
 				manualAccess({ nDid: this.pageOptions.ndid }).then((res) => {
 					this.$util.toast(res.message)
 				})
 			}
-			this.$refs.fab.close()
+			// this.$refs.fab.close()
 		},
+		  clickItem(item) {
+		                console.log(item);
+		            },
 		// 取消调试
 		cancelDebug() {
 			this.dialogType = '取消调试'
@@ -442,7 +449,7 @@ export default {
 								item.value = ''
 							} else {
 								if (!Number.isInteger(item.value)) {
-									item.value = item.value.toFixed(4)
+									item.value = item.value.toFixed(2)
 								}
 							}
 						})
@@ -461,12 +468,12 @@ export default {
 							if (key === 'Apf_RmsI_TolOut(A)') {
 								arr.push({
 									label: '总输出电流:',
-									value: Math.round(item.statisticalData)  + 'A',
+									value: Math.round(item.statisticalData) + 'A',
 								})
 							} else {
 								arr.push({
 									label: '电流畸变率:',
-									value:Math.round(item.statisticalData)  + '%',
+									value: Math.round(item.statisticalData) + '%',
 								})
 								// arr.push('电流畸变率:' + item.statisticalData + '%')
 							}
@@ -668,4 +675,28 @@ export default {
 		background: #f3f4f5;
 	}
 }
-</style>
+/deep/ .uni-fab__circle--rightBottom {
+	right: 8px !important;
+	bottom: 8px !important;
+}
+/deep/ .uni-fab--rightBottom {
+	right: 8px !important;
+	bottom: 8px !important;
+}
+/deep/ .uni-fab__circle {
+	width: 40px;
+	height: 40px;
+}
+
+/deep/ .uni-fab__content--flexDirectionEnd {
+	width: 40px !important;
+	// height: 50px !important;
+}
+/deep/.uni-fab__item {
+	// height: 45px;
+	width: 40px !important;
+}
+/deep/.uni-fab__item--first {
+	height: 40px !important;
+}
+</style>