diff --git a/package.json b/package.json index 8130076..3497d74 100644 --- a/package.json +++ b/package.json @@ -85,6 +85,7 @@ "ant-design-vue": "^3.2.12", "autofit.js": "^3.0.4", "axios": "^0.26.1", + "canvas-select": "^2.18.1-beta.1", "china-area-data": "^5.0.1", "clipboard": "^2.0.8", "codemirror": "^5.65.3", diff --git a/src/router/routes/index.ts b/src/router/routes/index.ts index 3c148a8..46f799b 100644 --- a/src/router/routes/index.ts +++ b/src/router/routes/index.ts @@ -36,7 +36,7 @@ export const ElectronicMapRoute: AppRouteRecordRaw = { meta: { title: t('routes.basic.login'), }, - children:[ + children: [ { path: 'show', name: 'show', @@ -55,10 +55,9 @@ export const ElectronicMapRoute: AppRouteRecordRaw = { }, component: () => import('/@/views/earthMap/edit/ElectronicMap.vue'), }, - ] + ], }; - export const VideoMonitorRoute: AppRouteRecordRaw = { path: '/videoIndex', name: 'VideoIndex', @@ -67,7 +66,7 @@ export const VideoMonitorRoute: AppRouteRecordRaw = { meta: { title: t('routes.basic.login'), }, - children:[ + children: [ { path: 'videoMonitor', name: 'VideoMonitor', @@ -101,10 +100,9 @@ export const VideoMonitorRoute: AppRouteRecordRaw = { // currentActiveMenu: '/error-log', }, }, - ] + ], }; - export const LoginRoute: AppRouteRecordRaw = { path: '/login', name: 'Login', @@ -112,6 +110,8 @@ export const LoginRoute: AppRouteRecordRaw = { // component: () => import('/@/views/sys/login/Login.vue'), // component: () => import('/@/views/system/loginmini/MiniLogin.vue'), component: () => import('/@/views/system/loginmini/ZGXLogin.vue'), + // 测试登录页 - rtsp + 视频绘图标注 + // component: () => import('/@/views/system/loginmini/CanvasVideoPage.vue'), meta: { title: t('routes.basic.login'), }, @@ -144,4 +144,14 @@ export const TokenLoginRoute: AppRouteRecordRaw = { }; // Basic routing without permission -export const basicRoutes = [LoginRoute, RootRoute, ...mainOutRoutes, REDIRECT_ROUTE, PAGE_NOT_FOUND_ROUTE, TokenLoginRoute, Oauth2LoginRoute, ElectronicMapRoute, VideoMonitorRoute]; +export const basicRoutes = [ + LoginRoute, + RootRoute, + ...mainOutRoutes, + REDIRECT_ROUTE, + PAGE_NOT_FOUND_ROUTE, + TokenLoginRoute, + Oauth2LoginRoute, + ElectronicMapRoute, + VideoMonitorRoute, +]; diff --git a/src/views/military/modules/ai/monitorArea/components/VCEarthViewer.vue b/src/views/military/modules/ai/monitorArea/components/VCEarthViewer.vue index 472d71a..7e5fbbb 100644 --- a/src/views/military/modules/ai/monitorArea/components/VCEarthViewer.vue +++ b/src/views/military/modules/ai/monitorArea/components/VCEarthViewer.vue @@ -260,19 +260,19 @@ function getDrawingActionInstances(viewer: any) { // 监控区域数据 let areaData: any = []; - let k = 1; + let k = 0; // 根据图形类别 整理数据 用于保存 proxy.$refs.drawingsRef.getDrawingActionInstances().forEach((item) => { // 画图源数据 let source = item.cmpRef._value.renderDatas._rawValue; - console.log(item.cmpRef._value); // 集合数据 let obj_list: any = []; - // console.log('item.name', item.name); + if (item.name == 'pin' || item.name == 'point') { // 二维数组 source.forEach((ele) => { + k++; // 单个点数据 let result: any = cartesian3ToCartographic(ele.position, viewer); let result_area = { @@ -280,7 +280,7 @@ lat: result[1], key: k, }; - k++; + obj_list.push(result); areaData.push(result_area); }); @@ -299,7 +299,9 @@ // 区域数组 矩形:编辑点开始 逆时针 正多边形:编辑点开始 逆时针 // 此处区域源数据针对以下图形:矩形,正多边形 let source_area = item.cmpRef._value.computedRenderDatas._value; + source_area.forEach((ele) => { + k++; for (let i = 0; i < ele.polygonPositions.length - 1; i++) { let result: any = cartesian3ToCartographic(ele.polygonPositions[i], viewer); let result_area = { @@ -307,7 +309,6 @@ lat: result[1], key: k, }; - k++; areaData.push(result_area); } }); @@ -327,6 +328,7 @@ // 此处区域源数据针对以下图形:矩形,正多边形 let source_area = item.cmpRef._value.computedRenderDatas._value; source_area.forEach((ele) => { + k++; for (let i = 0; i < ele.polygonPositions.length; i++) { let result: any = cartesian3ToCartographic(ele.polygonPositions[i], viewer); let result_area = { @@ -334,7 +336,6 @@ lat: result[1], key: k, }; - k++; areaData.push(result_area); } }); @@ -354,6 +355,7 @@ // 此处区域源数据针对以下图形:矩形,正多边形 let source_area = item.cmpRef._value.computedRenderDatas._value; source_area.forEach((ele) => { + k++; // 圆心 let result: any = cartesian3ToCartographic(ele.positions[0], viewer); let result_area = { @@ -362,12 +364,12 @@ distance: ele.distance, key: k, }; - k++; areaData.push(result_area); }); } else { // 三维数组 source.forEach((ele) => { + k++; // 单个图形数据 let point_list: any = []; ele.positions.forEach((point) => { @@ -378,7 +380,6 @@ lat: result[1], key: k, }; - k++; areaData.push(result_area); point_list.push(result); }); diff --git a/src/views/military/modules/ops/maintain/MsMaintainList.vue b/src/views/military/modules/ops/maintain/MsMaintainList.vue index e8d735c..e4e1c46 100644 --- a/src/views/military/modules/ops/maintain/MsMaintainList.vue +++ b/src/views/military/modules/ops/maintain/MsMaintainList.vue @@ -1,7 +1,7 @@