670增加跳转至地图,修改mqtt.js,使用request中的环境配置

pages/670/HBY670.vue

@@ -39,7 +39,7 @@
 			</view>
 			<view class="item">
 				<text class="lbl">定位信息</text>
-				<view class="multiValue">
+				<view class="multiValue" @click.stop="gotoMap()">
 					<view class="valueItem valueFont">
 						{{formData.Lon}}
 
@@ -51,7 +51,10 @@
 					</view>
 					<view class="valueItem">
 
-						<view style="width:80%;float: right;text-align: right;" class="valueFont">{{formData.address}}
+						<view style="width:80%;float: right;text-align: right;" class="valueFont">
+						<uni-icons  type="location" size="17"
+							color="rgba(255, 255, 255, 0.8)" style="vertical-align: bottom;" />
+						{{formData.address}}
 						</view>
 						<view class="clear"></view>
 					</view>
@@ -406,7 +409,29 @@
 				rgb565Data: [],
 				videoHexArray: [],
 				picPath: "",
-				permissions: [] //权限列表
+				permissions: [], //权限列表
+				detailData: {
+					deviceId: null,
+					deviceName: null,
+					deviceImei: null,
+					deviceMac: null,
+					communicationMode: null,
+					devicePic: null,
+					typeName: null,
+					bluetoothName: null,
+					deviceStatus: null,
+					personnelInfo: null,
+					onlineStatus: null,
+					longitude: null,
+					latitude: null,
+					address: null,
+					staDetectGrade: null,
+					staLightGrade: null,
+					staSOSGrade: null,
+					staPowerTime: null,
+					staPowerPercent: null,
+					staDetectResult: null
+				}
 			}
 		},
 		created() {
@@ -490,6 +515,21 @@
 
 		},
 		methods: {
+			gotoMap() {
+				this.detailData.longitude=this.formData.Lon;
+				this.detailData.latitude=this.formData.Lat;
+				uni.navigateTo({
+					url: '/pages/common/map/index',
+					events: {
+						ack: function(data) {}
+					},
+					success: (res) => {
+						res.eventChannel.emit('Map', {
+							data: this.detailData
+						});
+					}
+				})
+			},
 			getDetail() {
 				var that = this;
 				api.getDetail(this.device.id).then(res => {
@@ -497,6 +537,7 @@
 					if (res && res.code == 200) {
 						res = res.data;
 						let json = res;
+						this.detailData = json;
 						console.log("res=", res);
 						that.formData.Lon = res.longitude;
 						that.formData.Lat = res.latitude;
@@ -1052,7 +1093,7 @@
 				});
 			},
 			sosSetting: function(type) {
-debugger;
+				debugger;
 				if (!this.permissions.includes('42') && this.Status.apiType !== 'listA') {
 
 					this.showPop({