From d6be0488c4343e445dc725ca190de4bc29dab93d Mon Sep 17 00:00:00 2001 From: qsh <> Date: Sun, 18 Aug 2024 16:29:01 +0800 Subject: [PATCH 1/7] sc --- src/views/Home/CloseRate.vue | 7 + src/views/SchoolManagement/Place/index.vue | 220 ++++++++++++++------- 2 files changed, 153 insertions(+), 74 deletions(-) create mode 100644 src/views/Home/CloseRate.vue diff --git a/src/views/Home/CloseRate.vue b/src/views/Home/CloseRate.vue new file mode 100644 index 0000000..c8876d0 --- /dev/null +++ b/src/views/Home/CloseRate.vue @@ -0,0 +1,7 @@ + + + + + diff --git a/src/views/SchoolManagement/Place/index.vue b/src/views/SchoolManagement/Place/index.vue index 4939e7b..3a96e42 100644 --- a/src/views/SchoolManagement/Place/index.vue +++ b/src/views/SchoolManagement/Place/index.vue @@ -71,80 +71,107 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + +
+ 保存 + 取消 +
+ + + import * as PlaceApi from '@/api/school/place' +import { getConfigByConfigKey } from '@/api/system/set' import { getAreaSimpleList } from '@/api/school/setting/area' import { checkPermi } from '@/utils/permission' @@ -267,18 +295,35 @@ const mapHelpText = ref('') const tipPostion = ref({}) const placeTab = ref('info') -function initMap() { +const defaultLatLng = ref({ + lat: 31.86119, + lng: 117.283042 +}) +const defaultCity = ref('合肥') + +let AutoComplete = ref(null) +async function initMap() { + const data = await getConfigByConfigKey({ configKey: 'defaultLocation' }) + const cityInfo = JSON.parse(data.configValue) + defaultLatLng.value = { + lat: cityInfo.lat, + lng: cityInfo.lng + } + defaultCity.value = cityInfo.locationName AMapLoader.load({ key: '713d839ff505943b0f18e6df45f3b0dc', //设置您的key version: '2.0', - plugins: ['AMap.Geocoder'] + plugins: ['AMap.Geocoder', 'AMap.AutoComplete'] }).then((AMap) => { aMap.value = AMap geoCoder.value = new AMap.Geocoder() dialogMap.value = new AMap.Map('dialogMap', { zoom: 12, zooms: [2, 22], - center: [117.283042, 31.86119] + center: [defaultLatLng.value.lng, defaultLatLng.value.lat] + }) + AutoComplete.value = new AMap.AutoComplete({ + city: defaultCity.value }) locationMarker.value = new AMap.Marker({ icon: FlagRed @@ -313,6 +358,32 @@ function initMap() { }) } +const areaValue = ref('') +function remoteMethod(searchValue, cb) { + if (searchValue) { + AutoComplete.value?.search(searchValue, (status, result) => { + if (result.tips?.length) { + // areaList.value = result?.tips + const list = result.tips.map((it) => ({ + ...it, + value: it.name + })) + cb(list) + } else { + cb([]) + } + }) + } else { + cb([]) + } +} + +function currentSelect(val) { + if (val) { + dialogMap.value.setCenter([val.location?.lng, val.location?.lat], true) + } +} + function regeoCode() { geoCoder.value.getAddress([placeForm.value.lng, placeForm.value.lat], (status, result) => { if (status === 'complete' && result.regeocode) { @@ -678,7 +749,8 @@ onMounted(() => { position: absolute; left: 20px; top: 20px; - width: 350px; + width: 500px; + display: flex; } .map-tip { -- 2.38.1.windows.1 From 57d6aa3a0e838486b1b36503220e9cf09658602a Mon Sep 17 00:00:00 2001 From: qsh <> Date: Sun, 18 Aug 2024 16:38:09 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=9C=BA=E5=9C=B0=E5=AE=9A=E4=BD=8D?= =?UTF-8?q?=E5=92=8C=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/SchoolManagement/Place/index.vue | 192 ++++++++++----------- 1 file changed, 95 insertions(+), 97 deletions(-) diff --git a/src/views/SchoolManagement/Place/index.vue b/src/views/SchoolManagement/Place/index.vue index 3a96e42..ef6bfe7 100644 --- a/src/views/SchoolManagement/Place/index.vue +++ b/src/views/SchoolManagement/Place/index.vue @@ -71,107 +71,105 @@ -
- - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - -
- 保存 - 取消 -
- - -
+ + + + + + +
+ 保存 + 取消 +
+ + { position: absolute; left: 20px; top: 20px; - width: 500px; + width: 350px; display: flex; } -- 2.38.1.windows.1 From 347069dbee0329a0d2950b41345b2839df8c8dd4 Mon Sep 17 00:00:00 2001 From: qsh <> Date: Mon, 19 Aug 2024 17:26:23 +0800 Subject: [PATCH 3/7] sha --- src/api/clue/sign.js | 4 ++++ src/views/Clue/Pool/Comp/DialogSuccess.vue | 20 +++++++++++++++++++- src/views/SchoolManagement/Place/index.vue | 1 - 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/api/clue/sign.js b/src/api/clue/sign.js index 4f87227..085e972 100644 --- a/src/api/clue/sign.js +++ b/src/api/clue/sign.js @@ -47,3 +47,7 @@ export const updateProduceStatus = (data) => { export const updateProduceSort = (data) => { return request.post({ url: '/admin-api/crm/sign-prodcut/adjust/sort', data: data }) } + +export const getSignProfit = (params) => { + return request.get({ url: '/admin-api/crm/sign/profit', params }) +} diff --git a/src/views/Clue/Pool/Comp/DialogSuccess.vue b/src/views/Clue/Pool/Comp/DialogSuccess.vue index 2ce06f5..18419e2 100644 --- a/src/views/Clue/Pool/Comp/DialogSuccess.vue +++ b/src/views/Clue/Pool/Comp/DialogSuccess.vue @@ -119,6 +119,11 @@