qfqk-android.git

			@@ -53,8 +53,9 @@
			<span class="once-left">
			集合点
			</span>
			<span class="once-right">
			<span class="once-right" @click="openMeeting">
			{{ourData.gathername}}
			<u-icon name="map-fill" color="#429FFF"></u-icon>
			</span>
			</view>
			<view class="once">
			@@ -129,38 +130,45 @@
			mapHeight: 0,
			latitude: 28.687205773173343,
			longitude: 115.8995839881188,
			circles: [{
			circles: [{ //集合点
			latitude: '',
			longitude: '',
			fillColor: "#D9E6EF", //填充颜色
			color: "#A7B6CB", //描边的颜色
			radius: 50, //半径
			strokeWidth: 2, //描边的宽度
			// fillColor: "#429FFF", //填充颜色
			// color: "#A7B6CB", //描边的颜色
			// radius: 2, //半径
			// strokeWidth: 2, //描边的宽度
			}, {
			latitude: '',
			longitude: '',
			fillColor: "#D9E6EF", //填充颜色
			color: "#A7B6CB", //描边的颜色
			radius: 10, //半径
			strokeWidth: 2, //描边的宽度
			}], //圆
			markers: [{
			width: 40,
			height: 40,
			// fillColor: "#D9E6EF", //填充颜色
			// color: "#A7B6CB", //描边的颜色
			// radius: 10, //半径
			// strokeWidth: 2, //描边的宽度
			}
			], //圆
			markers: [{ // 集合点
			width: '40',
			height: '40',
			// label: {
			// content: "集合点",
			// color: "#FE0000",
			// fontSize: 24,
			// textAlign: "center",
			// },
			id: 1,
			latitude: '',
			longitude: '',
			iconPath: 'http://223.82.109.183:2081/zhba/upload/20220225/f0aecffbaf0a2ce80f7938569da20de7.png',
			iconPath: '/static/dinw/location8.png',
			}, {
			width: 40,
			height: 40,
			width: '30',
			height: '30',
			id: 2,
			latitude: '',
			longitude: '',
			iconPath: 'http://223.82.109.183:2081/zhba/upload/20220225/7b486f647a15e708aca662dbd496dcd3.png',
			iconPath: '/static/dinw/dinw11.png',
			}], //标记点
			jihecircles: [], //集合点
			jihemarkers: [], //集合点
			jihelatitude: '', //集合点
			jihelongitude: '', //集合点
			mypolylines: [{ //指定一系列坐标点，从数组第一项连线至最后一项
			points: [],
			color: "#FE0000", //线的颜色
			@@ -205,8 +213,19 @@
			}
			},
			methods: {
			openMeeting() {
			let that = this;
			if (this.jihelatitude &&
			this.jihelongitude) {
			this.map.moveToLocation({
			latitude: that.jihelatitude,
			longitude: that.jihelongitude
			});
			}
			},
			mapControlsBack() {
			// console.log(1111)
			this.inThere = true;
			this.getLocationInfo("notSet");
			// this.bye = false;
			// this.timeBegin(1);
			@@ -233,8 +252,10 @@
			let that = this;
			if (type == "oks") {
			let dataAppend = that.ourData;
			dataAppend["serid"] = (uni.getStorageSync("ids") \|\| that.$store.state.puserID) + ",";
			dataAppend["serid"] = "," + (uni.getStorageSync("ids") \|\| that.$store.state.puserID);
			dataAppend["captain"] = uni.getStorageSync("name") \|\| that.$store.state.puserName;
			// console.log(dataAppend)
			// return
			uni.request({
			url: that.$store.state.piAPI + "taskqd/Graborder",
			method: "POST",
			@@ -638,7 +659,7 @@
			// this.$store.commit("stopTask", this.socketValue.rid);
			this.bye = true;
			uni.redirectTo({
			url: "/pages/grabOrders/grabOrders"
			url: "/pages/grabOrders/grabOrdersZAXC/grabOrders"
			});
			}
			},
			@@ -815,6 +836,9 @@
			that.ourData = data;
			this.latitude = +data.latlong[0];
			this.longitude = +data.latlong[1];
			//集合点
			this.jihelatitude = +data.latlong[0];
			this.jihelongitude = +data.latlong[1];
			that.markers[0].latitude = data.latlong[0];
			that.markers[0].longitude = data.latlong[1];
			that.circles[0].latitude = data.latlong[0];