diff --git a/src/views/mediaLibrary/importPrice.vue b/src/views/mediaLibrary/importPrice.vue index 117b5df..24dfbdf 100644 --- a/src/views/mediaLibrary/importPrice.vue +++ b/src/views/mediaLibrary/importPrice.vue @@ -35,6 +35,8 @@ const { proxy } = getCurrentInstance() const title = ref('导入报价') const open = ref(false) const mediaType = ref(null) +const dataScopeDeptId = ref(null) +const dataScopeDeptName = ref(null) const docUploadList = ref([]) @@ -44,6 +46,8 @@ const requestDocUpload = (options) => { const { file } = options var formData = new FormData(); formData.append('mediaType', mediaType.value); + formData.append('dataScopeDeptId', dataScopeDeptId.value); + formData.append('dataScopeDeptName', dataScopeDeptName.value); formData.append('file', file); importPriceByExcel(formData).then(res => { if (res.code == 200) { @@ -128,27 +132,43 @@ const initImportPriceExcel = (_mediaType) => { switch (_mediaType) { case 0: title.value = '导入优势媒体报价' + dataScopeDeptId.value = 220 + dataScopeDeptName.value = '优势媒体部' break; case 1: title.value = '导入门禁报价' + dataScopeDeptId.value = 219 + dataScopeDeptName.value = '网络媒体部' break; case 2: title.value = '导入候车厅报价' + dataScopeDeptId.value = 219 + dataScopeDeptName.value = '网络媒体部' break; case 3: title.value = '导入道闸报价' + dataScopeDeptId.value = 219 + dataScopeDeptName.value = '网络媒体部' break; case 4: title.value = '导入地铁报价' + dataScopeDeptId.value = 219 + dataScopeDeptName.value = '网络媒体部' break; case 5: title.value = '导入高铁报价' + dataScopeDeptId.value = 219 + dataScopeDeptName.value = '网络媒体部' break; case 6: title.value = '导入写字楼报价' + dataScopeDeptId.value = 219 + dataScopeDeptName.value = '网络媒体部' break; case 7: title.value = '导入车库灯箱报价' + dataScopeDeptId.value = 219 + dataScopeDeptName.value = '网络媒体部' break; default: break; diff --git a/src/views/mediaLibrary/mediaDetail.vue b/src/views/mediaLibrary/mediaDetail.vue index a25f1e7..1e4a2f1 100644 --- a/src/views/mediaLibrary/mediaDetail.vue +++ b/src/views/mediaLibrary/mediaDetail.vue @@ -62,7 +62,7 @@
- + {{ detailForm.hasLighting }} @@ -80,7 +80,7 @@
- + {{ detailForm.mr }} @@ -94,12 +94,15 @@
- + {{ detailForm.mediaOrientation }} - + +
+ + @@ -108,7 +111,7 @@ -
+
diff --git a/src/views/mediaMap/index.vue b/src/views/mediaMap/index.vue index 964039d..9ef2078 100644 --- a/src/views/mediaMap/index.vue +++ b/src/views/mediaMap/index.vue @@ -4,10 +4,10 @@
- + @@ -95,7 +95,7 @@
{{ item.name }}
{{ item.address - }}
+ }}
@@ -397,6 +397,8 @@ const resetQuery = () => { areaCode: undefined, townCode: undefined, } + // 中心点名称 + centerPointName.value = undefined // 距离显示文本 distanceLable.value = '请选择' // 选择的距离值 @@ -416,7 +418,7 @@ const resetQuery = () => { if (circleHandle.value) { mapInstance.value.remove(circleHandle.value); circleHandle.value = null; - } + } if (geocoderMarker.value) { mapInstance.value.remove(geocoderMarker.value); geocoderMarker.value = null @@ -454,10 +456,24 @@ const handleClose = () => { const getLocaleListList = (searchValue) => { selectLoading.value = true if (searchValue !== "") { + localeList.value = [] + // 调用系统媒体接口查询媒体 + queryParams.value.keyword = searchValue + mediaByMap(queryParams.value).then(res => { + if (res.code == 200) { + res.data.forEach(itemPoint => { + localeList.value.push({ + id: itemPoint.mediaId, name: itemPoint.mediaName, address: '媒体库媒体', location: { lat: itemPoint.y, lng: itemPoint.x } + }); + }); + } + }) + // 调用高德API查询点 placeSearch.value.search(searchValue, function (status, result) { // 查询成功时，result即对应匹配的POI信息 if (result.poiList.pois?.length) { - localeList.value = result.poiList?.pois + console.log('api', result.poiList?.pois) + localeList.value.push(...result.poiList?.pois); } selectLoading.value = false }); @@ -490,6 +506,7 @@ const addCenterMark = (val) => { if (centerMarker.value) mapInstance.value.remove(centerMarker.value); centerMarker.value = new AMap.Marker({ position: [val.location.lng, val.location.lat], + offset: new AMap.Pixel(-8, -8), title: val.name, zIndex: 100, draggable: false, // 是否可以拖拽 @@ -750,7 +767,7 @@ const toggle2D3DMode = () => { if (!mapInstance.value) return; const currentPitch = mapInstance.value.getPitch(); - + resetQuery() if (currentPitch === 0) { // 切换到3D模式 mapInstance.value.setPitch(65);