From 8f4da16e810a1a5c10fa800d45dfc9a40d29a0a9 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Fri, 6 Jun 2025 11:51:04 +0800
Subject: [PATCH] sc
---
.env.base | 10 +-
index.html | 4 +-
src/api/okr/meeting.js | 45 ++++
src/permission.js | 3 +-
src/router/modules/static.ts | 39 ++-
src/views/Clue/Pool/Comp/ClueMap.vue | 2 +-
src/views/Clue/Pool/Comp/DialogClue.vue | 2 +-
src/views/Clue/Pool/Comp/DrawerClue.vue | 2 +-
src/views/OKR/Meeting/MeetingInfo.vue | 293 +++++++++++++++++++++
src/views/OKR/Meeting/index.vue | 219 +++++++++++++++
src/views/SchoolManagement/Place/index.vue | 2 +-
11 files changed, 600 insertions(+), 21 deletions(-)
create mode 100644 src/api/okr/meeting.js
create mode 100644 src/views/OKR/Meeting/MeetingInfo.vue
create mode 100644 src/views/OKR/Meeting/index.vue
diff --git a/.env.base b/.env.base
index 2d3b1b8..a8c77b2 100644
--- a/.env.base
+++ b/.env.base
@@ -4,8 +4,14 @@ VITE_NODE_ENV=development
VITE_DEV=true
# 请求路径
-# VITE_BASE_URL='http://47.98.161.246:48080'
-VITE_BASE_URL='http://114.215.207.150:48080'
+VITE_BASE_URL='http://47.98.161.246:48080'
+# VITE_BASE_URL='http://114.215.207.150:48080'
+
+# 高德地图key密钥
+# 1寻驾
+VITE_AMAP_KEY=ec6b7ebe38f7ff27126f7088d87a9091
+# 2莳松
+# VITE_AMAP_KEY=9233a9d4ffe95fb335e70834503460fa
# 小程序接口请求路劲
VITE_APPLET_URL='https://cloud.ahduima.com'
diff --git a/index.html b/index.html
index a622563..b6cd0e9 100644
--- a/index.html
+++ b/index.html
@@ -141,7 +141,9 @@
diff --git a/src/api/okr/meeting.js b/src/api/okr/meeting.js
new file mode 100644
index 0000000..6cdaad4
--- /dev/null
+++ b/src/api/okr/meeting.js
@@ -0,0 +1,45 @@
+import request from '@/config/axios'
+
+export const createMeeting = (data) => {
+ return request.post({
+ url: '/admin-api/okr/meeting/add',
+ data,
+ isSubmitForm: true
+ // headers: { 'instance-id': 1016 }
+ })
+}
+
+// 修改
+export const updateMeeting = (data) => {
+ return request.put({
+ url: '/admin-api/okr/meeting/update',
+ data
+ // headers: { 'instance-id': 1016 }
+ })
+}
+// 查询详情
+export const getMeetingDetail = (params) => {
+ return request.get({
+ url: '/admin-api/okr/meeting/get',
+ params
+ // headers: { 'instance-id': 1016 }
+ })
+}
+
+// 取消会议
+export const cancelMeeting = (data) => {
+ return request.put({
+ url: '/admin-api/okr/meeting/cancel',
+ data
+ // headers: { 'instance-id': 1016 }
+ })
+}
+
+// 分页查询
+export const getMeetingPage = (params) => {
+ return request.get({
+ url: '/admin-api/okr/meeting/page',
+ params
+ // headers: { 'instance-id': 1016 }
+ })
+}
diff --git a/src/permission.js b/src/permission.js
index 2dcd4fd..557b9b2 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -73,7 +73,8 @@ router.beforeEach(async (to, from, next) => {
if (tenantId && appId) {
next(`/login?tenantId=${tenantId}&appId=${appId}&redirect=${to.fullPath}`) // 否则全部重定向到登录页
} else {
- next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+ // next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+ window.location.href = 'https://cloud.ahduima.com/ss/login'
}
}
}
diff --git a/src/router/modules/static.ts b/src/router/modules/static.ts
index 0faa34c..1e1c73a 100644
--- a/src/router/modules/static.ts
+++ b/src/router/modules/static.ts
@@ -48,20 +48,33 @@ const staticRouter: AppCustomRouteRecordRaw[] = [
visible: true,
alwaysShow: true,
redirect: ''
+ },
+ {
+ icon: 'ep:data-board',
+ path: 'okr-meeting',
+ name: '会议管理',
+ componentName: 'OkrMeeting',
+ component: 'OKR/Meeting/index',
+ meta: {
+ title: '会议管理'
+ },
+ visible: true,
+ alwaysShow: true,
+ redirect: ''
+ },
+ {
+ icon: 'ep:data-board',
+ path: 'okr-meeting-info/:id',
+ name: '会议详情',
+ componentName: 'MeetingInfo',
+ component: 'OKR/Meeting/MeetingInfo',
+ meta: {
+ title: '会议详情'
+ },
+ visible: false,
+ alwaysShow: true,
+ redirect: ''
}
- // {
- // icon: 'ep:data-board',
- // path: 'okr-metting',
- // name: '会议管理',
- // componentName: 'OkrMetting',
- // component: 'OKR/Meeting/index',
- // meta: {
- // title: '会议管理'
- // },
- // visible: true,
- // alwaysShow: true,
- // redirect: ''
- // }
],
meta: {
title: 'OKR',
diff --git a/src/views/Clue/Pool/Comp/ClueMap.vue b/src/views/Clue/Pool/Comp/ClueMap.vue
index 202f727..fb8e325 100644
--- a/src/views/Clue/Pool/Comp/ClueMap.vue
+++ b/src/views/Clue/Pool/Comp/ClueMap.vue
@@ -82,7 +82,7 @@ async function initMap() {
}
defaultCity.value = cityInfo.locationName
AMapLoader.load({
- key: '713d839ff505943b0f18e6df45f3b0dc', //设置您的key
+ key: import.meta.env.VITE_AMAP_KEY, //设置您的key
version: '2.0',
plugins: ['AMap.AutoComplete']
}).then((AMap) => {
diff --git a/src/views/Clue/Pool/Comp/DialogClue.vue b/src/views/Clue/Pool/Comp/DialogClue.vue
index a5bd51a..a0d24dc 100644
--- a/src/views/Clue/Pool/Comp/DialogClue.vue
+++ b/src/views/Clue/Pool/Comp/DialogClue.vue
@@ -395,7 +395,7 @@ let geoCoder = ref(null)
function initMap(data) {
AMapLoader.load({
- key: '713d839ff505943b0f18e6df45f3b0dc', //设置您的key
+ key: import.meta.env.VITE_AMAP_KEY, //设置您的key
version: '2.0',
plugins: ['AMap.Geocoder', 'AMap.AutoComplete']
}).then((AMap) => {
diff --git a/src/views/Clue/Pool/Comp/DrawerClue.vue b/src/views/Clue/Pool/Comp/DrawerClue.vue
index f09b6ec..f33c35d 100644
--- a/src/views/Clue/Pool/Comp/DrawerClue.vue
+++ b/src/views/Clue/Pool/Comp/DrawerClue.vue
@@ -289,7 +289,7 @@ const defaultLatLng = ref({
function initMap(data) {
AMapLoader.load({
- key: '713d839ff505943b0f18e6df45f3b0dc', //设置您的key
+ key: import.meta.env.VITE_AMAP_KEY, //设置您的key
version: '2.0'
}).then((AMap) => {
aMap.value = AMap
diff --git a/src/views/OKR/Meeting/MeetingInfo.vue b/src/views/OKR/Meeting/MeetingInfo.vue
new file mode 100644
index 0000000..d9f58c7
--- /dev/null
+++ b/src/views/OKR/Meeting/MeetingInfo.vue
@@ -0,0 +1,293 @@
+