lsq
/
byhl-zt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增了标记中心点

Browse Source
master
doublekou 1 year ago
parent e16ceac219
commit 11df93224e
8 changed files with 142 additions and 85 deletions
Show Stats Download Patch File Download Diff File

1
src/components/Search/SearchActions.vue
Unescape Escape View File

@ -7,6 +7,7 @@
<a-button type="primary" :loading="props.loading" @click="emits('search')">查询</a-button> <a-button type="primary" :loading="props.loading" @click="emits('search')">查询</a-button>
<a-button @click="emits('reset')">重置</a-button> <a-button @click="emits('reset')">重置</a-button>
</a-space> </a-space>
<!-- <a v-if="props.collapsible" @click="() => toggleCollapsed()"> -->
<a v-if="props.collapsible" @click="() => toggleCollapsed()"> <a v-if="props.collapsible" @click="() => toggleCollapsed()">
{{ innerCollapsed ? '展开' : '收起' }} {{ innerCollapsed ? '展开' : '收起' }}
<DownOutlined v-if="innerCollapsed" /> <DownOutlined v-if="innerCollapsed" />

10
src/layouts/BasicLayout.vue
Unescape Escape View File

@ -23,7 +23,7 @@
</template> </template>
<template #menuFooterRender="props"> <template #menuFooterRender="props">
<a <!-- <a
:style="{ :style="{
display: 'flex', display: 'flex',
height: '16px', height: '16px',
@ -34,7 +34,7 @@
target="_blank" target="_blank"
rel="noreferrer" rel="noreferrer"
> >
<!-- <img <img
alt="pro-logo" alt="pro-logo"
src="https://procomponents.ant.design/favicon.ico" src="https://procomponents.ant.design/favicon.ico"
:style="{ :style="{
@ -43,9 +43,9 @@
margin: '0 16px', margin: '0 16px',
marginRight: 10 marginRight: 10
}" }"
/> --> />
<!-- <template v-if="!props?.collapsed"> Preview Pro</template> --> <template v-if="!props?.collapsed"> Preview Pro</template>
</a> </a> -->
</template> </template>
<!-- <template #headerContentRender>--> <!-- <template #headerContentRender>-->

4
src/views/formReview/formReview.vue
Unescape Escape View File

@ -26,7 +26,7 @@
<template v-if="column.key === 'operate'"> <template v-if="column.key === 'operate'">
<operation-group> <operation-group>
<!-- <a v-if="record.enrollStatus !== 2" @click="handleAudit(record)">审核</a> --> <!-- <a v-if="record.enrollStatus !== 2" @click="handleAudit(record)">审核</a> -->
<a v-if="record.enrollStatus !== 2" @click="handleAudit(record)">编辑</a> <a v-if="record.enrollStatus !== 2" @click="handleEdit(record)">编辑</a>
<a v-if="record.enrollStatus !== 2" @click="handleDistribute(record)">分发</a> <a v-if="record.enrollStatus !== 2" @click="handleDistribute(record)">分发</a>
<span v-else>-</span> <span v-else>-</span>
</operation-group> </operation-group>
@ -90,7 +90,7 @@ const searchTable = (params: GeopoliticalCustomersPageParam) => {
} }
//编辑 //编辑
const handleAudit = (record: GeopoliticalCustomersRecord) => { const handleEdit = (record: GeopoliticalCustomersRecord) => {
geopoliticalCustomersModalRef.value?.open({ geopoliticalCustomersModalRef.value?.open({
newFormAction: FormAction.UPDATE, newFormAction: FormAction.UPDATE,
type: 'audit', type: 'audit',

142
src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue
Unescape Escape View File

@ -71,14 +71,14 @@
:label-col="{ sm: { span: 24 }, md: { span: 5 } }" :label-col="{ sm: { span: 24 }, md: { span: 5 } }"
:wrapper-col=" :wrapper-col="
title === '详情' || title === '分发' title === '详情' || title === '分发'
? { sm: { span: 24 }, md: { span: 9 } } ? { sm: { span: 24 }, md: { span: 19 } }
: { sm: { span: 24 }, md: { span: 19 } } : { sm: { span: 24 }, md: { span: 19 } }
" "
> >
<a-input <a-input
v-model:value="formModel.remark" v-model:value="formModel.remark"
placeholder="请输入备注" placeholder="请输入备注"
:style="{ width: title === '详情' || title === '分发' ? '37%' : '38%' }" :style="{ width: title === '详情' || title === '分发' ? '83%' : '100%' }"
:readonly="title === '详情' || title === '分发'" :readonly="title === '详情' || title === '分发'"
/> />
</a-form-item> </a-form-item>
@ -361,6 +361,7 @@
> >
<div v-if="title === '编辑'"> <div v-if="title === '编辑'">
<!-- <a-button @click="retrial">重审</a-button> --> <!-- <a-button @click="retrial">重审</a-button> -->
<a-button @click="storeResetForm">重置</a-button>
<a-button @click="handleClose">取消</a-button> <a-button @click="handleClose">取消</a-button>
<a-button type="primary" html-type="submit" style="margin-left: 10px" @click="distribute" <a-button type="primary" html-type="submit" style="margin-left: 10px" @click="distribute"
>确定</a-button >确定</a-button
@ -564,7 +565,7 @@ const pagingQuery = () => {
}) })
pois.push(...listData.value) pois.push(...listData.value)
// 设置缩放级别,设置地图视图级别为 // 设置缩放级别,设置地图视图级别为
const targetZoom = 10 const targetZoom = 12
//回调函数 //回调函数
const placeSearch_CallBack = (data: any) => { const placeSearch_CallBack = (data: any) => {
@ -618,6 +619,7 @@ const pagingQuery = () => {
} }
) )
} }
//匹配 //匹配
const match = () => { const match = () => {
const fields = ['address', 'detailAddress', 'radius'] // 指定要校验的字段名 const fields = ['address', 'detailAddress', 'radius'] // 指定要校验的字段名
@ -634,16 +636,8 @@ const match = () => {
city: '杭州' // city 指定进行编码查询的城市，支持传入城市名、adcode 和 citycode city: '杭州' // city 指定进行编码查询的城市，支持传入城市名、adcode 和 citycode
}) })
}) })
const addressValue = //标记中心点
formModel.address?.toString().split(',').join('') + formModel.detailAddress getCenterMarker('match')
geocoder.value.getLocation(addressValue, function (status: any, result: any) {
if (status === 'complete' && result.info === 'OK') {
// result中对应详细地理坐标信息
lng.value = result.geocodes[0].location.lng
lat.value = result.geocodes[0].location.lat
}
pagingQuery()
})
}) })
.catch(() => { .catch(() => {
// 校验失败 // 校验失败
@ -679,15 +673,10 @@ const addStore = (item: any) => {
//删除预约门店 //删除预约门店
const delReservationStore = (i: any) => { const delReservationStore = (i: any) => {
console.log(i, 'i')
// console.log(formModel.customStoreEntities, 'formModel.customStoreEntities')
console.log(listData.value, 'listData.value')
listData.value.forEach((item: any) => { listData.value.forEach((item: any) => {
// console.log(i.storeId, 'id')
if (item.id == i.storeId) { if (item.id == i.storeId) {
item.disabled = false item.disabled = false
} }
console.log(item, 'item')
}) })
formModel.customStoreEntities = formModel.customStoreEntities.filter((item: any) => { formModel.customStoreEntities = formModel.customStoreEntities.filter((item: any) => {
return item.storeId != i.storeId return item.storeId != i.storeId
@ -697,12 +686,13 @@ const delReservationStore = (i: any) => {
const storeResetForm = () => { const storeResetForm = () => {
formModel.customName = '' formModel.customName = ''
formModel.customNid = '' formModel.customNid = ''
formModel.remark = ''
if (title.value !== '编辑预约') { if (title.value !== '编辑预约') {
formModel.address = [] formModel.address = []
formModel.detailAddress = '' formModel.detailAddress = ''
formModel.radius = '' formModel.radius = ''
formModel.customStoreEntities.length = 0
} }
formModel.customStoreEntities.length = 0
listData.value.length = 0 listData.value.length = 0
// 清除地图上的所有标记物 // 清除地图上的所有标记物
@ -740,7 +730,7 @@ interface customStoreEntitiesItem {
//是否发送请求了,发送了就要就行表格刷新 //是否发送请求了,发送了就要就行表格刷新
const isSubmit = ref(false) const isSubmit = ref(false)
//提交请求操作 //提交请求操作
const submitOperate = (type: string, status?: number) => { const submitOperate = () => {
//移除address属性 //移除address属性
const filteredObj = Object.fromEntries( const filteredObj = Object.fromEntries(
Object.entries(formModel).filter(([key]) => key !== 'address') Object.entries(formModel).filter(([key]) => key !== 'address')
@ -753,7 +743,7 @@ const submitOperate = (type: string, status?: number) => {
reservationTime: item.reservationTime, reservationTime: item.reservationTime,
reservationDate: item.reservationDate reservationDate: item.reservationDate
} }
if (title.value === '编辑预约') { if (title.value === '编辑预约' || title.value === '编辑') {
if (item.customStoreId) { if (item.customStoreId) {
obj.customStoreId = item.customStoreId obj.customStoreId = item.customStoreId
} }
@ -786,13 +776,7 @@ const submitOperate = (type: string, status?: number) => {
} }
//报名信息确认弹窗确定点击事件 //报名信息确认弹窗确定点击事件
const handleOk = async () => { const handleOk = async () => {
if (title.value === '编辑') { await submitOperate()
//重审
await submitOperate('cs', 1)
} else {
//报名
await submitOperate('bm')
}
} }
//暂存 //暂存
const temporaryStorage = async () => { const temporaryStorage = async () => {
@ -803,7 +787,7 @@ const temporaryStorage = async () => {
message.info('请先添加预约门店') message.info('请先添加预约门店')
} else { } else {
formModel.enrollStatus = 0 formModel.enrollStatus = 0
submitOperate('zc') submitOperate()
// handleSubmit() // handleSubmit()
} }
}) })
@ -813,9 +797,9 @@ const temporaryStorage = async () => {
} }
//重审 //重审
const retrial = () => { // const retrial = () => {
submitOperate('cs', 0) // submitOperate()
} // }
//分发 //分发
const distribute = () => { const distribute = () => {
registerVisible.value = true registerVisible.value = true
@ -935,13 +919,23 @@ defineExpose({
formModel.detailAddress = detailAddress formModel.detailAddress = detailAddress
formModel.radius = radius formModel.radius = radius
formModel.customStoreEntities.push(...customStoreVOList) formModel.customStoreEntities.push(...customStoreVOList)
//获取预约时间段下拉框回显数据
formModel.customStoreEntities.forEach((i: any) => { formModel.customStoreEntities.forEach((i: any) => {
i.option = generateTimeSlots(i.tradeStartTime, i.tradeEndTime) i.option = generateTimeSlots(i.tradeStartTime, i.tradeEndTime)
}) })
console.log(formModel.customStoreEntities, 'formModel.customStoreEntities') if (opendata.type === 'audit') {
} // isReadOnly.value = true
// reservationTimeisReadOnly.value = true
handleMapInit()
title.value = '编辑'
// formModel.description = 1
} else if (opendata.type === 'edit') {
isDisabled.value = true
handleMapInit()
title.value = '编辑预约'
}
}
const handleMapInit = () => { const handleMapInit = () => {
nextTick(() => { nextTick(() => {
initMap() initMap()
@ -960,23 +954,27 @@ defineExpose({
isReadOnly.value = true isReadOnly.value = true
reservationTimeisReadOnly.value = true reservationTimeisReadOnly.value = true
title.value = '详情' title.value = '详情'
} else if (opendata.type === 'audit') { }
// isReadOnly.value = true // else if (opendata.type === 'audit') {
// reservationTimeisReadOnly.value = true // // isReadOnly.value = true
handleMapInit() // // reservationTimeisReadOnly.value = true
title.value = '编辑' // handleMapInit()
formModel.description = 1 // title.value = '编辑'
} else if (opendata.type === 'distribute') { // // formModel.description = 1
// }
else if (opendata.type === 'distribute') {
isReadOnly.value = true isReadOnly.value = true
reservationTimeisReadOnly.value = true reservationTimeisReadOnly.value = true
handleMapInit() handleMapInit()
title.value = '分发' title.value = '分发'
formModel.description = 1 formModel.description = 1
} else {
isDisabled.value = true
handleMapInit()
title.value = '编辑预约'
} }
// else {
// isDisabled.value = true
// handleMapInit()
// title.value = '编辑预约'
// }
} }
formAction.value = opendata.newFormAction formAction.value = opendata.newFormAction
} }
@ -1006,12 +1004,49 @@ const map = ref<any>({})
//逆向地理编码：将 地理坐标（经纬度） 转换成 地址描述信息，对应为AMap.Geocoder的getAddress方法 //逆向地理编码：将 地理坐标（经纬度） 转换成 地址描述信息，对应为AMap.Geocoder的getAddress方法
const geocoder = ref<any>({}) const geocoder = ref<any>({})
//创建地图 //标记中心点封装的方法
const getCenterMarker = (type: string) => {
const addressValue =
//标记中心点
formModel.address?.toString().split(',').join('') + formModel.detailAddress
geocoder.value.getLocation(addressValue, function (status: any, result: any) {
if (status === 'complete' && result.info === 'OK') {
// result中对应详细地理坐标信息
lng.value = result.geocodes[0].location.lng
lat.value = result.geocodes[0].location.lat
// 设置地图中心点
map.value.setCenter([lng.value, lat.value]) // 将经度和纬度作为参数传入
if (type === 'match') {
//修改地图的缩放级别
map.value.setZoom(12) // 设置新的缩放级别，例如12
}
// 创建标记并添加到地图上
const marker = new AMap.Marker({
position: [lng.value, lat.value], // 设定标记的位置为地图中心点
zIndex: 100 // 设置标记点的 z-index 值为 100
})
// 设置标记点的样式
marker.setIcon(
new AMap.Icon({
image: 'https://webapi.amap.com/theme/v1.3/markers/n/mark_r.png', // 使用红色标记点的图标 URL
size: new AMap.Size(18, 30), // 图标尺寸
imageSize: new AMap.Size(18, 30) // 图片尺寸
})
)
marker.setMap(map.value) // 将标记添加到地图上
}
if (type === 'match') {
pagingQuery()
}
})
}
//创建地图
const initMap = () => { const initMap = () => {
map.value = new AMap.Map('draw-station-container', { map.value = new AMap.Map('draw-station-container', {
center: [120.1551, 30.2741], // 地图中心点经纬度 // center: [120.1551, 30.2741], // 地图中心点经纬度
zoom: 10 // 缩放级别 zoom: 18 // 缩放级别
}) })
// marker.value = new AMap.Marker({ // marker.value = new AMap.Marker({
@ -1045,6 +1080,13 @@ const initMap = () => {
// city: '010' //城市设为北京，默认：“全国” // city: '010' //城市设为北京，默认：“全国”
// }) // })
}) })
AMap.plugin('AMap.Geocoder', function () {
geocoder.value = new AMap.Geocoder({
city: '杭州' // city 指定进行编码查询的城市，支持传入城市名、adcode 和 citycode
})
})
//标记中心点
getCenterMarker('init')
// map.value.add(marker.value) // map.value.add(marker.value)
} }
@ -1177,7 +1219,7 @@ const storeItemClick = (item: any, index: number) => {
// map.value.add(marker.value) // map.value.add(marker.value)
// 设置定位点和缩放级别 // 设置定位点和缩放级别
const targetPosition = [item.lng, item.lat] const targetPosition = [item.lng, item.lat]
const targetZoom = 10 //设置地图视图级别为 const targetZoom = 12 //设置地图视图级别为
infoWindows.value.open(map.value, targetPosition) infoWindows.value.open(map.value, targetPosition)
// 定义定位函数 // 定义定位函数

9
src/views/qualityInspectionDistribution/inspectionModal.vue
Unescape Escape View File

@ -182,6 +182,15 @@ defineExpose({
record = res.data record = res.data
record.comprehensiveAddress = `${record?.economize}${record?.market}${record?.distinguish}${record?.detailAddress}` record.comprehensiveAddress = `${record?.economize}${record?.market}${record?.distinguish}${record?.detailAddress}`
overrideProperties(formModel, record) overrideProperties(formModel, record)
record.customStoreVOList.forEach((item: any) => {
const targetObj = formModel.customStoreVOList.find(
(i: any) => i.storeId === item.storeId
)
if (targetObj) {
targetObj.reservationTime =
item.reservationDate.split(' ')[0] + ' ' + item.reservationTime
}
})
formAction.value = newFormAction formAction.value = newFormAction
} }
}) })

4
src/views/qualityInspectionDistribution/inspectionSearch.vue
Unescape Escape View File

@ -118,8 +118,8 @@ const search = () => {
param.distributeStartTime = distributeTime.value[0].format('YYYY-MM-DD HH:mm:ss') param.distributeStartTime = distributeTime.value[0].format('YYYY-MM-DD HH:mm:ss')
param.distributeEndTime = distributeTime.value[1].format('YYYY-MM-DD HH:mm:ss') param.distributeEndTime = distributeTime.value[1].format('YYYY-MM-DD HH:mm:ss')
} else { } else {
param.startTime = '' param.distributeStartTime = ''
param.endTime = '' param.distributeEndTime = ''
} }
emits('search', param) emits('search', param)
} }

53
src/views/shopManage/shopModal.vue
Unescape Escape View File

@ -137,6 +137,7 @@ import { reactive, ref, onMounted, toRefs } from 'vue'
import { useModal } from '@/hooks/modal' import { useModal } from '@/hooks/modal'
import type { FormRequestMapping } from '@/hooks/form' import type { FormRequestMapping } from '@/hooks/form'
import { overrideProperties } from '@/utils/bean-utils' import { overrideProperties } from '@/utils/bean-utils'
import { message } from 'ant-design-vue'
// import type { shopDTO } from '@/api/geopoliticalCustomers/types' // import type { shopDTO } from '@/api/geopoliticalCustomers/types'
import { storeUserQueryAll, createUser, updateUser } from '@/api/shopManage/index' import { storeUserQueryAll, createUser, updateUser } from '@/api/shopManage/index'
import { provincesAndCitiesAndAutonomousRegions } from '@/utils/geopolitical-customers' import { provincesAndCitiesAndAutonomousRegions } from '@/utils/geopolitical-customers'
@ -272,30 +273,35 @@ const handleClose = () => {
/* 表单提交处理 */ /* 表单提交处理 */
const handleSubmit = () => { const handleSubmit = () => {
formRef.value?.validate().then(res => { formRef.value?.validate().then(res => {
const addkey: any = {} if (anchorData && anchorData.location && anchorData.location.lng) {
if (title.value == '添加门店') { console.log(anchorData.location, 'anchorData.location')
addkey.province = anchorData.pname const addkey: any = {}
addkey.city = anchorData.cityname if (title.value == '添加门店') {
addkey.county = anchorData.adname addkey.province = anchorData.pname
addkey.detail = anchorData.address addkey.city = anchorData.cityname
addkey.longitude = anchorData.location.lng addkey.county = anchorData.adname
addkey.latitude = anchorData.location.lat addkey.detail = anchorData.address
} addkey.longitude = anchorData.location.lng
anchorData && addkey.latitude = anchorData.location.lat
validateAndSubmit( }
{ anchorData &&
...formModel, validateAndSubmit(
...addkey, {
tradeStartTime: formModel.tradeTime[0], ...formModel,
tradeEndTime: formModel.tradeTime[1] ...addkey,
}, tradeStartTime: formModel.tradeTime[0],
{ tradeEndTime: formModel.tradeTime[1]
onSuccess: () => { },
closeModal() {
emits('submit-success') onSuccess: () => {
closeModal()
emits('submit-success')
}
} }
} )
) } else {
message.info('请先选择具体门店')
}
}) })
} }
defineExpose({ defineExpose({
@ -465,5 +471,4 @@ defineExpose({
max-height: 70vh; max-height: 70vh;
overflow-y: auto; overflow-y: auto;
} }
</style> </style>

4
vite.config.ts
Unescape Escape View File

@ -22,7 +22,7 @@ import { antdvStyleDeps } from './src/utils/resolvers'
//项目 //项目
// const serverAddress = 'http://admin.ballcat.cn' // const serverAddress = 'http://admin.ballcat.cn'
//xy //xy
const serverAddress = 'http://172.18.0.225:8000' // const serverAddress = 'http://172.18.0.225:8000'
//jt //jt
// const serverAddress = 'http://172.18.1.8:8000' // const serverAddress = 'http://172.18.1.8:8000'
//ts //ts
@ -31,7 +31,7 @@ const serverAddress = 'http://172.18.0.225:8000'
// const serverAddress = 'http://39.100.77.21:8000' // const serverAddress = 'http://39.100.77.21:8000'
//线上ip //线上ip
// const serverAddress = 'http://175.27.212.74:80' const serverAddress = 'http://175.27.212.74:80'
//线上域名 //线上域名
// const serverAddress = 'https://baiyea.net' // const serverAddress = 'https://baiyea.net'
// const serverAddress = 'http://8.130.96.163:8100' // const serverAddress = 'http://8.130.96.163:8100'

Write Preview
Loading…
Cancel
Save