From 234637e58d6eef02a2d626427d4f3746df40573f Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Fri, 01 Mar 2024 15:05:37 +0800
Subject: [PATCH] fix:手持设备

---
 pages/actionChange/handheldDevices/index.vue |   44 ++++++++++++++++++++++++++------------------
 1 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/pages/actionChange/handheldDevices/index.vue b/pages/actionChange/handheldDevices/index.vue
index a187e17..f86e6d2 100644
--- a/pages/actionChange/handheldDevices/index.vue
+++ b/pages/actionChange/handheldDevices/index.vue
@@ -1,41 +1,42 @@
 <template>
 	<view class="mainContent">
 		<view class="">
-			<u--form labelPosition="left" labelWidth='80' :labelStyle='labelStyle'>
-				<u-form-item label="���������:" borderBottom ref="item1" @click="showDevicesList = true;" v-if="starBut">
-					<u-input border="none" disabled disabled-color="rgba(60, 156, 255,0)" color='#fff' placeholder="���������"
-						type="select" customStyle="margin: 0 5px;" v-model="deviceData.mac" />
+			<u--form labelAlign='right' labelWidth='80' :labelStyle='labelStyle'>
+				<u-form-item label="���������:" borderBottom ref="item1" @click="showDevicesList = true;">
+					<u-input border="none" disabled disabled-color="rgba(60, 156, 255,0)" color='#fff'
+						:inputAlign='`left`' placeholder="���������" type="select" customStyle="margin: 0 5px;"
+						v-model="deviceData.mac" />
 					<u-icon slot="right" name="arrow-right" color="#fff" />
 				</u-form-item>
-				<u-form-item label="���������:" borderBottom v-else>
+				<!-- <u-form-item label="���������:" borderBottom v-else>
 					<u-input border="none" disabled disabled-color="rgba(60, 156, 255,0)" color='#fff' placeholder="���������"
 						type="select" customStyle="margin: 0 5px;" v-model="deviceData.mac" />
-				</u-form-item>
+				</u-form-item> -->
 				<u-picker :show="showDevicesList" :columns="[devicesList]" :default-selector="[0]" keyName="label"
 					v-if="showDevicesList" @cancel="showDevicesList = false" :immediateChange='true'
 					@confirm="selectBack"></u-picker>
-				<!-- <u-form-item label="���������:" borderBottom ref="item1">
-					<u--input v-model="deviceData.mac" border="none" color='#fff' readonly></u--input>
-				</u-form-item> -->
 				<u-form-item label="������������:" borderBottom ref="item1">
-					<u--input v-model="deviceData.name" border="none" color='#fff' suffixIcon="edit-pen"
-						disabled-color="rgba(60, 156, 255,0)" :disabled="!starBut" v-if="starBut"
-						suffixIconStyle="font-size: 22px;color: #fff"></u--input>
-					<u--input v-model="deviceData.name" border="none" v-else color='#fff'
-						disabled-color="rgba(60, 156, 255,0)" :disabled="!starBut"></u--input>
+					<u-input v-model="deviceData.name" border="none" color='#fff' disabled-color="rgba(60, 156, 255,0)"
+						:disabled="!starBut" v-if="starBut" :focus="isFocus">
+						<template slot="suffix">
+							<u-icon name="edit-pen" color="#fff" size="18" @tap="getFocus" />
+						</template>
+					</u-input>
+					<u-input v-model="deviceData.name" border="none" v-else color='#fff'
+						disabled-color="rgba(60, 156, 255,0)" :disabled="!starBut"></u-input>
 				</u-form-item>
 				<u-form-item label="������������:" borderBottom ref="item1">
 					<view style="display: flex;align-items: center;" v-if="starBut">
-						<u--textarea v-model="deviceData.address" border="none" placeholder="���������"
-							autoHeight></u--textarea>
+						<u-textarea v-model="deviceData.address" border="none" placeholder="���������"
+							autoHeight></u-textarea>
 						<view style="width: 60px;">
 							<u-button @tap="authVerification()" text="������������" type="success" size="mini"></u-button>
 						</view>
 					</view>
-					<u--text :lines="3" :text="deviceData.address" v-else color='#fff'></u--text>
+					<u--text :lines="3" :text="deviceData.address" v-else color='#fff' :inputAlign='`left`'></u--text>
 				</u-form-item>
 				<u-form-item label="���������:" borderBottom ref="item1">
-					<u--input v-model="latlot" border="none" color='#fff' readonly></u--input>
+					<u-input v-model="latlot" border="none" color='#fff' readonly :inputAlign='`left`'></u-input>
 				</u-form-item>
 			</u--form>
 		</view>
@@ -80,6 +81,7 @@
 					paddingLeft: '10px'
 				},
 				showDevicesList: false,
+				isFocus: false,
 				starBut: true,
 				devicesList: [],
 				defaultMonitorItems: [],
@@ -155,6 +157,9 @@
 			}
 		},
 		methods: {
+			getFocus() {
+				this.isFocus = true
+			},
 			getMacDetail(mac) {
 				let params = {
 					mac: mac
@@ -193,6 +198,8 @@
 						this.starBut = false
 						this.queryAlarmByMac()
 						this.sensorLayout()
+					} else {
+						this.starBut = true
 					}
 				}).catch(res => {
 					uni.$u.toast(res)
@@ -539,6 +546,7 @@
 
 	/deep/.u-textarea {
 		background-color: rgba(60, 156, 255, 0) !important;
+		padding: 0px !important;
 	}
 
 	/deep/.u-textarea__field {

--
Gitblit v1.8.0