diff --git a/index.html b/index.html index 14017b9..8dffb4d 100644 --- a/index.html +++ b/index.html @@ -12,7 +12,7 @@ - + diff --git a/package-lock.json b/package-lock.json index da80941..c63a871 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1422,33 +1422,12 @@ "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", "dev": true }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, "emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-9.2.2.tgz", "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", "dev": true }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, "string-width": { "version": "5.1.2", "resolved": "https://registry.npmmirror.com/string-width/-/string-width-5.1.2.tgz", @@ -1460,40 +1439,6 @@ "strip-ansi": "^7.0.1" } }, - "string-width-cjs": { - "version": "npm:string-width@4.2.3", - "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1" - } - } - } - }, "strip-ansi": { "version": "7.1.0", "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-7.1.0.tgz", @@ -1503,23 +1448,6 @@ "ansi-regex": "^6.0.1" } }, - "strip-ansi-cjs": { - "version": "npm:strip-ansi@6.0.1", - "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true - } - } - }, "wrap-ansi": { "version": "8.1.0", "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz", @@ -1530,60 +1458,6 @@ "string-width": "^5.0.1", "strip-ansi": "^7.0.1" } - }, - "wrap-ansi-cjs": { - "version": "npm:wrap-ansi@7.0.0", - "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true - }, - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - } - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1" - } - } - } } } }, @@ -18281,6 +18155,46 @@ "strip-ansi": "^3.0.0" } }, + "string-width-cjs": { + "version": "npm:string-width@4.2.3", + "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.1" + } + } + } + }, "string.prototype.trim": { "version": "1.2.9", "resolved": "https://registry.npmmirror.com/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz", @@ -18337,6 +18251,23 @@ "ansi-regex": "^2.0.0" } }, + "strip-ansi-cjs": { + "version": "npm:strip-ansi@6.0.1", + "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.1" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true + } + } + }, "strip-bom": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/strip-bom/-/strip-bom-2.0.0.tgz", @@ -21129,6 +21060,81 @@ } } }, + "wrap-ansi-cjs": { + "version": "npm:wrap-ansi@7.0.0", + "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + }, + "strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.1" + } + } + } + }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/wrappy/-/wrappy-1.0.2.tgz", diff --git a/src/main.js b/src/main.js index 80ac1c7..9fca7a4 100644 --- a/src/main.js +++ b/src/main.js @@ -11,7 +11,7 @@ import router from './router/index.js' import BaiduMap from 'vue-baidu-map' import 'echarts-gl' Vue.use(BaiduMap, { - ak: 'uu7pXHZLZOejrWXyTK2lVMHASObAg8Fz' + ak: 'AwIb6rcMDySo2AKQ2hVGIjmFCL4J1oJK' }) import axios from 'axios' import qs from 'qs' diff --git a/src/router/index.js b/src/router/index.js index 4219a69..273c7dc 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -368,6 +368,26 @@ export const constantRoutes = [ loginAuthority: true } }, + { + path: 'rov', + name: 'rov', + component: () => import('@/views/statistics/RovStatistics.vue'), + meta: { + title: '遥控潜水器汇总统计', + icon: 'peoples', + loginAuthority: true + } + }, + { + path: 'uuv', + name: 'uuv', + component: () => import('@/views/statistics/UuvStatistics.vue'), + meta: { + title: '无人潜水器汇总统计', + icon: 'peoples', + loginAuthority: true + } + }, { path: 'AboutUs', name: 'AboutUs', diff --git a/src/views/dataSearch.vue b/src/views/dataSearch.vue index ab761fd..0352911 100644 --- a/src/views/dataSearch.vue +++ b/src/views/dataSearch.vue @@ -28,6 +28,7 @@
+

编号规则:航次号_潜次号_设备类型_数据样品类型

{{ item.dataset_name }} {{ item.file_total }}

{{ item.create_time }}
@@ -113,7 +114,13 @@

是否涉密：

{{ item.serect_status == 'Active' ? '是' : '否' }}
- +
+ + + + + +
@@ -178,6 +185,44 @@ + + +
+

{{ voyageInfo.voyage_name }}

+

{{ voyageInfo.voyage_remark }}

+

航次信息：

+
+ + + {{ voyageInfo.ship_name }} + + + {{ voyageInfo.funding_org }} + + + + + {{ voyageInfo.voyage_start_date }} + + + {{ voyageInfo.voyage_end_date }} + + + + + {{ voyageInfo.voyage_officer }} + + +
+
+ + 查看航次详情 + + @@ -190,6 +235,7 @@ import { sampleStationList } from '../api/dataSearch' import { getParamsList, getVoyageLine } from '../api/home' +import { regInfo } from '@/api/dataSearch' import Cookies from 'js-cookie' import { setImageryViewModels @@ -248,6 +294,8 @@ export default { menu2: '', menu3: '', menu4: '', + dialog5: false, + voyageInfo: {}, dataList: [], searchValue: '', menuShow: true, @@ -267,7 +315,9 @@ export default { // 保存轨迹图层 trackLineLayers: [], // 记录已渲染的轨迹 - rendered: [] + rendered: [], + trackLayerMap: {}, // 存储每个航次对应的轨迹图层实例 + highlightLayer: null, // 存储当前高亮图层实例 } }, watch: { @@ -401,41 +451,85 @@ export default { getDataList(params).then(res => { const arr = res.page.records if (this.radio === '航次') { - this.dataList = arr if (arr.length) { arr.forEach(item => { - this.trackLineImage(item) + item.highlight = false + item.show = true + this.addSingleLineImg(item.voyage_name, null) }) } + this.dataList = arr } if (this.radio === '数据样品集') { this.getDataPoints(arr) } }) }, - // 航次导航图层 - trackLineImage(item) { - // 查询轨迹是否渲染过，避免重复渲染 - if (this.rendered.length) { - const isRendered = this.rendered.find(ele => ele === item.voyage_name) - if (isRendered) return + // 添加高亮图层 + addHighlightLayer(voyageName, i) { + this.clearHighlight() + const highlightLayer = new Cesium.WebMapTileServiceImageryProvider({ + url: `${this.CesiumHostAddr}geoserver/gwc/service/wmts/rest/dsds:${voyageName}-highlight/{TileMatrixSet}/{TileMatrixSet}:{TileMatrix}/{TileRow}/{TileCol}?format=image/png`, + layer: `dsds:${voyageName}-highlight`, + style: 'default', + format: 'image/png', + tileMatrixSetID: 'EPSG:4326', + tilingScheme: new Cesium.GeographicTilingScheme() + }); + + this.highlightLayer = this.viewer.imageryLayers.addImageryProvider(highlightLayer); + this.dataList[i].highlight = true; + }, + // 清除高亮 + clearHighlight() { + this.dataList.map(item => {item.highlight = false}) + // 移除地图上的高亮图层 + if (this.highlightLayer) { + this.viewer.imageryLayers.remove(this.highlightLayer); + this.highlightLayer = null; } - if (!item.voyage_name) return - // 轨迹影像参数 - const trackLine = new Cesium.WebMapTileServiceImageryProvider( - { - url: `${this.CesiumHostAddr}geoserver/gwc/service/wmts/rest/dsds:${item.voyage_name}/{TileMatrixSet}/{TileMatrixSet}:{TileMatrix}/{TileRow}/{TileCol}?format=image/png`, - layer: `dsds:${item.voyage_name}`, - style: 'default', - format: 'image/png', - tileMatrixSetID: 'EPSG:4326', - tilingScheme: new Cesium.GeographicTilingScheme() + }, + // 显示 + addSingleLineImg(voyageName, i) { + + // 检查该航次图层是否已存在，避免重复添加 + if (this.trackLayerMap[voyageName]) { + console.warn(`航次 ${voyageName} 的轨迹图层已存在`); + return; + } + + // 创建轨迹影像图层 + const trackLine = new Cesium.WebMapTileServiceImageryProvider({ + url: `${this.CesiumHostAddr}geoserver/gwc/service/wmts/rest/dsds:${voyageName}/{TileMatrixSet}/{TileMatrixSet}:{TileMatrix}/{TileRow}/{TileCol}?format=image/png`, + layer: `dsds:${voyageName}`, + style: 'default', + format: 'image/png', + tileMatrixSetID: 'EPSG:4326', + tilingScheme: new Cesium.GeographicTilingScheme() + }); + + // 添加图层到Cesium并存储引用 + const layerInstance = this.viewer.imageryLayers.addImageryProvider(trackLine); + this.trackLayerMap[voyageName] = layerInstance; // 以航次名为键存储图层实例 + if (i !== null) { + this.dataList[i].show = true; + } + }, + + // 隐藏 + removeSingleLineImg(voyageName, i) { + const layerInstance = this.trackLayerMap[voyageName]; + if (layerInstance) { + // 从Cesium的imageryLayers中移除该图层 + this.viewer.imageryLayers.remove(layerInstance); + // 删除映射表中对该图层的引用 + delete this.trackLayerMap[voyageName]; + if (i !== null) { + this.dataList[i].show = false; } - ) - const trackLineLayer = this.viewer.imageryLayers.addImageryProvider(trackLine) - this.trackLineLayers.push(trackLineLayer) - // 记录已渲染的轨迹，防止重复渲染 - this.rendered.push(item.voyage_name) + } else { + console.warn(`未找到航次 ${voyageName} 的轨迹图层`); + } }, // 测线业务相关图层 sampleLineImage(item) { @@ -487,12 +581,13 @@ export default { }, // 清除所有轨迹图层 clearAll() { - if (this.trackLineLayers.length) { - this.trackLineLayers.forEach(line => { - this.viewer.imageryLayers.remove(line) + this.clearHighlight() + if (this.trackLayerMap.length) { + this.trackLayerMap.forEach(layer => { + this.viewer.imageryLayers.remove(layer); + this.trackLayerMap = [] }) } - this.rendered = [] }, // 搜素 getSearch() { @@ -503,7 +598,7 @@ export default { getDataPoints(arr) { if (!arr.length) return false arr.forEach(item => { - this.trackLineImage(item) + this.addSingleLineImg(item.voyage_name, null) this.divingImage(item) }) const voyageList = arr @@ -537,6 +632,7 @@ export default { } }) this.dataList = voyageList + console.log(this.dataList) }, // 初始化cesium @@ -626,10 +722,16 @@ export default { this.viewer.imageryLayers.addImageryProvider(contour6000) }, turnDeatilPage(item) { + this.dialog5 = true + regInfo({voyage_name: item.voyage_name}).then(res => { + this.voyageInfo = res.map.voyage + }) + }, + handleVoyageDetail() { const routeData = this.$router.resolve({ name: 'dataDetail', query: { - voyage_name: item.voyage_name + voyage_name: this.voyageInfo.voyage_name } }) window.open(routeData.href, '_blank') @@ -774,13 +876,13 @@ export default { border-bottom: 1px solid #e5e5e5; cursor: default; - &:hover { - .left4_top { - p { - color: #409eff; - } - } - } + //&:hover { + // .left4_top { + // p { + // color: #409eff; + // } + // } + //} .left4_top { display: flex; @@ -968,4 +1070,8 @@ export default { background: none !important; } +.rule-text { + font-size: 16px; + color: #212121; +} diff --git a/src/views/home.vue b/src/views/home.vue index e62f235..f4149cf 100644 --- a/src/views/home.vue +++ b/src/views/home.vue @@ -311,7 +311,7 @@ export default { sampleDataUpdateList: [], viewer: null, // 地图图层基础地址 - CesiumHostAddr: `${window.location.protocol}//${window.location.hostname}:${window.location.port}/`, + CesiumHostAddr: '', // 保存自定义底图 imageryViewModels: [], multipleSelection: [], // 当前选中的航次数组 @@ -328,6 +328,7 @@ export default { } }, created() { + this.CesiumHostAddr = process.env.NODE_ENV === 'development' ? 'http://124.222.8.13:9801/' : `${window.location.protocol}//${window.location.hostname}:${window.location.port}/` this.getVoyageList() this.getStatisticsNums() this.dataUpdate() diff --git a/src/views/statistics/RovStatistics.vue b/src/views/statistics/RovStatistics.vue new file mode 100644 index 0000000..1001f4e --- /dev/null +++ b/src/views/statistics/RovStatistics.vue @@ -0,0 +1,489 @@ + + + + + + + diff --git a/src/views/statistics/UuvStatistics.vue b/src/views/statistics/UuvStatistics.vue new file mode 100644 index 0000000..09cff37 --- /dev/null +++ b/src/views/statistics/UuvStatistics.vue @@ -0,0 +1,489 @@ + + + + + + + diff --git a/src/views/statistics/index.vue b/src/views/statistics/index.vue index 5ca244e..da79f8b 100644 --- a/src/views/statistics/index.vue +++ b/src/views/statistics/index.vue @@ -91,7 +91,6 @@
@@ -110,7 +109,6 @@