From f5f6c98d6b07ea67e2fe6f3524ae4705b1053369 Mon Sep 17 00:00:00 2001 From: panyuyi Date: Mon, 24 Jun 2024 17:18:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enginerring/inspectionRecords/index.vue | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/views/dike/runManage/enginerring/inspectionRecords/index.vue b/src/views/dike/runManage/enginerring/inspectionRecords/index.vue index 11924a8..f5d52d2 100644 --- a/src/views/dike/runManage/enginerring/inspectionRecords/index.vue +++ b/src/views/dike/runManage/enginerring/inspectionRecords/index.vue @@ -108,6 +108,10 @@ export default { console.log("取消删除"); }); }, + calcHours(start, end) { + if (!start || !end) return "-"; + return dayjs(end).diff(dayjs(start), "hour"); + }, getTreeData() { getAreasData().then((items) => { // console.log("getAreasData", items.data); @@ -541,14 +545,16 @@ export default { label="巡查开始时间/结束时间" > From 78e187d14df439bd8c3bf77e1f0a21d74d295f41 Mon Sep 17 00:00:00 2001 From: panyuyi Date: Mon, 24 Jun 2024 17:28:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DBug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dike/runManage/enginerring/inspectionPlan/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/dike/runManage/enginerring/inspectionPlan/index.vue b/src/views/dike/runManage/enginerring/inspectionPlan/index.vue index d3c7450..5b6a285 100644 --- a/src/views/dike/runManage/enginerring/inspectionPlan/index.vue +++ b/src/views/dike/runManage/enginerring/inspectionPlan/index.vue @@ -142,7 +142,7 @@ export default { this.$refs[formName].validate((valid) => { if (valid) { let user = []; - this.ruleForm.otherConfig.selectUser.forEach((element) => { + this.ruleForm.otherConfig.selectUser?.forEach((element) => { let a = { name: element.nickName, uid: element.id, From ec34b4f755929642f7c33ecae136c73bf941edf4 Mon Sep 17 00:00:00 2001 From: panyuyi Date: Wed, 26 Jun 2024 20:40:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E6=B3=A8=E9=87=8A=E7=BC=A9=E6=94=BE?= =?UTF-8?q?=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;