diff --git a/src/views/dataSearch.vue b/src/views/dataSearch.vue index 6f36989..60b2dd1 100644 --- a/src/views/dataSearch.vue +++ b/src/views/dataSearch.vue @@ -5,28 +5,12 @@
- +
- - + +
@@ -35,19 +19,15 @@
-
+
-

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

+

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

{{ item.create_time }}
    -
  • {{sample.sample_name}}
  • +
  • {{ sample.sample_name }} +
@@ -88,9 +68,9 @@
-
+
-

{{ item.voyage_name }} {{item.voyage_mileage}}海里

+

{{ item.voyage_name }} {{ item.voyage_mileage }}海里

{{ item.funding_org }}
@@ -105,12 +85,12 @@

离港日期:

- {{ item.voyage_start_date.slice(0,10) }} + {{ item.voyage_start_date.slice(0, 10) }}

返港日期:

- {{ item.voyage_end_date.slice(0,10) }} + {{ item.voyage_end_date.slice(0, 10) }}
@@ -139,24 +119,22 @@
- - - + + + @@ -165,26 +143,17 @@
- +
- - - + + + @@ -194,26 +163,17 @@
- +
- - - + + + @@ -223,26 +183,17 @@
- +
- - - + + + @@ -252,16 +203,9 @@
- +
@@ -554,13 +498,15 @@ export default { zIndex: 1000, width: 2, // 设置线条的材质(颜色) - material: Cesium.Color.fromRandom({alpha: 0.5}) + material: Cesium.Color.fromRandom({ alpha: 0.5 }) } }) - this.viewer.camera.setView({ - // 指定相机位置 - destination: Cesium.Cartesian3.fromDegrees(degreeArr[0], degreeArr[1]) - }) + // 修复 RangeError: Invalid array length + if (degreeArr.length > 1) + this.viewer.camera.setView({ + // 指定相机位置 + destination: Cesium.Cartesian3.fromDegrees(degreeArr[0], degreeArr[1]) + }) this.autoZoom() }, // 创建点位 @@ -588,7 +534,7 @@ export default { this.viewer.entities.removeAll() }, // 自动跳转到实体位置 - autoZoom(){ + autoZoom() { this.viewer.zoomTo(this.viewer.entities) }, turnDeatilPage(item) { @@ -796,7 +742,7 @@ export default { } }, goHome() { - this.$router.push({name: 'home'}) + this.$router.push({ name: 'home' }) } } } @@ -806,12 +752,14 @@ export default { .shuju { width: 100%; height: 100%; + .shuju_con { width: 100%; height: 100%; display: flex; align-items: center; justify-content: center; + .left { position: relative; width: 570px; @@ -821,16 +769,19 @@ export default { padding: 50px 30px; display: flex; flex-direction: column; + .left1 { width: 100%; height: 40px; display: flex; align-items: center; + .xiala { width: 80%; height: 40px; margin-right: 15px; } + .el-button { width: 12%; font-size: 20px; @@ -840,19 +791,24 @@ export default { align-items: center; justify-content: center; } + .sousuo { margin-right: 1%; } + .caidan { color: #999; } } + .left2 { margin-top: 20px; + .el-tag { margin-right: 10px; } } + .left3 { padding: 10px 0; width: 100%; @@ -862,52 +818,64 @@ export default { justify-content: center; border-bottom: 1px solid #e5e5e5; } - .left4{ + + .left4 { width: 100%; height: 700px; overflow-y: scroll; + &::-webkit-scrollbar { - width: 5px; /* 保持一个最小的宽度 */ - background-color: transparent; /* 透明背景 */ + width: 5px; + /* 保持一个最小的宽度 */ + background-color: transparent; + /* 透明背景 */ } &::-webkit-scrollbar-thumb { - background-color: transparent; /* 滚动条滑块也设置为透明 */ + background-color: transparent; + /* 滚动条滑块也设置为透明 */ } - .left4_1{ - padding:20px 0; + + .left4_1 { + padding: 20px 0; width: 100%; height: auto; border-bottom: 1px solid #e5e5e5; cursor: pointer; - &:hover{ - .left4_top{ - p{ + + &:hover { + .left4_top { + p { color: #409eff; } } } - .left4_top{ + + .left4_top { display: flex; flex-direction: column; width: 100%; margin-bottom: 10px; - p{ + + p { font-size: 16px; color: #212121; font-weight: bold; display: flex; justify-content: space-between; + .mileage { font-size: 12px; color: #909fa7; } } + .org { font-size: 12px; color: #999999; } } + .sample { padding: 6px 12px; box-sizing: border-box; @@ -915,6 +883,7 @@ export default { font-size: 14px; color: #555555; position: relative; + &::before { content: ""; display: block; @@ -926,28 +895,34 @@ export default { top: 12px; border-radius: 50%; } + //&:hover { // background-color: rgb(248,249,250); //} } + .bg-color { - background-color: rgb(93,156,236); + background-color: rgb(93, 156, 236); } - .left4_list{ + + .left4_list { width: 100%; display: flex; flex-wrap: wrap; justify-content: space-between; - .list1{ + + .list1 { width: 50%; display: flex; align-items: center; margin-bottom: 10px; - p{ + + p { font-size: 14px; color: #999; } - span{ + + span { font-size: 14px; color: #212121; } @@ -955,7 +930,8 @@ export default { } } } - .arrow{ + + .arrow { position: absolute; right: 0; top: 40%; @@ -963,13 +939,15 @@ export default { cursor: pointer; } } - .arrow_r{ + + .arrow_r { position: absolute; top: 40%; left: 0; z-index: 888; cursor: pointer; } + .right { width: 100%; height: 100%; @@ -991,21 +969,24 @@ export default { .left3_1 .el-radio { margin-right: 15px; } + .left3_1 .el-radio__label { font-size: 15px; } + .el-input__inner::-webkit-input-placeholder { color: #333; } + .left3_2 .el-input__inner { padding-left: 0; border: none; font-size: 15px; } -.BMapLabel{ + +.BMapLabel { border: none !important; color: #fff; background: none !important; } - diff --git a/src/views/home.vue b/src/views/home.vue index 373d5db..3e037ad 100644 --- a/src/views/home.vue +++ b/src/views/home.vue @@ -78,7 +78,9 @@
-
+
@@ -369,7 +371,7 @@ export default { this.viewer.scene._sunBloom = false this.viewer.scene.globe.showGroundAtmosphere = false this.viewer.scene.postProcessStages.fxaa.enabled = true - + // 改写 Cesium 原生鼠标滚轮事件,地图缩放改为按下 Ctrl + 鼠标滚轮 modifyCesiumMouseWheel(this.viewer); @@ -434,10 +436,12 @@ export default { material: Cesium.Color.fromRandom({ alpha: 0.5 }) } }) - this.viewer.camera.setView({ - // 指定相机位置 - destination: Cesium.Cartesian3.fromDegrees(degreeArr[0], degreeArr[1]) - }) + // 修复 RangeError: Invalid array length + if (degreeArr.length > 1) + this.viewer.camera.setView({ + // 指定相机位置 + destination: Cesium.Cartesian3.fromDegrees(degreeArr[0], degreeArr[1]) + }) this.autoZoom() }, // 创建点位 @@ -1259,7 +1263,7 @@ export default { z-index: 1000; } -#mouseWheelTip{ +#mouseWheelTip { position: absolute; left: 5px; bottom: 5px;