flat: 地图添加

This commit is contained in:
Apcallover
2024-05-16 11:46:43 +08:00
parent 915189d8af
commit 22b9e68e17
10 changed files with 217 additions and 74 deletions

View File

@@ -1,5 +1,5 @@
VUE_APP_SITE='default' VUE_APP_SITE='default'
VUE_APP_LOGIN_ERROR = http://10.160.7.216:9920/casserver/login VUE_APP_LOGIN_ERROR = http://10.160.7.216:9920/casserver/login
VUE_APP_REPLACE_STR = {"{oss_file_url}": "http://10.165.0.173:8000", "https://dy12333.org.cn/api/jobslink-api/front/file": "http://10.165.0.173:8000/jobslink-api/front/file"} VUE_APP_REPLACE_STR = {"{oss_file_url}": "http://10.165.0.173:8000", "https://dy12333.org.cn/api/jobslink-api/front/file": "http://10.165.0.173:8000/jobslink-api/front/file"}
VUE_APP_LOGIN_NEXT = 'http://10.160.7.216:9920/casserver/login?service=http://10.165.0.173/manage/login&stService=http%3A%2F%2F10.165.0.173%2Fmanage%2Flogin' VUE_APP_LOGIN_NEXT = http://10.160.7.216:9920/casserver/login?service=http://10.165.0.173/manage/login&stService=http%3A%2F%2F10.165.0.173%2Fmanage%2Flogin
VUE_APP_SUPPER_MAP = 'http://10.165.0.44:1205/proxy/rest/maps/c02c6f51f3ab4190bffd5e3e54cf5ac4/111013e9067749488d44841208771768', VUE_APP_SUPPER_MAP = http://10.165.0.44:1205/proxy/rest/maps/c02c6f51f3ab4190bffd5e3e54cf5ac4/111013e9067749488d44841208771768

View File

@@ -1,5 +1,5 @@
VUE_APP_SITE='hengshui' VUE_APP_SITE='hengshui'
VUE_APP_LOGIN_ERROR = http://10.160.7.216:9920/casserver/login VUE_APP_LOGIN_ERROR = http://10.160.7.216:9920/casserver/login
VUE_APP_REPLACE_STR = {"{oss_file_url}": "http://10.165.0.173:8000", "https://dy12333.org.cn/api/jobslink-api/front/file": "http://10.165.0.173:8000/jobslink-api/front/file"} VUE_APP_REPLACE_STR = {"{oss_file_url}": "http://10.165.0.173:8000", "https://dy12333.org.cn/api/jobslink-api/front/file": "http://10.165.0.173:8000/jobslink-api/front/file"}
VUE_APP_LOGIN_NEXT = 'http://10.160.7.216:9920/casserver/login?service=http://10.165.0.173/manage/login&stService=http%3A%2F%2F10.165.0.173%2Fmanage%2Flogin' VUE_APP_LOGIN_NEXT = http://10.160.7.216:9920/casserver/login?service=http://10.165.0.173/manage/login&stService=http%3A%2F%2F10.165.0.173%2Fmanage%2Flogin
VUE_APP_SUPPER_MAP = 'http://10.165.0.44:1205/proxy/rest/maps/c02c6f51f3ab4190bffd5e3e54cf5ac4/111013e9067749488d44841208771768', VUE_APP_SUPPER_MAP = http://10.165.0.44:1205/proxy/rest/maps/c02c6f51f3ab4190bffd5e3e54cf5ac4/111013e9067749488d44841208771768

View File

@@ -1,5 +1,5 @@
VUE_APP_SITE='default' VUE_APP_SITE='default'
VUE_APP_LOGIN_ERROR = http://10.160.7.216:9920/casserver/login VUE_APP_LOGIN_ERROR = http://10.160.7.216:9920/casserver/login
VUE_APP_REPLACE_STR = {"{oss_file_url}": "http://10.165.0.173:8000", "https://dy12333.org.cn/api/jobslink-api/front/file": "http://10.165.0.77:8000/jobslink-api/front/file"} VUE_APP_REPLACE_STR = {"{oss_file_url}": "http://10.165.0.173:8000", "https://dy12333.org.cn/api/jobslink-api/front/file": "http://10.165.0.77:8000/jobslink-api/front/file"}
VUE_APP_LOGIN_NEXT = 'http://10.160.7.216:9920/casserver/login?service=http://10.165.0.54:8300/manage/login&stService=http%3A%2F%2F10.165.0.54%3A8300%2Fmanage%2Flogin' VUE_APP_LOGIN_NEXT = http://10.160.7.216:9920/casserver/login?service=http://10.165.0.54:8300/manage/login&stService=http%3A%2F%2F10.165.0.54%3A8300%2Fmanage%2Flogin
VUE_APP_SUPPER_MAP = 'http://10.165.0.44:1205/proxy/rest/maps/c02c6f51f3ab4190bffd5e3e54cf5ac4/111013e9067749488d44841208771768', VUE_APP_SUPPER_MAP = http://10.165.0.44:1205/proxy/rest/maps/c02c6f51f3ab4190bffd5e3e54cf5ac4/111013e9067749488d44841208771768

View File

@@ -1,6 +1,13 @@
<template> <template>
<div class="app-content"> <div class="app-content">
<div id="map" style="width: 100%;height: 100%;"></div> <el-input
v-if="type !== 'view'"
:placeholder="placeholder"
clearable
v-model="addressLocation"
@input="inputAddress"
></el-input>
<div class="app-map" id="map" style="width: 100%;height: 300px;"></div>
</div> </div>
</template> </template>
@@ -45,14 +52,18 @@ import {
GetFeaturesByGeometryParameters GetFeaturesByGeometryParameters
} from '@supermap/iclient-ol'; } from '@supermap/iclient-ol';
console.log(process.env.VUE_APP_SUPPER_MAP)
export default { export default {
name: "uMapView", name: "uMapView",
props: { props: {
placeholder: String,
latitude: { latitude: {
required: true, required: false,
default: 31.126855,
}, },
longitude: { longitude: {
required: true, required: false,
default: 104.397894,
}, },
zoom: { zoom: {
type: Number, type: Number,
@@ -88,6 +99,19 @@ export default {
type: Boolean, type: Boolean,
required: false, required: false,
default: false, default: false,
},
isCanEdit: {
type: Boolean,
required: false,
default: false,
},
address: {
required: false,
default: '',
},
type: {
required: false,
default: 'custom',
} }
}, },
data() { data() {
@@ -105,10 +129,14 @@ export default {
overlay: null, overlay: null,
// 控制参数 // 控制参数
isShowToolTip: false, isShowToolTip: false,
addressLocation: ''
}; };
}, },
mounted() { mounted() {
this.initMap() this.initMap()
if (this.address) {
this.addressLocation = this.address
}
if (this.flagTip) { if (this.flagTip) {
this.createHelpTooltip() this.createHelpTooltip()
} }
@@ -162,9 +190,18 @@ export default {
} }
this.$emit('regionchange', e.pixel) this.$emit('regionchange', e.pixel)
}); });
this.map.on('singleclick', (e) => { this.ceateMarker([this.longitude, this.latitude])
this.$emit('clickMap', this.coordinate) if (this.type !== 'view') {
}); this.map.on('singleclick', (e) => {
this.$emit('addAddress', {
address: this.addressLocation,
lng: e.coordinate[0],
lat: e.coordinate[1]
})
this.ceateMarker(e.coordinate)
});
}
// if (this.open) { // if (this.open) {
// this.addFeature([{ // this.addFeature([{
@@ -228,6 +265,7 @@ export default {
POP: 1, POP: 1,
CAPITAL: 'test' CAPITAL: 'test'
}); });
this.addPointsSource.clear()
// 将特征添加到矢量图层 // 将特征添加到矢量图层
this.addPointsSource.addFeature(pointFeature); this.addPointsSource.addFeature(pointFeature);
// 确保更新地图视图以显示新的标点 // 确保更新地图视图以显示新的标点
@@ -314,6 +352,11 @@ export default {
offset: [-30, 20], offset: [-30, 20],
positioning: 'center-left' positioning: 'center-left'
}); });
},
inputAddress(val) {
if (this.type !== 'view') {
this.$emit('input', val)
}
} }
} }
} }
@@ -322,7 +365,7 @@ export default {
<style scoped> <style scoped>
.app-content { .app-content {
width: 100%; width: 100%;
height: 300px; height: fit-content;
} }
.editPane { .editPane {

View File

@@ -23,7 +23,7 @@ import cityLabelCascader from './components/city-cascader/label'
import goBack from './components/go-back/main' import goBack from './components/go-back/main'
import tagSelect from './components/tag-select/main' import tagSelect from './components/tag-select/main'
import tooltip from './components/tooltip/index' import tooltip from './components/tooltip/index'
import superMapView from './components/map/selectLocation2.vue'; import superMapView from './components/map/selectLocation2';
import i18n from './lang' // Internationalization import i18n from './lang' // Internationalization
import axios from './router/axios'; import axios from './router/axios';
import router from './router/router'; import router from './router/router';
@@ -44,7 +44,7 @@ Vue.component('jl-city-cascader', cityCascader);
Vue.component('jl-cityLabel-cascader', cityLabelCascader); Vue.component('jl-cityLabel-cascader', cityLabelCascader);
Vue.component('tag-select', tagSelect) Vue.component('tag-select', tagSelect)
Vue.component('tool-tip', tooltip) Vue.component('tool-tip', tooltip)
Vue.component('superMap-View', superMapView) Vue.component('super-map-view', superMapView)
// 加载相关url地址 // 加载相关url地址
Object.keys(urls).forEach(key => { Object.keys(urls).forEach(key => {
Vue.prototype[key] = urls[key]; Vue.prototype[key] = urls[key];

View File

@@ -38,17 +38,34 @@
</template> </template>
<template slot-scope="{ disabled }" slot="address"> <template slot-scope="{ disabled }" slot="address">
<select-map <!-- <select-map-->
<!-- ref="selectMap"-->
<!-- @addAddress="addAddress"-->
<!-- @addressDel="addressDel"-->
<!-- @input="inputAddress"-->
<!-- :isCanEdit="!disabled"-->
<!-- :lng="obj.lon"-->
<!-- :lat="obj.lat"-->
<!-- :address="obj.address"-->
<!-- :type="type"-->
<!-- ></select-map>-->
<super-map-view
ref="selectMap" ref="selectMap"
@addAddress="addAddress" @addAddress="addAddress"
@addressDel="addressDel" @addressDel="addressDel"
@input="inputAddress" @input="inputAddress"
:isCanEdit="!disabled" :isCanEdit="!disabled"
:lng="obj.lon" :longitude="obj.lon"
:lat="obj.lat" :latitude="obj.lat"
:address="obj.address" :address="obj.address"
:type="type" :type="type"
></select-map> :open="true"
:zoom="10"
:min-zoom="10"
:max-zoom="20"
:flag-tip="false"
placeholder="请输入详细地址"
></super-map-view>
</template> </template>
<template slot-scope="{ row }" slot="wage"> <template slot-scope="{ row }" slot="wage">
<el-input placeholder="请输入工资" type="number" v-model="obj.wage" class="input-with-select" @blur="wageBlur"> <el-input placeholder="请输入工资" type="number" v-model="obj.wage" class="input-with-select" @blur="wageBlur">
@@ -160,6 +177,8 @@ export default {
tradeId: null, tradeId: null,
tradeNames: null, tradeNames: null,
userNature: "灵活用工", userNature: "灵活用工",
lat: 31.126855,
lon: 104.397894
}, },
loading: false, loading: false,
drawer: false, drawer: false,
@@ -926,7 +945,8 @@ export default {
education: 7, education: 7,
experienceDesc: "不限经验", experienceDesc: "不限经验",
userNature: "灵活用工", userNature: "灵活用工",
lat: 31.126855,
lon: 104.397894
}; };
}, },
/*地图*/ /*地图*/

View File

@@ -76,17 +76,34 @@
</template> </template>
<template slot-scope="{ disabled }" slot="address"> <template slot-scope="{ disabled }" slot="address">
<select-map <!-- <select-map-->
<!-- ref="selectMap"-->
<!-- @addAddress="addAddress"-->
<!-- @addressDel="addressDel"-->
<!-- @input="inputAddress"-->
<!-- :isCanEdit="!disabled"-->
<!-- :lng="obj.lon"-->
<!-- :lat="obj.lat"-->
<!-- :address="obj.address"-->
<!-- :type="type"-->
<!-- ></select-map>-->
<super-map-view
ref="selectMap" ref="selectMap"
@addAddress="addAddress" @addAddress="addAddress"
@addressDel="addressDel" @addressDel="addressDel"
@input="inputAddress" @input="inputAddress"
:isCanEdit="!disabled" :isCanEdit="!disabled"
:lng="obj.lon" :longitude="obj.lon"
:lat="obj.lat" :latitude="obj.lat"
:address="obj.address" :address="obj.address"
:type="type" :type="type"
></select-map> :open="true"
:zoom="10"
:min-zoom="10"
:max-zoom="20"
:flag-tip="false"
placeholder="请输入详细地址"
></super-map-view>
</template> </template>
<!-- 行业类型 --> <!-- 行业类型 -->
<!-- <template slot="tradeId"> <!-- <template slot="tradeId">
@@ -200,6 +217,8 @@ export default {
tradeId: null, tradeId: null,
tradeNames: null, tradeNames: null,
userNature: "灵活用工", userNature: "灵活用工",
lat: 31.126855,
lon: 104.397894
}, },
loading: false, loading: false,
drawer: false, drawer: false,
@@ -1059,7 +1078,8 @@ export default {
education: 7, education: 7,
experienceDesc: "不限经验", experienceDesc: "不限经验",
userNature: "灵活用工", userNature: "灵活用工",
lat: 31.126855,
lon: 104.397894
}; };
}, },
/*地图*/ /*地图*/

View File

@@ -181,7 +181,19 @@
model.address model.address
}} }}
</el-form-item> </el-form-item>
<select-map :lat="model.lat" :lng="model.lon" :isCanEdit="false" :type="'view'"></select-map> <!-- <select-map :lat="model.lat" :lng="model.lon" :isCanEdit="false" :type="'view'"></select-map>-->
<super-map-view
:isCanEdit="false"
:longitude="model.lon"
:latitude="model.lat"
:open="true"
:zoom="10"
:min-zoom="10"
:max-zoom="20"
:flag-tip="false"
placeholder="请输入详细地址"
:type="'view'"
></super-map-view>
</el-col> </el-col>
</el-row> </el-row>
</el-collapse-item> </el-collapse-item>

View File

@@ -11,24 +11,28 @@
<el-row> <el-row>
<el-col span="12"> <el-col span="12">
<el-form-item label="岗位名称:">{{ <el-form-item label="岗位名称:">{{
model.jobName model.jobName
}}</el-form-item> }}
</el-form-item>
</el-col> </el-col>
<el-col span="12"> <el-col span="12">
<el-form-item label="岗位编码:">{{ <el-form-item label="岗位编码:">{{
model.missionNo model.missionNo
}}</el-form-item> }}
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col span="12"> <el-col span="12">
<el-form-item label="报名截止:">{{ <el-form-item label="报名截止:">{{
format(model.etimePub) format(model.etimePub)
}}</el-form-item> }}
</el-form-item>
</el-col> </el-col>
<el-col span="12"> <el-col span="12">
<el-form-item label="岗位时间:">{{ format(model.stime) }} <el-form-item label="岗位时间:">{{ format(model.stime) }}
{{ format(model.etime) }}</el-form-item> {{ format(model.etime) }}
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-collapse-item> </el-collapse-item>
@@ -44,15 +48,18 @@
<el-form-item label="招聘人数:">{{ model.peopleNum }}</el-form-item> <el-form-item label="招聘人数:">{{ model.peopleNum }}</el-form-item>
</el-col> </el-col>
<el-col span="12"> <el-col span="12">
<el-form-item label="参考工资:">{{ model.wage <el-form-item label="参考工资:">{{
}}{{ wageUnitCategory[model.wageUnitCategory] }}</el-form-item> model.wage
}}{{ wageUnitCategory[model.wageUnitCategory] }}
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col span="12"> <el-col span="12">
<el-form-item label="行业类型:">{{ <el-form-item label="行业类型:">{{
model.tradeNames model.tradeNames
}}</el-form-item> }}
</el-form-item>
</el-col> </el-col>
<el-col span="12"> <el-col span="12">
<el-form-item> <el-form-item>
@@ -64,8 +71,9 @@
<el-row> <el-row>
<el-col span="24"> <el-col span="24">
<el-form-item label="岗位描述:">{{ <el-form-item label="岗位描述:">{{
model.jobDescription model.jobDescription
}}</el-form-item> }}
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-collapse-item> </el-collapse-item>
@@ -82,21 +90,24 @@
</el-col> </el-col>
<el-col span="8"> <el-col span="8">
<el-form-item label="年龄要求:">{{ <el-form-item label="年龄要求:">{{
model.ageDesc model.ageDesc
}}</el-form-item> }}
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col span="16"> <el-col span="16">
<el-form-item label="学历要求:">{{ <el-form-item label="学历要求:">{{
education[model.education] education[model.education]
}}</el-form-item> }}
</el-form-item>
</el-col> </el-col>
<el-col span="8"> <el-col span="8">
<el-form-item label="经验要求:">{{ <el-form-item label="经验要求:">{{
model.experienceDesc model.experienceDesc
}}</el-form-item> }}
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-collapse-item> </el-collapse-item>
@@ -110,42 +121,49 @@
<el-row> <el-row>
<el-col span="12"> <el-col span="12">
<el-form-item label="用工单位:">{{ <el-form-item label="用工单位:">{{
model.jobCompanyName model.jobCompanyName
}}</el-form-item> }}
</el-form-item>
</el-col> </el-col>
<el-col span="12"> <el-col span="12">
<el-form-item label="单位信用代码:">{{ <el-form-item label="单位信用代码:">{{
model.jobCompanyScale model.jobCompanyScale
}}</el-form-item> }}
</el-form-item>
</el-col> </el-col>
<el-col span="12"> <el-col span="12">
<el-form-item label="单位性质:">{{ <el-form-item label="单位性质:">{{
model.jobCompanyNature model.jobCompanyNature
}}</el-form-item> }}
</el-form-item>
</el-col> </el-col>
<el-col span="12"> <el-col span="12">
<el-form-item label="所属行业:">{{ <el-form-item label="所属行业:">{{
model.jobCompanyIndustry model.jobCompanyIndustry
}}</el-form-item> }}
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col span="24"> <el-col span="24">
<el-form-item label="单位介绍:">{{ <el-form-item label="单位介绍:">{{
model.jobCompanyDescription model.jobCompanyDescription
}}</el-form-item> }}
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col span="8"> <el-col span="8">
<el-form-item label="联 系 人:">{{ <el-form-item label="联 系 人:">{{
model.callName model.callName
}}</el-form-item> }}
</el-form-item>
</el-col> </el-col>
<el-col span="8"> <el-col span="8">
<el-form-item label="联系方式:">{{ <el-form-item label="联系方式:">{{
model.callTel model.callTel
}}</el-form-item> }}
</el-form-item>
</el-col> </el-col>
<el-col span="8"> <el-col span="8">
<el-form-item> <el-form-item>
@@ -156,17 +174,32 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col span="24"> <el-col span="24">
<el-form-item label="工作地址:" v-if="model.cityId">{{ city[0] && city[0].label }} {{ city[1] && city[1].label <el-form-item label="工作地址:" v-if="model.cityId">{{ city[0] && city[0].label }} {{
}} city[1] && city[1].label
{{ city[2] && city[2].label }}</el-form-item> }}
{{ city[2] && city[2].label }}
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col span="24"> <el-col span="24">
<el-form-item label="详细地址:">{{ <el-form-item label="详细地址:">{{
model.address model.address
}}</el-form-item> }}
<select-map :lat="model.lat" :lng="model.lon" :isCanEdit="false" :type="'view'"></select-map> </el-form-item>
<!-- <select-map :lat="model.lat" :lng="model.lon" :isCanEdit="false" :type="'view'"></select-map>-->
<super-map-view
:isCanEdit="false"
:longitude="model.lon"
:latitude="model.lat"
:open="true"
:zoom="10"
:min-zoom="10"
:max-zoom="20"
:flag-tip="false"
placeholder="请输入详细地址"
:type="'view'"
></super-map-view>
</el-col> </el-col>
</el-row> </el-row>
</el-collapse-item> </el-collapse-item>
@@ -181,14 +214,16 @@
<el-col span="24"> <el-col span="24">
<el-form-item label="审核状态:">{{ <el-form-item label="审核状态:">{{
recruit[model.reviewState] recruit[model.reviewState]
}}</el-form-item> }}
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col span="24"> <el-col span="24">
<el-form-item label="审核备注:">{{ <el-form-item label="审核备注:">{{
model.reviewMsg || '无' model.reviewMsg || '无'
}}</el-form-item> }}
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-collapse-item> </el-collapse-item>
@@ -199,8 +234,8 @@
<script> <script>
import SelectMap from "@/components/map/selectLocation"; import SelectMap from "@/components/map/selectLocation";
import { mapGetters } from "vuex"; import {mapGetters} from "vuex";
import { dateFormat } from "@/util/date"; import {dateFormat} from "@/util/date";
import { import {
wageUnitCategoryState, wageUnitCategoryState,
educationState, educationState,
@@ -216,8 +251,8 @@ function getDic(arr) {
} }
export default { export default {
components: { SelectMap }, components: {SelectMap},
props: { model: Object }, props: {model: Object},
data() { data() {
return { return {
activeNames: ["1", "2", "3", "4", "5"], activeNames: ["1", "2", "3", "4", "5"],
@@ -227,7 +262,8 @@ export default {
recruit: getDic(recruitStatus), recruit: getDic(recruitStatus),
}; };
}, },
mounted() { }, mounted() {
},
methods: { methods: {
getSkill(skillStr) { getSkill(skillStr) {
return skillStr.split(","); return skillStr.split(",");
@@ -248,7 +284,7 @@ export default {
</script> </script>
<style> <style>
.mission-view .el-tag+.el-tag { .mission-view .el-tag + .el-tag {
margin-left: 5px; margin-left: 5px;
} }

View File

@@ -188,7 +188,19 @@
model.address model.address
}} }}
</el-form-item> </el-form-item>
<select-map :lat="model.lat" :lng="model.lon" :isCanEdit="false" :type="'view'"></select-map> <!-- <select-map :lat="model.lat" :lng="model.lon" :isCanEdit="false" :type="'view'"></select-map>-->
<super-map-view
:isCanEdit="false"
:longitude="model.lon"
:latitude="model.lat"
:open="true"
:zoom="10"
:min-zoom="10"
:max-zoom="20"
:flag-tip="false"
placeholder="请输入详细地址"
:type="'view'"
></super-map-view>
</el-col> </el-col>
</el-row> </el-row>
</el-collapse-item> </el-collapse-item>