From 5674c763dbb5bfea655bea2a005c3bb4c2b9f56d Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 19 Apr 2024 17:06:56 +0800
Subject: [PATCH] =?UTF-8?q?app=20bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/layout.styl         |  4 +--
 pages/login/login.vue            |  6 ++--
 pages/login/setup.vue            | 18 +++++-----
 pages/manage/agv-call-manage.vue | 59 +++++++++++++++++++++-----------
 pages/manage/call-manage.vue     | 28 +++++++--------
 utils/getData2.js                |  3 +-
 6 files changed, 69 insertions(+), 49 deletions(-)

diff --git a/common/style/layout.styl b/common/style/layout.styl
index bed274b..17722b8 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -529,7 +529,7 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 	top -10%
 	left -10%
 	z-index 301
-	transform scale(0)
+	// transform scale(0)
 .pop_point_content
 	position relative
 	margin-top 40rpx
@@ -538,7 +538,7 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 	border-radius 10rpx
 	&::after
 		position absolute
-		top -40rpx
+		top -36rpx
 		left calc(50% - 20rpx)
 		content ''
 		width: 0;
diff --git a/pages/login/login.vue b/pages/login/login.vue
index db0377e..f4d4df9 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -67,9 +67,9 @@
 				})
 			},
 			async toLogin() {
-				// uni.redirectTo({
-				// 	url: '/pages/home/home'
-				// })
+				uni.redirectTo({
+					url: '/pages/home/home'
+				})
 				this.disabled = true
 				if (this.user === '') {
 					uni.showToast({
diff --git a/pages/login/setup.vue b/pages/login/setup.vue
index f48c4ab..0fbfbf3 100644
--- a/pages/login/setup.vue
+++ b/pages/login/setup.vue
@@ -11,10 +11,10 @@
 					<view class="setup-label">ACS地址</view>
 					<input type="text" class="setup-input" placeholder="请输入ACS地址" v-model="acsip">
 				</view> -->
-				<view class="setup-item">
+				<!-- <view class="setup-item">
 					<view class="setup-label">刷新时间(s)</view>
 					<input type="text" class="setup-input" placeholder="请输入刷新时间" v-model="setTime">
-				</view>
+				</view> -->
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
@@ -58,13 +58,13 @@
 				// 	})
 				// 	return
 				// }
-				if (this.setTime === '') {
-					uni.showToast({
-						title: '请填写刷新时间',
-						icon: 'none'
-					})
-					return
-				}
+				// if (this.setTime === '') {
+				// 	uni.showToast({
+				// 		title: '请填写刷新时间',
+				// 		icon: 'none'
+				// 	})
+				// 	return
+				// }
 				// 存值
 				this.$store.dispatch('setConfig',{baseUrl: this.addrip, acsUrl: this.acsip, printUrl: this.printip,setTime: this.setTime * 1000})
 				uni.redirectTo({
diff --git a/pages/manage/agv-call-manage.vue b/pages/manage/agv-call-manage.vue
index bb4de12..b2884c2 100644
--- a/pages/manage/agv-call-manage.vue
+++ b/pages/manage/agv-call-manage.vue
@@ -3,17 +3,26 @@
 		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
-				<view class="zd-row mgb20 border-bottom">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label" @tap="selectPoint">查找点位</span>
+					</view>
+					<view class="zd-col-19">
+						<input type="text" class="filter_input" v-model="val1">
+					</view>
+					<uni-icons type="search" size="22" color="#ff6a00"></uni-icons>
+				</view>
+				<view class="zd-row mgb20">
 					<uni-icons type="arrow-up" size="18" color="#ff6a00"></uni-icons>
 					<view class="zd-col-6 item-font-2">任务起点1</view>
 					<view class="zd-col-16 item-font-1">{{sCode1}}</view>
 				</view>
-				<view class="zd-row mgb20 border-bottom">
+				<view class="zd-row mgb20">
 					<uni-icons type="arrow-down" size="18" color="#ff6a00"></uni-icons>
 					<view class="zd-col-6 item-font-2">任务终点1</view>
 					<view class="zd-col-16 item-font-1">{{nCode1}}</view>
 				</view>
-				<view class="zd-row mgb20 border-bottom">
+				<view class="zd-row mgb20">
 					<uni-icons type="arrow-up" size="18" color="#ff6a00"></uni-icons>
 					<view class="zd-col-6 item-font-2">任务起点2</view>
 					<view class="zd-col-16 item-font-1">{{sCode2}}</view>
@@ -47,7 +56,7 @@
 			<button class="zd-col-6 button-primary" :class="{'button-info': !((sCode1 !== '' && nCode1 !== '') || (sCode2 !== '' && nCode2 !== ''))}" :disabled="disabled" @tap="_agvcallTask('2')">分切换轴</button>
 			<button class="zd-col-6 button-primary" :class="{'button-info': !((sCode1 !== '' && nCode1 !== '') || (sCode2 !== '' && nCode2 !== ''))}" :disabled="disabled" @tap="_agvcallTask('3')">搬运任务</button>
 		</view>
-		<view ref="pointIcon" class="pop_point_wrap">
+		<view class="pop_point_wrap" :style="{top: distanceToTop + 'px',left: distanceToLeft + 'px'}">
 			<view class="zd-row jccenter">
 				<uni-icons type="map-pin-ellipse" size="18" color="#fff"></uni-icons>
 			</view>
@@ -68,8 +77,8 @@
 
 <script>
 	import NavBar from '@/components/NavBar.vue'
-	// import {agvqueryArea, queryPointByArea} from '@/utils/mork2.js'
-	import {agvqueryArea, queryPointByArea, agvcallTask} from '@/utils/getData2.js'
+	import {agvqueryArea, queryPointByArea} from '@/utils/mork2.js'
+	import {agvcallTask} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar
@@ -86,7 +95,10 @@
 				nCode1: '',
 				sCode2: '',
 				nCode2: '',
-				show: false
+				show: false,
+				distanceToTop: -300,
+				distanceToLeft: -300,
+				val1: ''
 			};
 		},
 		onLoad (options) {
@@ -96,6 +108,13 @@
 			this.initArea()
 		},
 		methods: {
+			selectPoint () {
+				this.pointArr.map(el => {
+					if (val1 === el.device_code || val1 === el.device_name) {
+						
+					}
+				})
+			},
 			async initArea () {
 				let res = await agvqueryArea()
 				this.areaArr = [...res.data]
@@ -115,27 +134,23 @@
 				this.pointArr = [...res.data]
 			},
 			setcode (el,index) {
-				let distanceToTop = ''
-				let distanceToLeft = ''
-				const query = uni.createSelectorQuery().in(this);
+				const query = uni.createSelectorQuery().in(this)
 				query
 				.select(`#site_item_box_${index}`)
 				.boundingClientRect(data => {
 					if (data) {
-						distanceToTop = data.top + (data.height / 2) - 9
-						distanceToLeft = data.left
+						this.distanceToTop = data.top + (data.height / 2) - 9
+						this.distanceToLeft = data.left
 					}
 				}).exec()
 				this.show = true
-				this.$refs.pointIcon.$el.style.top = distanceToTop + 'px'
-				this.$refs.pointIcon.$el.style.left = distanceToLeft + 'px'
-				this.$refs.pointIcon.$el.style.transform = 'scale(100%)'
 				this.code = el.device_code
 			},
 			colsePop () {
 				this.show = !this.show
 				if (!this.show) {
-					this.$refs.pointIcon.$el.style.transform = 'scale(0)'
+					this.distanceToTop = -300
+					this.distanceToLeft = -300
 				}
 			},
 			getstartcode1 () {
@@ -144,7 +159,8 @@
 				} 
 				this.sCode1 = this.code
 				this.show = false
-				this.$refs.pointIcon.$el.style.transform = 'scale(0)'
+				this.distanceToTop = -300
+				this.distanceToLeft = -300
 			},
 			getnextcode1 () {
 				if (this.sCode1 !== '' && this.sCode1 === this.code) {
@@ -152,7 +168,8 @@
 				}
 				this.nCode1 = this.code
 				this.show = false
-				this.$refs.pointIcon.$el.style.transform = 'scale(0)'
+				this.distanceToTop = -300
+				this.distanceToLeft = -300
 			},
 			getstartcode2 () {
 				if (this.nCode2 !== '' && this.nCode2 === this.code) {
@@ -160,7 +177,8 @@
 				} 
 				this.sCode2 = this.code
 				this.show = false
-				this.$refs.pointIcon.$el.style.transform = 'scale(0)'
+				this.distanceToTop = -300
+				this.distanceToLeft = -300
 			},
 			getnextcode2 () {
 				if (this.sCode2 !== '' && this.sCode2 === this.code) {
@@ -168,7 +186,8 @@
 				}
 				this.nCode2 = this.code
 				this.show = false
-				this.$refs.pointIcon.$el.style.transform = 'scale(0)'
+				this.distanceToTop = -300
+				this.distanceToLeft = -300
 			},
 			/** 清空点位选择 */
 			cancle () {
diff --git a/pages/manage/call-manage.vue b/pages/manage/call-manage.vue
index 075ca16..7ac39c0 100644
--- a/pages/manage/call-manage.vue
+++ b/pages/manage/call-manage.vue
@@ -43,7 +43,7 @@
 			<button class="zd-col-6 button-primary" :class="{'button-info': sCode === '' || nCode === ''}" :disabled="disabled" @tap="_callTask('2')">分切换轴</button>
 			<button class="zd-col-6 button-primary" :class="{'button-info': sCode === '' || nCode === ''}" :disabled="disabled" @tap="_callTask('3')">搬运任务</button>
 		</view>
-		<view ref="pointIcon" class="pop_point_wrap">
+		<view class="pop_point_wrap" :style="{top: distanceToTop + 'px',left: distanceToLeft + 'px'}">
 			<view class="zd-row jccenter">
 				<uni-icons type="map-pin-ellipse" size="18" color="#fff"></uni-icons>
 			</view>
@@ -58,7 +58,7 @@
 
 <script>
 	import NavBar from '@/components/NavBar.vue'
-	import {queryArea, queryPointByArea, callTask} from '@/utils/getData2.js'
+	import {queryArea, queryPointByArea, callTask} from '@/utils/mork2.js'
 	export default {
 		components: {
 			NavBar
@@ -73,7 +73,9 @@
 				code: '',
 				sCode: '',
 				nCode: '',
-				show: false
+				show: false,
+				distanceToTop: -300,
+				distanceToLeft: -300
 			};
 		},
 		onLoad (options) {
@@ -102,27 +104,23 @@
 				this.pointArr = [...res.data]
 			},
 			setcode (el,index) {
-				let distanceToTop = ''
-				let distanceToLeft = ''
-				const query = uni.createSelectorQuery().in(this);
+				const query = uni.createSelectorQuery().in(this)
 				query
 				.select(`#site_item_box_${index}`)
 				.boundingClientRect(data => {
 					if (data) {
-						distanceToTop = data.top + (data.height / 2) - 9
-						distanceToLeft = data.left
+						this.distanceToTop = data.top + (data.height / 2) - 9
+						this.distanceToLeft = data.left
 					}
 				}).exec()
 				this.show = true
-				this.$refs.pointIcon.$el.style.top = distanceToTop + 'px'
-				this.$refs.pointIcon.$el.style.left = distanceToLeft + 'px'
-				this.$refs.pointIcon.$el.style.transform = 'scale(100%)'
 				this.code = el.device_code
 			},
 			colsePop () {
 				this.show = !this.show
 				if (!this.show) {
-					this.$refs.pointIcon.$el.style.transform = 'scale(0)'
+					this.distanceToTop = -300
+					this.distanceToLeft = -300
 				}
 			},
 			getstartcode () {
@@ -131,7 +129,8 @@
 				} 
 				this.sCode = this.code
 				this.show = false
-				this.$refs.pointIcon.$el.style.transform = 'scale(0)'
+				this.distanceToTop = -300
+				this.distanceToLeft = -300
 			},
 			getnextcode () {
 				if (this.sCode !== '' && this.sCode === this.code) {
@@ -139,7 +138,8 @@
 				}
 				this.nCode = this.code
 				this.show = false
-				this.$refs.pointIcon.$el.style.transform = 'scale(0)'
+				this.distanceToTop = -300
+				this.distanceToLeft = -300
 			},
 			/** 清空点位选择 */
 			cancle () {
diff --git a/utils/getData2.js b/utils/getData2.js
index f2eb787..2186b23 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -116,12 +116,13 @@ export const agvqueryPointByArea = (code) => request({
 	}
 })
 // 1.2创建任务(生成任务号为-开头)
-export const agvcallTask = (scode1, ncode1, scode2, ncode2) => request({
+export const agvcallTask = (scode1, ncode1, scode2, ncode2,type) => request({
 	url:'api/hands/callTask',
 	data: {
 		start_device_code1: scode1,
 		next_device_code1: ncode1,
 		start_device_code2: scode2,
 		next_device_code2: ncode2,
+		task_type: type
 	}
 })
\ No newline at end of file