+(JVcQLm3>V+q)^*mqn((>1axPpO)ySshI+R
z*TKkGN@4FmKVEXcHyVB}gBSQKya8Dg%>CH4cYC3Q=gDXeKqznkOqtg?p~~~tQVJ>O
zd^z{)Y$~P#kBgbPhU9}P-Ab!qn^#>E0EA?2pd{XeSlwazb<2RRMM>42(XNw^@}
zn7o9Fo{_77x=j87%36LMf!|;Tk-LRgKTH=3$RrT}a7cLrAf0~)rBP$3gp`{-a+^1(
z_KjOQNtcC|WAE@(3*W3to}3-zURQ-~r?&5moa9OQBXE
zM@6qcoj?Il+v?O?7JHIPIGszs!FZNi#7hXbi3Mlps;nXo762LdLW_ypr~oi&UyI%R
zT|I06!FYcB#R6+xMi&PlKDwc!(Vj!4BeOg}+G({oYoZb^g}MJa!~j9I)o;k{VZxn3
zAs$Ad2>BLypN<0c0I5v=CeAonX><_l|Nda31_1H`E07nMstVMB0-!FPUw{?BMO4C>
zFa=Np0J>S<(U>@hN=HUb0jU1@ITAqUQVC}Q0H}jNSlxeF+lfkCzf
zPxPQ*gsxZwS;7AyE4ZU7nSupC#<>oHT}>&R%mB*eU{LMsrCp@Oq=*4FAO;{!lx?k>
zU;&WM&p`|@kJ4CYPOW0I@F$4&pN|Baxe(>VgiZB!aG(H4wK?bDeC#g>^;P`!>#76j
z&-ZWP`ftS)K-n+_JdG)!o|2|99ss9)XK?0`r#o-?UJW~RAHCDS$EXcF3+|t~bQ~Vw
z5hR38E=vGl88`(~z;bHgWaY0c2+`TdqyH_;BL=twF~EhYWC?T%nA{?g+a=tORS0(p
z3PNTmDhBP(ul)7TT-ZgL1?(HcWBj6AqkX#y9Z8yj0zfhVFYqS3z~@v5sAEMSjXxWe
z!K#jtVV|V#>4rpBg?@|x0186efx>Aj1eE&%51=||yCIH#l{zkU6;OYEx~uJ^$}8pq
z_W-H1I}caoD9d)qct943Q11=MU%rg^DNDdU4My>1M`LoIQb9UYe**yEoDMg4k4hn>
zCulyQimXydwcGF01p>gw5CDEtrEUTTKy9mgfMp3B2Up)@y`bDE8ndH+v1PO`&jzYE
z64qY>xNf#F+mvimsTu#8Amj?Sf&2^M=zfGGha@F|Fk^CT#M6S@;gdE0veJiooj(+#
zJv=sPMMKSMm3lD(00;yZgOM{;3OW#N86U_ZlD&{>88>FzjU#Dj`6s*HQx@S5DX-!z
zVBgqg03fYC4$uv*lEv~Mc@e9D@u~$53w7k@^1fGyL2lFOoWDYUe4)F*$84FdZZ
zqdqWNnnCpT_JsIxt|@t=&QXo?08)7D39Q4Oz`;5d5%gGy{PQu_9;5OufPrK*5&*Sr
z?s=9FcLr?~o#SKezYuHx3v`ZY+%m9Fc==ewuD1IgynwP3F}f8!+<4su>x<7^75~R@
z-%L%9KqvrEToDx9e}dT^f>s#O_?@Wu*;_}&&v5*P0svBo
z+I0R3i}M?X6DSP-j&=XFDERoP3A}~|0QD`R%Cp_SBOn}Sg5v!0fWsc|_0%NBsyy#E
z8s0(!04dbev^zb<#j?=|Xxg``uYMh^yrBYs6b{S6W$*&iM=Pia-{aT+0*-neZUQfT
zJcJGaTZ%_tg#dc504dRG$o2_OSQD2w#n+WcinM#^0I+3QcolL4b4fL!n3#^&Km3Rg
zN&v`!uwc6{0|W>75n6j6A>Q8L*JUE_^roX`Sb%Tz#m*YIc*H{x%Fcof&Ye{00wYyL3Q0FbwgB@^x%2yvihy^Ux%
zME!5a;)#Qwx}0wsQHKCN3N-+VUZAb(FyBuKp@iU})FZJ13Teq?RKraaLEAjfsk=isj^gu7-xwj)w;_Vv3&!B9S4FIOh
zcgDsFY;DjPLs{Qnu=tl&G}u}$zA6=9Wdnd-FVJ}sE}wq5RHc;IU(3xNCGz-5_p$=qE6ky^}m#N?ITn__f9QS
z*#ST*NG6Q%cTvBC8utY;=LKq
zxm-?d6rJ?S9sqF9yspi81eZ?{CuGEf*y)?8(^x9TDt`b#Ym@I3)yYjxj%=q;uqQeW
zu#aamIbzLlw~7Ejab<9m*xBoH<wev_4`H?g?Gk6aZ40I8hGX|dCG%y|-T
z6ixD@EX?_1A#c!xgBsUE34`hZ<=jiM``hQ1L%=r>
zDk~ZQQXx|_?$=_>TMP{By|scc-+zFe#LJP~`DJK+&OR8ecmNbv2uL6mY-ct=Fo|)o
zJrjIYEN ({
type: 'Feature',
geometry: {
diff --git a/config.js b/config.js
index 571eafc..55eeb98 100644
--- a/config.js
+++ b/config.js
@@ -2,6 +2,8 @@ module.exports = {
baseUrl: '',
// 图片地址
imageUrl: '',
+ // 天地图tk
+ apiKey: 'e122b0518f43b32dcc256edbae20a5d1',
// 显示标题
showTitle: false,
// map 1、黑色模块 2、白色模块
diff --git a/pages/projectInfo/projectInfo.vue b/pages/projectInfo/projectInfo.vue
index dcc9a23..b97765e 100644
--- a/pages/projectInfo/projectInfo.vue
+++ b/pages/projectInfo/projectInfo.vue
@@ -102,7 +102,7 @@
@@ -324,19 +324,23 @@
detail(self.missionNo).then(res => {
self.info = res.data.data;
self.status = res.data.data.detailStatus;
- AddressToLocation({
- smart_address: res.data.data.address
- }).then((result) => {
- console.log('result', result)
- self.latitude = result.location.lat;
- self.longitude = result.location.lon;
- self.covers[0].latitude = result.location.lat;
- self.covers[0].longitude = result.location.lon;
- })
+ // AddressToLocation({
+ // smart_address: res.data.data.address
+ // }).then((result) => {
+ // console.log('result', result)
+ // self.latitude = result.location.lat;
+ // self.longitude = result.location.lon;
+ // self.covers[0].latitude = result.location.lat;
+ // self.covers[0].longitude = result.location.lon;
+ // })
// self.latitude = self.info.lat;
// self.longitude = self.info.lon;
// self.covers[0].latitude = self.info.lat;
// self.covers[0].longitude = self.info.lon;
+ self.$refs.uMap.initMap({
+ lat: self.info.lat,
+ lon: self.info.lon,
+ })
self.showDetail = true;
self.getCollectStatus();
if (self.type === 1) {
diff --git a/pages/projectInfo/userrecruitInfo.vue b/pages/projectInfo/userrecruitInfo.vue
index 76558ce..edb10f2 100644
--- a/pages/projectInfo/userrecruitInfo.vue
+++ b/pages/projectInfo/userrecruitInfo.vue
@@ -104,8 +104,9 @@
详细地址：{{info.address || '暂无'}}
+
@@ -221,6 +222,7 @@
} from '@/api/userrecruit.js'
import uniMask from '@/components/uni-mask/mask.vue'
import validCode from '@/components/p-valid-code/p-valid-code.vue'
+ import seeLocation from '@/components/sylj-selectLocation/seeLocation.vue';
import {
getuserrecruitDetailApp
} from '@/api/userrecruit.js'
@@ -235,8 +237,8 @@
maskShow: false,
nextBtn: false,
loading: false,
- latitude: 31.126855, //中心点
- longitude: 104.397894,
+ latitude: 30.70032, //中心点
+ longitude: 104.05235,
covers: [{ //marker标记位置
id: 0,
latitude: 0,
@@ -258,7 +260,8 @@
},
components: {
uniMask,
- validCode
+ validCode,
+ seeLocation
},
onLoad: function(option) { //option为object类型，会序列化上个页面传递的参数
// this.$store.dispatch('setAutograph')
@@ -329,10 +332,15 @@
self.info = resData.data.data;
self.status = resData.data.data.status;
self.missionNo = resData.data.data.missionNo;
- // self.latitude = self.info.lat;
- // self.longitude = self.info.lon;
- // self.covers[0].latitude = self.info.lat;
- // self.covers[0].longitude = self.info.lon;
+ self.latitude = self.info.lat;
+ self.longitude = self.info.lon;
+ self.covers[0].latitude = self.info.lat;
+ self.covers[0].longitude = self.info.lon;
+ self.$refs.uMap.initMap({
+ lat: self.info.lat,
+ lon: self.info.lon,
+ })
+ // this.$refs.cMap.open()
self.showDetail = true;
if (!this.seeDeatil) {
self.getCollectStatus();
diff --git a/pages/projectInfo/userrecruitWorkInfo.vue b/pages/projectInfo/userrecruitWorkInfo.vue
index 0ab2742..95fe5ba 100644
--- a/pages/projectInfo/userrecruitWorkInfo.vue
+++ b/pages/projectInfo/userrecruitWorkInfo.vue
@@ -110,7 +110,7 @@
@@ -334,10 +334,14 @@
self.info = resData.data.data;
self.status = resData.data.data.status;
self.missionNo = resData.data.data.missionNo;
- // self.latitude = self.info.lat;
- // self.longitude = self.info.lon;
- // self.covers[0].latitude = self.info.lat;
- // self.covers[0].longitude = self.info.lon;
+ self.latitude = self.info.lat;
+ self.longitude = self.info.lon;
+ self.covers[0].latitude = self.info.lat;
+ self.covers[0].longitude = self.info.lon;
+ self.$refs.uMap.initMap({
+ lat: self.info.lat,
+ lon: self.info.lon,
+ })
self.showDetail = true;
if (!this.seeDeatil) {
self.getCollectStatus();
diff --git a/pages/projectInfo/workInfo.vue b/pages/projectInfo/workInfo.vue
index d005353..21e8289 100644
--- a/pages/projectInfo/workInfo.vue
+++ b/pages/projectInfo/workInfo.vue
@@ -107,7 +107,7 @@
@@ -316,10 +316,14 @@
self.info = res.data.data;
self.status = res.data.data.status;
self.missionNo = res.data.data.missionNo;
- // self.latitude = self.info.lat;
- // self.longitude = self.info.lon;
- // self.covers[0].latitude = self.info.lat;
- // self.covers[0].longitude = self.info.lon;
+ self.latitude = self.info.lat;
+ self.longitude = self.info.lon;
+ self.covers[0].latitude = self.info.lat;
+ self.covers[0].longitude = self.info.lon;
+ self.$refs.uMap.initMap({
+ lat: self.info.lat,
+ lon: self.info.lon,
+ })
self.showDetail = true;
self.getCollectStatus();
if (self.type === 1) {
diff --git a/pages/recruit/subPage/task.vue b/pages/recruit/subPage/task.vue
index 25c9827..37c43ba 100644
--- a/pages/recruit/subPage/task.vue
+++ b/pages/recruit/subPage/task.vue
@@ -132,16 +132,18 @@
-
+ {{info.address}}
+
-
+
@@ -171,6 +173,9 @@
@confirm="stimeConfirm" @cancel="stimeClose" @close="stimeClose">
+
+
@@ -185,6 +190,7 @@
getDeptAllTree
} from '@/api/userrecruit.js'
import PickerTree from './enterpriceCertification/pickerTree.vue'
+ import syljSelectLocation from '@/components/sylj-selectLocation/sylj-selectLocation.vue'
import {
mapGetters
} from 'vuex'
@@ -441,6 +447,44 @@
},
methods: {
+ selectedOk(data) {
+ const {
+ infomation,
+ location,
+ name,
+ address
+ } = data
+ const {
+ lon,
+ lat
+ } = location
+ this.latitude = lat
+ this.longitude = lon
+ this.info.address = `${data.address}${ data.name && '(' + data.name + ')' }`
+ },
+ selectMap() {
+ const that = this
+ // uni.getLocation({
+ // type: 'wgs84',
+ // success: function(res) {
+ // console.log(res)
+ // uni.hideLoading();
+ // console.log('当前位置的经度：' + res.longitude);
+ // console.log('当前位置的纬度：' + res.latitude);
+ // // that.$refs.selectLocationPop.open(res.longitude, res.latitude, that.$config.apiKey);
+
+ // },
+ // fail: function(err) {
+ // console.log('获取失败');
+ // uni.hideLoading();
+
+ // },
+
+ // });
+ that.$refs.selectLocationPop.open(that.longitude, that.latitude, that.$config.apiKey);
+ console.log(this.latitude, this.longitude)
+ console.log('聚焦')
+ },
async getTreeDept() {
let resData = await getDeptAllTree()
if (resData.data.code === 200) {
@@ -812,4 +856,10 @@
/deep/.wageunitLeft .u-form-item__body {
padding: 0;
}
+
+ .addressinfo {
+ width: 100%;
+ height: fit-content;
+ min-height: 21px;
+ }
\ No newline at end of file
diff --git a/pages/recruit/subPage/work.vue b/pages/recruit/subPage/work.vue
index e986039..73ab04c 100644
--- a/pages/recruit/subPage/work.vue
+++ b/pages/recruit/subPage/work.vue
@@ -136,13 +136,14 @@
-
+ {{info.address}}
+
-
+
@@ -173,6 +174,7 @@
+
@@ -186,6 +188,7 @@
getDeptAllTree
} from '@/api/userrecruit.js'
import PickerTree from './enterpriceCertification/pickerTree.vue'
+ import syljSelectLocation from '@/components/sylj-selectLocation/sylj-selectLocation.vue'
import {
mapGetters
} from 'vuex'
@@ -412,7 +415,8 @@
}
},
components: {
- PickerTree
+ PickerTree,
+ syljSelectLocation
},
computed: {
...mapGetters(['area'])
@@ -433,6 +437,42 @@
}
},
methods: {
+ selectedOk(data) {
+ const {
+ infomation,
+ location,
+ name,
+ address
+ } = data
+ const {
+ lon,
+ lat
+ } = location
+ this.latitude = lat
+ this.longitude = lon
+ this.info.address = `${data.address}${ data.name && '(' + data.name + ')' }`
+ },
+ selectMap() {
+ const that = this
+ // uni.getLocation({
+ // type: 'wgs84',
+ // success: function(res) {
+ // console.log(res)
+ // uni.hideLoading();
+ // console.log('当前位置的经度：' + res.longitude);
+ // console.log('当前位置的纬度：' + res.latitude);
+ // // that.$refs.selectLocationPop.open(res.longitude, res.latitude, that.$config.apiKey);
+
+ // },
+ // fail: function(err) {
+ // console.log('获取失败');
+ // uni.hideLoading();
+
+ // },
+
+ // });
+ that.$refs.selectLocationPop.open(that.longitude, that.latitude, that.$config.apiKey);
+ },
async getTreeDept() {
let resData = await getDeptAllTree()
if (resData.data.code === 200) {
@@ -801,4 +841,10 @@
/deep/.wageunitLeft .u-form-item__body {
padding: 0;
}
+
+ .addressinfo {
+ width: 100%;
+ height: fit-content;
+ min-height: 21px;
+ }
\ No newline at end of file