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/store/modules/user.ts b/src/store/modules/user.ts
index e6dbe34..21be6eb 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -49,7 +49,7 @@ export const useUserStore = defineStore('admin-user', {
return null
}
let userInfo = cache.local.get(CACHE_KEY.USER)
- if (!userInfo) {
+ if (!userInfo || !userInfo?.menus || userInfo.menus.length == 0) {
userInfo = await getInfo({})
}
this.permissions = userInfo.permissions
diff --git a/src/views/Basic/Role/Comp/ReportDaily.vue b/src/views/Basic/Role/Comp/ReportDaily.vue
new file mode 100644
index 0000000..c6fde32
--- /dev/null
+++ b/src/views/Basic/Role/Comp/ReportDaily.vue
@@ -0,0 +1,7 @@
+
+ 每日快报
+
+
+
+
+
diff --git a/src/views/Basic/Role/index.vue b/src/views/Basic/Role/index.vue
index 6ba9419..2f894b1 100644
--- a/src/views/Basic/Role/index.vue
+++ b/src/views/Basic/Role/index.vue
@@ -75,6 +75,9 @@
@success="getList"
/>
+
@@ -86,6 +89,7 @@ import RoleForm from './RoleForm.vue'
import RoleEmployee from './Comp/RoleEmployee.vue'
import RoleAssignMenuForm from './RoleAssignMenuForm.vue'
import RoleDataPermissionForm from './RoleDataPermissionForm.vue'
+// import ReportDaily from './Comp/ReportDaily.vue'
import * as RoleApi from '@/api/system/role'
const message = useMessage() // 消息弹窗
diff --git a/src/views/Clue/Pool/Comp/DialogSchoolInfo.vue b/src/views/Clue/Pool/Comp/DialogSchoolInfo.vue
index 20a6bdb..57c95ce 100644
--- a/src/views/Clue/Pool/Comp/DialogSchoolInfo.vue
+++ b/src/views/Clue/Pool/Comp/DialogSchoolInfo.vue
@@ -1,18 +1,44 @@
+
+ 场地班型
+
+
+
+
+
+
+
+
+
+ 点击查看
+
+
+
+
+
+
+
+ 场地详细信息
+
+
diff --git a/src/views/SchoolManagement/Place/index.vue b/src/views/SchoolManagement/Place/index.vue
index 4939e7b..cd05bb9 100644
--- a/src/views/SchoolManagement/Place/index.vue
+++ b/src/views/SchoolManagement/Place/index.vue
@@ -109,10 +109,22 @@
-
+
-
+
@@ -130,10 +142,10 @@
-
+
@@ -145,6 +157,19 @@
取消
+
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 +293,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 +356,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) {