From ec34b4f755929642f7c33ecae136c73bf941edf4 Mon Sep 17 00:00:00 2001 From: panyuyi Date: Wed, 26 Jun 2024 20:40:53 +0800 Subject: [PATCH 01/18] =?UTF-8?q?fix:=20=E6=B3=A8=E9=87=8A=E7=BC=A9?= =?UTF-8?q?=E6=94=BE=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.js | 4 +- src/views/components/SyMixMap.vue | 51 ++++++++----------- .../components/RouteDetail.vue | 9 +++- 3 files changed, 29 insertions(+), 35 deletions(-) diff --git a/src/main.js b/src/main.js index 3f2b421..8c9e383 100644 --- a/src/main.js +++ b/src/main.js @@ -42,9 +42,9 @@ import DictData from '@/components/DictData' // const m = detectZoom() // document.body.style.zoom = 100 / Number(m); -import DevicePixelRatio from "@/utils/deviceRatio"; +// import DevicePixelRatio from "@/utils/deviceRatio"; -new DevicePixelRatio().init(); +// new DevicePixelRatio().init(); // 全局下载文件方法 import {downloadFile,showFile} from '@/api/common' diff --git a/src/views/components/SyMixMap.vue b/src/views/components/SyMixMap.vue index 5729d8a..92af6b7 100644 --- a/src/views/components/SyMixMap.vue +++ b/src/views/components/SyMixMap.vue @@ -104,6 +104,7 @@ export default { data() { return { defaultHeight: 50000, + defaultLineWidth: 6, isFullScreen: false, long: '', lat: '', @@ -161,17 +162,18 @@ export default { layer = new sycim.EntityLayer('layer'); viewer.addLayer(layer); plot = new sycim.Plot(viewer); - viewer.on( - sycim.SceneEventType.CAMERA_CHANGED, - () => { - viewer.setOptions({ - globe: { - depthTestAgainstTerrain: viewer.cameraPosition.alt > 10000 ? false : true - } - }); - }, - viewer - ); + // 三维模型才需要 + // viewer.on( + // sycim.SceneEventType.CAMERA_CHANGED, + // () => { + // viewer.setOptions({ + // globe: { + // depthTestAgainstTerrain: viewer.cameraPosition.alt > 10000 ? false : true + // } + // }); + // }, + // viewer + // ); setTimeout(() => { viewer.scene.camera.setView({ destination: new Cesium.Cartesian3.fromDegrees(113.27, 23.13, this.defaultHeight), @@ -250,21 +252,13 @@ export default { graphicItem = new sycim.Polyline(item.positions); graphicItem.setStyle({ canEdit: this.canEdit, - width: 16, + width: this.defaultLineWidth, clampToGround: true, lineType: '1', speed_s: 2, horizontalOrigin: sycim.HorizontalOrigin.CENTER, verticalOrigin: sycim.VerticalOrigin.BOTTOM, - - material: new sycim.PolylineImageTrailMaterialProperty({ - speed: 2, - image: `/icons/${item.icon}`, - repeat: { - x: 50, - y: 1 - } - }) + material: sycim.Cesium.Color.fromCssColorString('#36B29E') }) } if(graphicItem){ @@ -292,11 +286,12 @@ export default { let plotOptions = { scale: 1, image: `/icons/${iconName}`, + material: sycim.Cesium.Color.fromCssColorString('#36B29E'), horizontalOrigin: sycim.HorizontalOrigin.CENTER, verticalOrigin: sycim.VerticalOrigin.BOTTOM, } if(type === 'polyline'){ - plotOptions.width = 16 + plotOptions.width = 4 } if(plot) plot.stop() plot.draw( @@ -310,25 +305,19 @@ export default { canEdit: true, horizontalOrigin: sycim.HorizontalOrigin.CENTER, verticalOrigin: sycim.VerticalOrigin.BOTTOM, + //disableDepthTestDistance: 5000, }) }else if(type === 'polyline'){ graphicItem = new sycim.Polyline(graphic.positions); graphicItem.setStyle({ canEdit: true, - width: 16, + width: this.defaultLineWidth, clampToGround: true, lineType: '1', speed_s: 2, horizontalOrigin: sycim.HorizontalOrigin.CENTER, verticalOrigin: sycim.VerticalOrigin.BOTTOM, - material: new sycim.PolylineImageTrailMaterialProperty({ - speed: 2, - image: `/icons/${iconName}`, - repeat: { - x: 50, - y: 1 - } - }) + material: sycim.Cesium.Color.fromCssColorString('#36B29E') }) } if(graphicItem){ diff --git a/src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue b/src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue index 6d1c32b..64c672a 100644 --- a/src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue +++ b/src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue @@ -121,9 +121,9 @@
- +
路线方向
@@ -580,6 +580,11 @@ export default { border: 1px solid #dcdcdc; margin-right: 16px; margin-bottom: 16px; + .line-path { + width: 16px; + height: 6px; + background: #36b29e; + } .icon { width: 16px; height: 16px; From a6bb62f7a09588c7105061fb07b52402ba937ca1 Mon Sep 17 00:00:00 2001 From: panyuyi Date: Wed, 26 Jun 2024 21:10:05 +0800 Subject: [PATCH 02/18] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/index.scss | 18 +++++++++--------- src/layout/components/AppMain.vue | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index b3a2a00..9ed44fb 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -152,15 +152,15 @@ aside { font-size: 14px; padding-bottom: 24px; overflow: auto; - .slider-right-body{ - width: 100%; - height: calc(100% - 74px); - margin-top: 24px; - padding: 16px; - padding-bottom: 60px; // 预留给分页器的 - background-color: #fff; - overflow: auto; - } + // .slider-right-body{ + // width: 100%; + // height: calc(100% - 74px); + // margin-top: 24px; + // padding: 16px; + // padding-bottom: 60px; // 预留给分页器的 + // background-color: #fff; + // overflow: auto; + // } .table-box{ padding-bottom: 60px !important; } diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index b381ec9..a3e41f9 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -37,7 +37,7 @@ export default { height: 100%; width: 100%; position: relative; - overflow: hidden; + overflow: auto; } .fixed-header + .app-main { From 528c9b088f66afa33710eb1034c0ab0571ddd218 Mon Sep 17 00:00:00 2001 From: panyuyi Date: Thu, 27 Jun 2024 10:13:20 +0800 Subject: [PATCH 03/18] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/index.scss | 20 +++++++++---------- .../inspectionPlan/components/PlanDetail.vue | 1 + 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 9ed44fb..a393f31 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -152,21 +152,21 @@ aside { font-size: 14px; padding-bottom: 24px; overflow: auto; - // .slider-right-body{ - // width: 100%; - // height: calc(100% - 74px); - // margin-top: 24px; - // padding: 16px; - // padding-bottom: 60px; // 预留给分页器的 - // background-color: #fff; - // overflow: auto; - // } + .slider-right-body{ + width: 100%; + // height: calc(100% - 74px); + margin-top: 24px; + padding: 16px; + padding-bottom: 60px; // 预留给分页器的 + background-color: #fff; + // overflow: auto; + } .table-box{ padding-bottom: 60px !important; } .bottom-btns{ width: 100%; - position: absolute; + position: fixed; bottom: 0; left: 0; display: flex; diff --git a/src/views/dike/runManage/enginerring/inspectionPlan/components/PlanDetail.vue b/src/views/dike/runManage/enginerring/inspectionPlan/components/PlanDetail.vue index eedb35f..bcffb96 100644 --- a/src/views/dike/runManage/enginerring/inspectionPlan/components/PlanDetail.vue +++ b/src/views/dike/runManage/enginerring/inspectionPlan/components/PlanDetail.vue @@ -646,6 +646,7 @@ export default { padding: 16px; padding-bottom: 78px; border-radius: 6px; + background-color: #fff; .form-row-title { font-size: 16px; font-weight: bold; From 6c5b17043288e9211125ec1ccaa8c87b2de4aa62 Mon Sep 17 00:00:00 2001 From: panyuyi Date: Thu, 27 Jun 2024 15:18:29 +0800 Subject: [PATCH 04/18] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B0=B4?= =?UTF-8?q?=E9=97=B8=E7=BB=B4=E4=BF=AE=E5=85=BB=E6=8A=A4=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../runManage/maintenance/maintenanceManage/index.vue | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/views/sluice/runManage/maintenance/maintenanceManage/index.vue b/src/views/sluice/runManage/maintenance/maintenanceManage/index.vue index 3fca85f..2741731 100644 --- a/src/views/sluice/runManage/maintenance/maintenanceManage/index.vue +++ b/src/views/sluice/runManage/maintenance/maintenanceManage/index.vue @@ -84,7 +84,8 @@ :page-sizes="pageData.pageSizes" layout="total, prev, pager, next, sizes, jumper" :total="pageData.total" - @size-change="getTableData()" + @current-change="(e) => handleCurrentPageChange(e)" + @size-change="(e) => handlePageSizeChange(e)" > @@ -125,6 +126,14 @@ export default { this.getTableData(); }, methods: { + handleCurrentPageChange(page) { + this.pageData.pageNum = page; + this.getTableData(); + }, + handlePageSizeChange(pageSize) { + this.pageData.pageSize = pageSize; + this.getTableData(); + }, // 获取列表信息 getTableData() { listJbxx({ From 19f6adf3587d0310f9cdfccb100fdc4274aba148 Mon Sep 17 00:00:00 2001 From: panyuyi Date: Wed, 3 Jul 2024 01:06:33 +0800 Subject: [PATCH 05/18] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=9A=90?= =?UTF-8?q?=E6=82=A3=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/dike/index.js | 9 ++++++ .../components/NewRecord.vue | 28 ++++++++-------- .../components/RecordDetails.vue | 32 +++++++++++++++++-- 3 files changed, 53 insertions(+), 16 deletions(-) diff --git a/src/api/dike/index.js b/src/api/dike/index.js index 6bbfb5e..a0292a4 100644 --- a/src/api/dike/index.js +++ b/src/api/dike/index.js @@ -106,6 +106,15 @@ export function exportProjectCheckingRecord(data){ }) } +// 巡查记录-获取轨迹列表 +export function getRecordTraceList(data = {}) { + return request({ + url: `/run/df/trace/list`, + method: 'post', + data + }) +} + /**************************************************/ // 获取巡查堤防列表 diff --git a/src/views/dike/runManage/enginerring/inspectionRecords/components/NewRecord.vue b/src/views/dike/runManage/enginerring/inspectionRecords/components/NewRecord.vue index 8105327..a0cf9b8 100644 --- a/src/views/dike/runManage/enginerring/inspectionRecords/components/NewRecord.vue +++ b/src/views/dike/runManage/enginerring/inspectionRecords/components/NewRecord.vue @@ -155,7 +155,7 @@