去除高德定位
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
const debug = false // true 是连地服务端本地,false 是连接线上
|
const debug = true // true 是连地服务端本地,false 是连接线上
|
||||||
|
|
||||||
const development = {
|
const development = {
|
||||||
domain: 'http://192.168.1.22:10215',
|
domain: 'http://192.168.1.62:10215',
|
||||||
}
|
}
|
||||||
|
|
||||||
const production = {
|
const production = {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
export const MQTT_IP = 'pqmcn.com:8085/mqtt'//mqtt地址端口, 使用emqx时一定要加mqtt
|
// export const MQTT_IP = 'pqmcn.com:8085/mqtt'//mqtt地址端口, 使用emqx时一定要加mqtt
|
||||||
// export const MQTT_IP = '192.168.1.24:8085/mqtt'//mqtt地址端口, 使用emqx时一定要加mqtt
|
export const MQTT_IP = '192.168.1.24:8085/mqtt'//mqtt地址端口, 使用emqx时一定要加mqtt
|
||||||
|
|
||||||
const MQTT_USERNAME = 't_user'//mqtt用户名
|
const MQTT_USERNAME = 't_user'//mqtt用户名
|
||||||
const MQTT_PASSWORD = 'njcnpqs'//密码
|
const MQTT_PASSWORD = 'njcnpqs'//密码
|
||||||
|
|||||||
@@ -25,7 +25,6 @@
|
|||||||
},
|
},
|
||||||
/* 模块配置 */
|
/* 模块配置 */
|
||||||
"modules" : {
|
"modules" : {
|
||||||
"Maps" : {},
|
|
||||||
"Barcode" : {},
|
"Barcode" : {},
|
||||||
"Camera" : {},
|
"Camera" : {},
|
||||||
"Push" : {}
|
"Push" : {}
|
||||||
@@ -73,6 +72,7 @@
|
|||||||
"ad" : {},
|
"ad" : {},
|
||||||
"maps" : {
|
"maps" : {
|
||||||
"amap" : {
|
"amap" : {
|
||||||
|
"name" : "",
|
||||||
"appkey_ios" : "73262624599d79ee4ad8bba2ab4a0958",
|
"appkey_ios" : "73262624599d79ee4ad8bba2ab4a0958",
|
||||||
"appkey_android" : "c93dd87e087f3686a9d4463ce5ebcbe1"
|
"appkey_android" : "c93dd87e087f3686a9d4463ce5ebcbe1"
|
||||||
}
|
}
|
||||||
@@ -144,8 +144,8 @@
|
|||||||
"proxy" : {
|
"proxy" : {
|
||||||
"/api" : {
|
"/api" : {
|
||||||
"https" : true,
|
"https" : true,
|
||||||
"target" : "https://pqmcn.com:8092/api",
|
// "target" : "https://pqmcn.com:8092/api",
|
||||||
// "target" : "http://192.168.1.62:10215",
|
"target" : "http://192.168.1.62:10215",
|
||||||
"changOrigin" : true,
|
"changOrigin" : true,
|
||||||
"pathRewrite" : {
|
"pathRewrite" : {
|
||||||
"/api" : ""
|
"/api" : ""
|
||||||
|
|||||||
@@ -284,17 +284,17 @@ export default {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
chooseLocation() {
|
// chooseLocation() {
|
||||||
uni.chooseLocation({
|
// uni.chooseLocation({
|
||||||
success: function (res) {
|
// success: function (res) {
|
||||||
this.address = res.name
|
// this.address = res.name
|
||||||
console.log('位置名称:' + res.name)
|
// console.log('位置名称:' + res.name)
|
||||||
console.log('详细地址:' + res.address)
|
// console.log('详细地址:' + res.address)
|
||||||
console.log('纬度:' + res.latitude)
|
// console.log('纬度:' + res.latitude)
|
||||||
console.log('经度:' + res.longitude)
|
// console.log('经度:' + res.longitude)
|
||||||
},
|
// },
|
||||||
})
|
// })
|
||||||
},
|
// },
|
||||||
chooseGplot() {
|
chooseGplot() {
|
||||||
this.$refs.gplot.open()
|
this.$refs.gplot.open()
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -99,7 +99,10 @@
|
|||||||
<image class="gplot-image" ref="gplot-image" :src="formData.topologyDiagramUrl" mode="widthFix" />
|
<image class="gplot-image" ref="gplot-image" :src="formData.topologyDiagramUrl" mode="widthFix" />
|
||||||
<view class="btn-wrap" >
|
<view class="btn-wrap" >
|
||||||
<!-- <view class="btn-wrap-item" @click="add"> 添加监测点 </view> -->
|
<!-- <view class="btn-wrap-item" @click="add"> 添加监测点 </view> -->
|
||||||
<view class="btn-wrap-item" @click="submit"> 提交</view>
|
<!-- <view class="btn-wrap-item" @click="submit" > 提交</view> -->
|
||||||
|
<button class="btn-wrap-item" :loading="isLoading1" :disabled="isLoading1" @click="submit">
|
||||||
|
{{ isLoading1 ? '提交中...' : '提交' }}
|
||||||
|
</button>
|
||||||
</view>
|
</view>
|
||||||
<uni-drawer ref="gplot" mode="right" :mask-click="false">
|
<uni-drawer ref="gplot" mode="right" :mask-click="false">
|
||||||
<scroll-view style="height: 100%" scroll-y="true">
|
<scroll-view style="height: 100%" scroll-y="true">
|
||||||
@@ -189,6 +192,7 @@ export default {
|
|||||||
projectRange: [],
|
projectRange: [],
|
||||||
point: {},
|
point: {},
|
||||||
isLoading: false,
|
isLoading: false,
|
||||||
|
isLoading1: false,
|
||||||
pointList: [],
|
pointList: [],
|
||||||
activeGplot: 0,
|
activeGplot: 0,
|
||||||
positionList: [],
|
positionList: [],
|
||||||
@@ -360,17 +364,17 @@ export default {
|
|||||||
this.isLoading = false
|
this.isLoading = false
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
chooseLocation() {
|
// chooseLocation() {
|
||||||
uni.chooseLocation({
|
// uni.chooseLocation({
|
||||||
success: function (res) {
|
// success: function (res) {
|
||||||
this.address = res.name
|
// this.address = res.name
|
||||||
console.log('位置名称:' + res.name)
|
// console.log('位置名称:' + res.name)
|
||||||
console.log('详细地址:' + res.address)
|
// console.log('详细地址:' + res.address)
|
||||||
console.log('纬度:' + res.latitude)
|
// console.log('纬度:' + res.latitude)
|
||||||
console.log('经度:' + res.longitude)
|
// console.log('经度:' + res.longitude)
|
||||||
},
|
// },
|
||||||
})
|
// })
|
||||||
},
|
// },
|
||||||
chooseGplot() {
|
chooseGplot() {
|
||||||
this.$refs.gplot.open()
|
this.$refs.gplot.open()
|
||||||
this.dialogOpen = true
|
this.dialogOpen = true
|
||||||
@@ -451,6 +455,7 @@ export default {
|
|||||||
this.$util.toast('监测点不能重复')
|
this.$util.toast('监测点不能重复')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
this.isLoading1 = true
|
||||||
addDevice({
|
addDevice({
|
||||||
...this.formData,
|
...this.formData,
|
||||||
list: this.pointList,
|
list: this.pointList,
|
||||||
@@ -459,10 +464,13 @@ export default {
|
|||||||
}).then((res) => {
|
}).then((res) => {
|
||||||
console.log(res)
|
console.log(res)
|
||||||
this.$util.toast('提交成功')
|
this.$util.toast('提交成功')
|
||||||
|
this.isLoading1 = false
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
this.type = 3
|
this.type = 3
|
||||||
uni.navigateBack({ delta: 1 })
|
uni.navigateBack({ delta: 1 })
|
||||||
}, 1500)
|
}, 1500)
|
||||||
|
}).catch(()=>{
|
||||||
|
this.isLoading1 = false
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -93,17 +93,17 @@ export default {
|
|||||||
select(e) {
|
select(e) {
|
||||||
console.log(e)
|
console.log(e)
|
||||||
},
|
},
|
||||||
chooseLocation() {
|
// chooseLocation() {
|
||||||
uni.chooseLocation({
|
// uni.chooseLocation({
|
||||||
success: function (res) {
|
// success: function (res) {
|
||||||
this.address = res.name
|
// this.address = res.name
|
||||||
console.log('位置名称:' + res.name)
|
// console.log('位置名称:' + res.name)
|
||||||
console.log('详细地址:' + res.address)
|
// console.log('详细地址:' + res.address)
|
||||||
console.log('纬度:' + res.latitude)
|
// console.log('纬度:' + res.latitude)
|
||||||
console.log('经度:' + res.longitude)
|
// console.log('经度:' + res.longitude)
|
||||||
},
|
// },
|
||||||
})
|
// })
|
||||||
},
|
// },
|
||||||
async submit() {
|
async submit() {
|
||||||
console.log(this.formData)
|
console.log(this.formData)
|
||||||
if (!this.formData.name) {
|
if (!this.formData.name) {
|
||||||
|
|||||||
@@ -26,8 +26,8 @@
|
|||||||
<view style="display:flex;">
|
<view style="display:flex;">
|
||||||
<uni-easyinput :clearable="false" type="textarea" autoHeight v-model="formData.address"
|
<uni-easyinput :clearable="false" type="textarea" autoHeight v-model="formData.address"
|
||||||
placeholder="请输入位置信息" />
|
placeholder="请输入位置信息" />
|
||||||
<uni-icons type="location" color="#007aff" size="26" class="ml20"
|
<!-- <uni-icons type="location" color="#007aff" size="26" class="ml20"
|
||||||
@click="chooseLocation"></uni-icons>
|
@click="chooseLocation"></uni-icons> -->
|
||||||
</view>
|
</view>
|
||||||
</uni-forms-item>
|
</uni-forms-item>
|
||||||
<uni-forms-item label="拓扑图">
|
<uni-forms-item label="拓扑图">
|
||||||
@@ -97,17 +97,17 @@ export default {
|
|||||||
register () {
|
register () {
|
||||||
this.type = 2
|
this.type = 2
|
||||||
},
|
},
|
||||||
chooseLocation () {
|
// chooseLocation () {
|
||||||
uni.chooseLocation({
|
// uni.chooseLocation({
|
||||||
success: function (res) {
|
// success: function (res) {
|
||||||
this.address = res.name
|
// this.address = res.name
|
||||||
console.log('位置名称:' + res.name);
|
// console.log('位置名称:' + res.name);
|
||||||
console.log('详细地址:' + res.address);
|
// console.log('详细地址:' + res.address);
|
||||||
console.log('纬度:' + res.latitude);
|
// console.log('纬度:' + res.latitude);
|
||||||
console.log('经度:' + res.longitude);
|
// console.log('经度:' + res.longitude);
|
||||||
}
|
// }
|
||||||
});
|
// });
|
||||||
},
|
// },
|
||||||
submit () {
|
submit () {
|
||||||
this.$util.toast('提交成功')
|
this.$util.toast('提交成功')
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
|
|||||||
@@ -24,13 +24,13 @@
|
|||||||
v-model="formData.area"
|
v-model="formData.area"
|
||||||
placeholder="请输入区域信息"
|
placeholder="请输入区域信息"
|
||||||
/>
|
/>
|
||||||
<uni-icons
|
<!-- <uni-icons
|
||||||
type="location"
|
type="location"
|
||||||
color="#007aff"
|
color="#007aff"
|
||||||
size="26"
|
size="26"
|
||||||
class="ml20"
|
class="ml20"
|
||||||
@click="chooseLocation"
|
@click="chooseLocation"
|
||||||
></uni-icons>
|
></uni-icons> -->
|
||||||
</view>
|
</view>
|
||||||
</uni-forms-item>
|
</uni-forms-item>
|
||||||
<uni-forms-item label="描述">
|
<uni-forms-item label="描述">
|
||||||
@@ -241,19 +241,19 @@ export default {
|
|||||||
this.formData.files.push(...e.tempFiles)
|
this.formData.files.push(...e.tempFiles)
|
||||||
console.log(this.formData.files)
|
console.log(this.formData.files)
|
||||||
},
|
},
|
||||||
chooseLocation() {
|
// chooseLocation() {
|
||||||
uni.chooseLocation({
|
// uni.chooseLocation({
|
||||||
success: (res) => {
|
// success: (res) => {
|
||||||
this.formData.area = res.name
|
// this.formData.area = res.name
|
||||||
this.formData.lat = res.latitudeame
|
// this.formData.lat = res.latitudeame
|
||||||
this.formData.lng = res.longitude
|
// this.formData.lng = res.longitude
|
||||||
console.log('位置名称:' + res.name)
|
// console.log('位置名称:' + res.name)
|
||||||
console.log('详细地址:' + res.address)
|
// console.log('详细地址:' + res.address)
|
||||||
console.log('纬度:' + res.latitude)
|
// console.log('纬度:' + res.latitude)
|
||||||
console.log('经度:' + res.longitude)
|
// console.log('经度:' + res.longitude)
|
||||||
},
|
// },
|
||||||
})
|
// })
|
||||||
},
|
// },
|
||||||
async submit() {
|
async submit() {
|
||||||
console.log(this.formData)
|
console.log(this.formData)
|
||||||
if (!this.formData.name) {
|
if (!this.formData.name) {
|
||||||
|
|||||||
Reference in New Issue
Block a user