From 29f6f5781b59df7ad0017955ddd3319e508d60c1 Mon Sep 17 00:00:00 2001 From: zh <972939975@qq.com> Date: Thu, 13 Nov 2025 14:59:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=A0=8F=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Global/global.js | 79 ++--- src/Obj/Base/BillboardObject/index.js | 27 +- static/custom/css/index.css | 404 +++++++++----------------- 3 files changed, 195 insertions(+), 315 deletions(-) diff --git a/src/Global/global.js b/src/Global/global.js index b4f133c..220f7cc 100644 --- a/src/Global/global.js +++ b/src/Global/global.js @@ -156,19 +156,20 @@ function CesiumContainer(sdk, options) { infoElm.style.color = '#fff'; infoElm.style.padding = '4px 10px'; infoElm.style['border-radius'] = '18px'; + infoElm.style.display = 'flex'; if (coordinateSystem === 'EPSG:4326') { infoElm.innerHTML = ` - 经度：- - 纬度：- - 海拔高度：- +
经度：-
+
纬度：-
+
高程：-
` } else { infoElm.innerHTML = ` - x：- - y：- - z：- +
x：-
+
y：-
+
z：-
` } sdk.viewer._element.appendChild(infoElm) @@ -206,23 +207,23 @@ function CesiumContainer(sdk, options) { switch (positionType || '度') { case '度': infoElm.innerHTML = ` - 经度：${Number(position.lng.toFixed(6))}° - 纬度：${Number(position.lat.toFixed(6))}° - 海拔高度：${Number(position.alt.toFixed(2))}米 +
经度：${Number(position.lng.toFixed(6))}°
+
纬度：${Number(position.lat.toFixed(6))}°
+
高程：${Number(position.alt.toFixed(2))}米
` break; case '度分': infoElm.innerHTML = ` - 经度：${proj.degreesToDMS(position.lng, true)} - 纬度：${proj.degreesToDMS(position.lat, true)} - 海拔高度：${Number(position.alt.toFixed(2))}米 +
经度：${proj.degreesToDMS(position.lng, true)}
+
纬度：${proj.degreesToDMS(position.lat, true)}
+
高程：${Number(position.alt.toFixed(2))}米
` break; case '度分秒': infoElm.innerHTML = ` - 经度：${proj.degreesToDMS(position.lng, false)} - 纬度：${proj.degreesToDMS(position.lat, false)} - 海拔高度：${Number(position.alt.toFixed(2))}米 +
经度：${proj.degreesToDMS(position.lng, false)}
+
纬度：${proj.degreesToDMS(position.lat, false)}
+
高程：${Number(position.alt.toFixed(2))}米
` break; default: @@ -234,9 +235,9 @@ function CesiumContainer(sdk, options) { let result = proj.convert([{ x: position.lng, y: position.lat, z: position.alt }], 'EPSG:4326', posiToCoordinate(coordinateSystem, position)) if (result.points.length) { infoElm.innerHTML = ` - x：${Number(result.points[0].x.toFixed(6))} - y：${Number(result.points[0].y.toFixed(6))} - z：${Number(result.points[0].z.toFixed(6))} +
x：${Number(result.points[0].x.toFixed(6))}
+
y：${Number(result.points[0].y.toFixed(6))}
+
z：${Number(result.points[0].z.toFixed(6))}
` } @@ -782,23 +783,23 @@ function setCoordinateSystem(sdk, epsg) { switch (positionType || '度') { case '度': infoElm.innerHTML = ` - 经度：${Number(position.lng.toFixed(6))}° - 纬度：${Number(position.lat.toFixed(6))}° - 海拔高度：${Number(position.alt.toFixed(2))}米 +
经度：${Number(position.lng.toFixed(6))}°
+
纬度：${Number(position.lat.toFixed(6))}°
+
海拔高度：${Number(position.alt.toFixed(2))}米
` break; case '度分': infoElm.innerHTML = ` - 经度：${proj.degreesToDMS(position.lng, true)} - 纬度：${proj.degreesToDMS(position.lat, true)} - 海拔高度：${Number(position.alt.toFixed(2))}米 +
经度：${proj.degreesToDMS(position.lng, true)}
+
纬度：${proj.degreesToDMS(position.lat, true)}
+
海拔高度：${Number(position.alt.toFixed(2))}米
` break; case '度分秒': infoElm.innerHTML = ` - 经度：${proj.degreesToDMS(position.lng, false)} - 纬度：${proj.degreesToDMS(position.lat, false)} - 海拔高度：${Number(position.alt.toFixed(2))}米 +
经度：${proj.degreesToDMS(position.lng, false)}
+
纬度：${proj.degreesToDMS(position.lat, false)}
+
海拔高度：${Number(position.alt.toFixed(2))}米
` break; default: @@ -809,9 +810,9 @@ function setCoordinateSystem(sdk, epsg) { // let result = proj.convert([{ x: position.lng, y: position.lat, z: position.alt }], 'EPSG:4326', coordinateSystem) let result = proj.convert([{ x: position.lng, y: position.lat, z: position.alt }], 'EPSG:4326', posiToCoordinate(coordinateSystem, position)) infoElm.innerHTML = ` - x：${Number(result.points[0].x.toFixed(6))} - y：${Number(result.points[0].y.toFixed(6))} - z：${Number(result.points[0].z.toFixed(6))} +
x：${Number(result.points[0].x.toFixed(6))}
+
y：${Number(result.points[0].y.toFixed(6))}
+
z：${Number(result.points[0].z.toFixed(6))}
` } } @@ -888,23 +889,23 @@ function setDMS(sdk, type) { switch (type) { case '度': infoElm.innerHTML = ` - 经度：${Number(position.lng.toFixed(6))}° - 纬度：${Number(position.lat.toFixed(6))}° - 海拔高度：${Number(position.alt.toFixed(2))}米 +
经度：${Number(position.lng.toFixed(6))}°
+
纬度：${Number(position.lat.toFixed(6))}°
+
海拔高度：${Number(position.alt.toFixed(2))}米
` break; case '度分': infoElm.innerHTML = ` - 经度：${proj.degreesToDMS(position.lng, true)} - 纬度：${proj.degreesToDMS(position.lat, true)} - 海拔高度：${Number(position.alt.toFixed(2))}米 +
经度：${proj.degreesToDMS(position.lng, true)}
+
纬度：${proj.degreesToDMS(position.lat, true)}
+
海拔高度：${Number(position.alt.toFixed(2))}米
` break; case '度分秒': infoElm.innerHTML = ` - 经度：${proj.degreesToDMS(position.lng, false)} - 纬度：${proj.degreesToDMS(position.lat, false)} - 海拔高度：${Number(position.alt.toFixed(2))}米 +
经度：${proj.degreesToDMS(position.lng, false)}
+
纬度：${proj.degreesToDMS(position.lat, false)}
+
海拔高度：${Number(position.alt.toFixed(2))}米
` break; default: diff --git a/src/Obj/Base/BillboardObject/index.js b/src/Obj/Base/BillboardObject/index.js index c6fb7f0..8665ac9 100644 --- a/src/Obj/Base/BillboardObject/index.js +++ b/src/Obj/Base/BillboardObject/index.js @@ -591,7 +591,12 @@ class BillboardObject extends Base { return this.options.position.lng } set lng(v) { - this.options.position.lng = Number(Number(v).toFixed(8)) + if(v===null || v===undefined || v==='') { + this.options.position.lng = v + } + else { + this.options.position.lng = Number(Number(v).toFixed(8)) + } // this.scan && (this.scan.lng = v) // this.diffuse && (this.diffuse.lng = v) this.renewPoint() @@ -607,7 +612,12 @@ class BillboardObject extends Base { return this.options.position.lat } set lat(v) { - this.options.position.lat = Number(Number(v).toFixed(8)) + if(v===null || v===undefined || v==='') { + this.options.position.lat = v + } + else { + this.options.position.lat = Number(Number(v).toFixed(8)) + } // this.scan && (this.scan.lat = v) // this.diffuse && (this.diffuse.lat = v) this.renewPoint() @@ -623,7 +633,12 @@ class BillboardObject extends Base { return this.options.position.alt } set alt(v) { - this.options.position.alt = Number(Number(v).toFixed(2)) + if(v===null || v===undefined || v==='') { + this.options.position.alt = v + } + else { + this.options.position.alt = Number(Number(v).toFixed(2)) + } // this.scan && (this.scan.alt = v) // this.diffuse && (this.diffuse.alt = v) this.renewPoint() @@ -2135,9 +2150,9 @@ class BillboardObject extends Base { this.labelShow = this.originalOptions.label.show this.labelFontSize = this.originalOptions.label.fontSize this.labelColor = this.originalOptions.label.color - this.lng = this.originalOptions.position.lng - this.lat = this.originalOptions.position.lat - this.alt = this.originalOptions.position.alt + this.lng = this.originalOptions.position.lng || 0 + this.lat = this.originalOptions.position.lat || 0 + this.alt = this.originalOptions.position.alt || 0 this.attributeLink = this.options.attribute.link.content this.attributeVr = this.options.attribute.vr.content this.attributeCamera = this.options.attribute.camera.content diff --git a/static/custom/css/index.css b/static/custom/css/index.css index 23e7778..5473aac 100644 --- a/static/custom/css/index.css +++ b/static/custom/css/index.css @@ -34,7 +34,7 @@ } :root { - --color-sdk-base-rgb: 0, 255, 255; + --color-base1: 0, 255, 255; --color-sdk-auxiliary: 0, 66, 66; --color-sdk-auxiliary-public: #ffffff; --color-sdk-warning-0: #1BF8C3; @@ -44,9 +44,9 @@ --color-sdk-text-head: #FFFFFF; --color-sdk-text-head-1: #E6F7FF; --color-sdk-text-head-2: #ADF1FF; - --color-sdk-gradual: rgb(0, 255, 255) 6.25%, rgb(0, 200, 255) 100%; - --color-sdk-bg-gradual: #00ffff33 0%, #00ffff00 100%; - --color-sdk-text-shadow: rgba(20, 118, 255, 1); + --color-sdk-gradual: rgb(var(--color-base1)) 6.25%, var(--color-border1) 100%; + --color-sdk-bg-gradual: rgba(var(--color-base1), 0.2) 0%, rgba(var(--color-base1), 0) 100%; + --color-text-shadow: rgba(20, 118, 255, 1); } .cesium-viewer-cesiumWidgetContainer { @@ -88,7 +88,7 @@ width: 70.5px; height: 6px; opacity: 1; - background: rgba(var(--color-sdk-base-rgb), 1); + background: rgba(var(--color-base1), 1); clip-path: polygon(0 0, calc(100% - 3px) 0, 100% 6px, 0 6px); } @@ -158,10 +158,10 @@ border-radius: 4px; white-space: nowrap; border-radius: 4px; - background: rgba(var(--color-sdk-base-rgb), 0.2); - border: 1px solid rgba(var(--color-sdk-base-rgb), 0.5); + background: rgba(var(--color-base1), 0.2); + border: 1px solid rgba(var(--color-base1), 0.5); display: flex; - justify-content: flex-start; + justify-content: center; align-items: center; padding: 5px 16px 4px 16px; color: #ffffff; @@ -170,7 +170,7 @@ } .YJ-custom-base-dialog button:not(button[disabled]):hover { - border-color: rgba(var(--color-sdk-base-rgb), 1) !important; + border-color: rgba(var(--color-base1), 1) !important; cursor: pointer; } @@ -224,7 +224,7 @@ line-height: 0px; color: rgba(255, 255, 255, 1); text-align: left; - text-shadow: 0px 0px 9px var(--color-sdk-text-shadow); + text-shadow: 0px 0px 9px var(--color-text-shadow); -webkit-pointer-events: none; -moz-pointer-events: none; -ms-pointer-events: none; @@ -244,7 +244,7 @@ line-height: 0px; color: rgba(255, 255, 255, 1); text-align: left; - text-shadow: 0px 0px 9px var(--color-sdk-text-shadow) + text-shadow: 0px 0px 9px var(--color-text-shadow) } .YJ-custom-base-dialog>.title-box>.close-box { @@ -262,7 +262,7 @@ display: block; width: 100%; height: 100%; - background: rgba(var(--color-sdk-base-rgb), 1); + background: rgba(var(--color-base1), 1); opacity: 0.5; } @@ -336,7 +336,7 @@ .YJ-custom-base-dialog>.content textarea { font-size: 16px; background-color: rgba(0, 0, 0, 0.5); - border: 1px solid rgba(var(--color-sdk-base-rgb), 0.5); + border: 1px solid rgba(var(--color-base1), 0.5); border-radius: 5px; line-height: 32px; height: 32px; @@ -351,13 +351,13 @@ } .YJ-custom-base-dialog>.content input[type=checkbox]:read-only { - background-color: rgba(var(--color-sdk-base-rgb), 0.2); + background-color: rgba(var(--color-base1), 0.2); } .YJ-custom-base-dialog>.content input:focus-visible, .YJ-custom-base-dialog>.content textarea:focus-visible { outline: none; - border-color: rgba(var(--color-sdk-base-rgb), 0.8); + border-color: rgba(var(--color-base1), 0.8); } .YJ-custom-base-dialog>.content select:focus-visible { @@ -366,7 +366,7 @@ } .YJ-custom-base-dialog>.content select { - background-color: rgba(var(--color-sdk-base-rgb), 0.2); + background-color: rgba(var(--color-base1), 0.2); border: 1px solid rgba(0, 255, 255, 0); border-radius: 5px; line-height: 32px; @@ -448,20 +448,21 @@ .YJ-custom-base-dialog>.content .table { background-color: #ffffff00; color: #000; + font-size: 12px; } .YJ-custom-base-dialog>.content .table { background-color: #ffffff00; color: #000; overflow: hidden; - border: 1px solid rgba(var(--color-sdk-base-rgb), 0.5); + border: 1px solid rgba(var(--color-base1), 0.5); } .YJ-custom-base-dialog>.content .table input {} .YJ-custom-base-dialog>.content .table .tr { display: flex; - border: 1px solid rgba(var(--color-sdk-base-rgb), 0.5); + border: 1px solid rgba(var(--color-base1), 0.5); border-right: none; } @@ -475,9 +476,6 @@ border-top: none; } -.YJ-custom-base-dialog>.content .attribute-content-link .table .tr, -.YJ-custom-base-dialog>.content .attribute-content-vr .table .tr {} - .YJ-custom-base-dialog>.content .table .table-empty { display: flex; align-items: center; @@ -545,21 +543,19 @@ .YJ-custom-base-dialog>.content *::-webkit-scrollbar-thumb { border-radius: 5px; -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2); - background-color: rgba(var(--color-sdk-base-rgb)); + background-color: rgba(var(--color-base1)); } .YJ-custom-base-dialog>.content *::-webkit-scrollbar-track { -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2); border-radius: 5px; - background-color: rgba(var(--color-sdk-base-rgb), 0.1); + background-color: rgba(var(--color-base1), 0.1); } -.YJ-custom-base-dialog>.content .table .table-body .tr:last-child {} - .YJ-custom-base-dialog>.content .table .tr .th, .YJ-custom-base-dialog>.content .table .tr .td { flex: 1; - border-right: 1px solid rgba(var(--color-sdk-base-rgb), 0.5); + border-right: 1px solid rgba(var(--color-base1), 0.5); padding: 5px 10px; display: flex; align-items: center; @@ -573,40 +569,7 @@ justify-content: center; } -.YJ-custom-base-dialog>.content .attribute-content-link .table .tr .th:nth-child(1), -.YJ-custom-base-dialog>.content .attribute-content-link .table .tr .td:nth-child(1), -.YJ-custom-base-dialog>.content .attribute-content-vr .table .tr .th:nth-child(1), -.YJ-custom-base-dialog>.content .attribute-content-vr .table .tr .td:nth-child(1) { - width: 164px; - flex: 0 0 164px; -} -.YJ-custom-base-dialog>.content .attribute-content-link .table .tr .th:nth-child(2), -.YJ-custom-base-dialog>.content .attribute-content-link .table .tr .td:nth-child(2), -.YJ-custom-base-dialog>.content .attribute-content-vr .table .tr .th:nth-child(2), -.YJ-custom-base-dialog>.content .attribute-content-vr .table .tr .td:nth-child(2) { - width: 226px; - flex: 0 0 226px; -} - -.YJ-custom-base-dialog>.content .attribute-content-link .table .tr .th:nth-child(3), -.YJ-custom-base-dialog>.content .attribute-content-link .table .tr .td:nth-child(3), -.YJ-custom-base-dialog>.content .attribute-content-vr .table .tr .th:nth-child(3), -.YJ-custom-base-dialog>.content .attribute-content-vr .table .tr .td:nth-child(3) { - flex: 0 0 150px; - width: 150px; - justify-content: center; -} - -.YJ-custom-base-dialog>.content .attribute-content-link .table .tr .td .input-group .input, -.YJ-custom-base-dialog>.content .attribute-content-vr .table .tr .td .input-group .input { - border-radius: 5px 0 0 5px; -} - -.YJ-custom-base-dialog>.content .attribute-content-materials .table .tr .th:nth-child(1), -.YJ-custom-base-dialog>.content .attribute-content-materials .table .tr .td:nth-child(1) { - flex: 0 0 60px; -} .YJ-custom-base-dialog>.content .table .tr .td .link-edit { min-height: 32px; @@ -621,68 +584,6 @@ border-right: none; } -.YJ-custom-base-dialog>.content .table.camera-table { - overflow-x: auto; -} - -.YJ-custom-base-dialog>.content .table.isc-table { - overflow: hidden; -} - -.YJ-custom-base-dialog>.content .table.camera-table .tr { - display: inline-flex; -} - -.YJ-custom-base-dialog>.content .table.isc-table .tr { - display: flex; -} - -.YJ-custom-base-dialog>.content .table.camera-table .tr:last-child, -.YJ-custom-base-dialog>.content .table.isc-table .tr:last-child { - border-bottom: 1px solid rgba(var(--color-sdk-base-rgb), 0.5); -} - -.YJ-custom-base-dialog>.content .table.camera-table .tr .td span, -.YJ-custom-base-dialog>.content .table.isc-table .tr .td span { - white-space: nowrap; - margin-left: 10px; -} - -.YJ-custom-base-dialog>.content .table.camera-table .tr .td input[type=checkbox], -.YJ-custom-base-dialog>.content .table.isc-table .tr .td input[type=checkbox] { - cursor: pointer; -} - -.YJ-custom-base-dialog>.content .table.camera-table .table-body, -.YJ-custom-base-dialog>.content .table.isc-table .table-body { - display: inline-flex; - flex-direction: column; - height: 186px; - width: auto; -} - -.YJ-custom-base-dialog>.content .table.camera-table .tr .th, -.YJ-custom-base-dialog>.content .table.camera-table .tr .td { - flex: 0 100px; - width: 100px; - min-width: 100px; -} - -.YJ-custom-base-dialog>.content .table.isc-table .tr .th, -.YJ-custom-base-dialog>.content .table.isc-table .tr .td { - flex: 1; - width: auto; - min-width: auto; -} - -.YJ-custom-base-dialog>.content .table.camera-table .tr .th:first-child, -.YJ-custom-base-dialog>.content .table.camera-table .tr .td:first-child, -.YJ-custom-base-dialog>.content .table.isc-table .tr .th:first-child, -.YJ-custom-base-dialog>.content .table.isc-table .tr .td:first-child { - flex: 0 74px; - min-width: 74px; -} - .YJ-custom-base-dialog>.content select>option { color: #000; } @@ -692,7 +593,7 @@ height: 6px; border: 0; margin-top: 20px; - background: rgba(var(--color-sdk-base-rgb), 0.2); + background: rgba(var(--color-base1), 0.2); -webkit-appearance: none; } */ .YJ-custom-base-dialog>.content [type="range"] { @@ -709,7 +610,7 @@ .YJ-custom-base-dialog>.content [type="range"]::-webkit-slider-runnable-track { height: 6px; - background: rgba(var(--color-sdk-base-rgb), 0.2); + background: rgba(var(--color-base1), 0.2); } .YJ-custom-base-dialog>.content [type="range" i]::-webkit-slider-container { @@ -723,10 +624,10 @@ width: 20px; height: 20px; border-radius: 50%; - background-color: rgba(var(--color-sdk-base-rgb), 1); - border: 1px solid rgba(var(--color-sdk-base-rgb), 1); + background-color: rgba(var(--color-base1), 1); + border: 1px solid rgba(var(--color-base1), 1); margin-top: -7px; - border-image: linear-gradient(rgba(var(--color-sdk-base-rgb), 1), rgba(var(--color-sdk-base-rgb), 1)) 0 fill / 8 20 8 0 / 0px 0px 0 2000px; + border-image: linear-gradient(rgba(var(--color-base1), 1), rgba(var(--color-base1), 1)) 0 fill / 8 20 8 0 / 0px 0px 0 2000px; } @@ -757,11 +658,12 @@ font-weight: 700; font-family: 'D-Din-Bold'; font-size: 18px; */ - font-size: 12px; + font-family: 'ddin'; + font-size: 18px; font-weight: 400; letter-spacing: 0px; line-height: 24px; - color: rgba(204, 204, 204, 1); + color: rgb(255, 255, 255); text-align: left; vertical-align: top; } @@ -800,6 +702,15 @@ margin-right: -15px; } +.YJ-custom-base-dialog>.content .input-number-unit input[type=number] { + padding: 0 16px 0 10px; +} +.YJ-custom-base-dialog>.content .input-number-unit input[type=number]::-webkit-outer-spin-button, +.YJ-custom-base-dialog>.content .input-number-unit input[type=number]::-webkit-inner-spin-button { + margin-left: 5px; + margin-right: -12px; +} + .YJ-custom-base-dialog>.content .input-number-unit-1 input[type=number] { padding: 0 26px 0 10px; } @@ -916,11 +827,11 @@ } .fly-roam>.content .table .table-body .tr.active { - background: rgba(var(--color-sdk-base-rgb), 0.15); + background: rgba(var(--color-base1), 0.15); } .fly-roam>.content .table .table-body .tr:last-child { - border: 1px solid rgba(var(--color-sdk-base-rgb), 0.5); + border: 1px solid rgba(var(--color-base1), 0.5); border-left: none; border-right: none; } @@ -935,7 +846,7 @@ cursor: no-drop; } .YJ-custom-base-dialog>.content .fly-roam .table .table-body .tr:last-child .play:hover { - border-color: rgba(var(--color-sdk-base-rgb), 0.5) !important; + border-color: rgba(var(--color-base1), 0.5) !important; } */ .fly-roam>.content .table .action { @@ -1065,7 +976,7 @@ margin-top: 1px; font-size: 14px; background-color: rgba(0, 0, 0, 0.5); - border: 1px solid rgba(var(--color-sdk-base-rgb), 0.5); + border: 1px solid rgba(var(--color-base1), 0.5); border-radius: 5px; line-height: 32px; height: 32px; @@ -1092,7 +1003,7 @@ } .YJ-custom-base-dialog .ew-color-picker .icon-pen-box:hover .icon-pen { - fill: rgba(var(--color-sdk-base-rgb), 1); + fill: rgba(var(--color-base1), 1); margin: 0; } @@ -1154,14 +1065,14 @@ .YJ-custom-base-dialog .ew-color-picker>.yj-pre-collect-color-container>.yj-pre-collect-color.add, .YJ-custom-base-dialog .ew-color-picker>.yj-pre-collect-color-container>.yj-pre-collect-color.subtract { - border-color: rgba(var(--color-sdk-base-rgb), 0.2); + border-color: rgba(var(--color-base1), 0.2); background: unset; line-height: 22px; } .YJ-custom-base-dialog .ew-color-picker>.yj-pre-collect-color-container>.yj-pre-collect-color.add:hover, .YJ-custom-base-dialog .ew-color-picker>.yj-pre-collect-color-container>.yj-pre-collect-color.subtract:hover { - border-color: rgba(var(--color-sdk-base-rgb), 0.4); + border-color: rgba(var(--color-base1), 0.4); } .YJ-custom-base-dialog .ew-color-picker>.yj-pre-collect-color-container svg, @@ -1205,9 +1116,9 @@ line-height: 28px; } -.YJ-custom-base-dialog .ew-color-picker .ew-color-dropbtngroup button.ew-color-clear { +/* .YJ-custom-base-dialog .ew-color-picker .ew-color-dropbtngroup button.ew-color-clear { margin-right: 8px; -} +} */ .YJ-custom-base-dialog .ew-color-picker-box { border-width: 4px; @@ -1445,13 +1356,13 @@ .DIV-cy-tabs .DIV-cy-tab-top::-webkit-scrollbar-thumb { border-radius: 5px; -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2); - background-color: rgba(var(--color-sdk-base-rgb)); + background-color: rgba(var(--color-base1)); } .DIV-cy-tabs .DIV-cy-tab-top::-webkit-scrollbar-track { -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2); border-radius: 5px; - background-color: rgba(var(--color-sdk-base-rgb), 0.1); + background-color: rgba(var(--color-base1), 0.1); } .DIV-cy-tabs .DIV-cy-tab-top::after { @@ -1474,11 +1385,11 @@ } .DIV-cy-tabs .DIV-cy-tab-pane-title .DIV-cy-tab-pane-title-p:hover { - border-bottom-color: rgba(var(--color-sdk-base-rgb)); + border-bottom-color: rgba(var(--color-base1)); } .DIV-cy-tabs .DIV-cy-tab-pane-title .DIV-cy-tab-pane-title-p:hover span { - text-shadow: 0px 0px 9px var(--color-sdk-text-shadow); + text-shadow: 0px 0px 9px var(--color-text-shadow); } .DIV-cy-tabs .DIV-cy-tab-pane-title:first-child { @@ -1515,11 +1426,11 @@ } .DIV-cy-tabs .DIV-cy-tab-pane-title-p.is-active { - border-bottom-color: rgba(var(--color-sdk-base-rgb)); + border-bottom-color: rgba(var(--color-base1)); } .DIV-cy-tabs .DIV-cy-tab-pane-title-p.is-active span { - text-shadow: 0px 0px 9px var(--color-sdk-text-shadow); + text-shadow: 0px 0px 9px var(--color-text-shadow); } /* 开关按钮样式 */ @@ -1530,8 +1441,8 @@ height: 20px; padding: 0; position: relative; - border: 1px solid rgba(var(--color-sdk-base-rgb), 0.2); - background-color: rgba(var(--color-sdk-base-rgb), 0.2); + border: 1px solid rgba(var(--color-base1), 0.2); + background-color: rgba(var(--color-base1), 0.2); border-radius: 20px; background-clip: content-box; display: inline-block; @@ -1555,9 +1466,9 @@ .YJ-custom-base-dialog>.content .btn-switch:checked, .YJ-custom-base-dialog>.foot .btn-switch:checked { - border-color: rgba(var(--color-sdk-base-rgb), 1); - box-shadow: rgba(var(--color-sdk-base-rgb)) 0 0 0 16px inset; - background-color: rgba(var(--color-sdk-base-rgb)); + border-color: rgba(var(--color-base1), 1); + box-shadow: rgba(var(--color-base1)) 0 0 0 16px inset; + background-color: rgba(var(--color-base1)); } .YJ-custom-base-dialog>.content .btn-switch:checked:before, @@ -1709,12 +1620,12 @@ .YJ-custom-base-dialog>.content .cy_datalist input.datalist { border-color: #00000000; - background-color: rgba(var(--color-sdk-base-rgb), 0.2) !important; + background-color: rgba(var(--color-base1), 0.2) !important; } .YJ-custom-base-dialog>.content .cy_datalist dl { min-width: 100%; - border-color: rgba(var(--color-sdk-base-rgb), 0.5); + border-color: rgba(var(--color-base1), 0.5); } .YJ-custom-base-dialog>.content .cy_datalist dl dd { @@ -1727,17 +1638,17 @@ } .YJ-custom-base-dialog>.content .cy_datalist dl dd:hover { - background-color: rgba(var(--color-sdk-base-rgb), 0.2); + background-color: rgba(var(--color-base1), 0.2); color: white; } .YJ-custom-base-dialog>.content .cy_datalist dl dd.active { - color: rgba(var(--color-sdk-base-rgb)) !important; - /* background-color: rgba(var(--color-sdk-base-rgb), 0.2); */ + color: rgba(var(--color-base1)) !important; + /* background-color: rgba(var(--color-base1), 0.2); */ } .YJ-custom-base-dialog>.content .cy_datalist dl dd.active svg { - fill: rgba(var(--color-sdk-base-rgb)) + fill: rgba(var(--color-base1)) } .YJ-custom-base-dialog>.content .cy_datalist dl dd.active::before { @@ -1745,8 +1656,8 @@ display: inline-block; width: 8px; height: 4px; - border-bottom: 2px solid rgba(var(--color-sdk-base-rgb)); - border-left: 2px solid rgba(var(--color-sdk-base-rgb)); + border-bottom: 2px solid rgba(var(--color-base1)); + border-left: 2px solid rgba(var(--color-base1)); transform: rotate(-45deg); position: absolute; right: 6px; @@ -1769,58 +1680,6 @@ top: 10px; } -/* 点标注 */ -.YJ-custom-base-dialog.billboard-object>.content { - width: 590px; -} - -.YJ-custom-base-dialog.billboard-object>.content button.primary { - padding: 6px 14px; -} - -.YJ-custom-base-dialog.billboard-object>.content>div .row .col { - margin: 0 10px; -} - -.YJ-custom-base-dialog.billboard-object>.content>div .row .col:first-child { - margin-left: 0; -} - -.YJ-custom-base-dialog.billboard-object>.content>div .row .col:last-child { - margin-right: 0; -} - -.YJ-custom-base-dialog.billboard-object>.content>div .row .label { - flex: 0 0 56px; - white-space: nowrap; -} - -.YJ-custom-base-dialog.billboard-object>.content .DIV-cy-tab-content-pane .input-select { - width: 100px; -} - -.YJ-custom-base-dialog.billboard-object>.content .DIV-cy-tab-content-pane h4 { - font-size: 16px; - margin-bottom: 10px; -} - -.YJ-custom-base-dialog.billboard-object>.content div .image-box { - width: 23px; - height: 26px; - cursor: pointer; - border: 1px solid rgba(var(--color-sdk-base-rgb), 0.2); - display: flex; - align-items: center; - justify-content: center; -} - -.YJ-custom-base-dialog.billboard-object>.content div .image { - max-width: 100%; - max-height: 100%; - width: auto; - height: auto; -} - /* 富文本 */ .richText-box { position: absolute; @@ -1942,13 +1801,13 @@ } .YJ-custom-base-dialog.trajectory-motion>.content .btn.is-active { - border-color: rgba(var(--color-sdk-base-rgb)); + border-color: rgba(var(--color-base1)); } .YJ-custom-base-dialog.trajectory-motion>.content .btn-group .btn.is-active>span { color: #fff; font-size: 16px; - text-shadow: 0px 0px 9px var(--color-sdk-text-shadow); + text-shadow: 0px 0px 9px var(--color-text-shadow); font-weight: 400; } @@ -2029,7 +1888,7 @@ .YJ-custom-base-dialog.sun-shine-surface>.content>div .progress { height: 100%; width: 0; - background: rgba(var(--color-sdk-base-rgb), 1); + background: rgba(var(--color-base1), 1); border-radius: 15px; position: relative; } @@ -2039,7 +1898,7 @@ height: 16px; background: white; /* border: 3px solid #4285f4; */ - background: rgba(var(--color-sdk-base-rgb), 1); + background: rgba(var(--color-base1), 1); border-radius: 50%; position: absolute; right: -8px; @@ -2255,7 +2114,7 @@ } .YJ-custom-base-dialog.submerge>.content .table-body .tr:last-child { - border-bottom: 1px solid rgba(var(--color-sdk-base-rgb), 0.5); + border-bottom: 1px solid rgba(var(--color-base1), 0.5); } .YJ-custom-base-dialog.submerge>.content .table-empty { @@ -2331,7 +2190,7 @@ } .YJ-custom-base-dialog.view-shed>.content .range-box .range-bg { - background: rgba(var(--color-sdk-base-rgb), 0.2); + background: rgba(var(--color-base1), 0.2); height: 100%; width: 100%; mask: url(../img/range.svg); @@ -2353,7 +2212,7 @@ .YJ-custom-base-dialog.view-shed>.content .range-box .range-bg .range-process { width: 0; height: 100%; - background: rgba(var(--color-sdk-base-rgb), 1); + background: rgba(var(--color-base1), 1); } .YJ-custom-base-dialog.view-shed>.content .range-box .range-node-box { @@ -2399,7 +2258,7 @@ height: 20px; background: #ffffff; border-radius: 50%; - border: 2px solid rgba(var(--color-sdk-base-rgb), 1); + border: 2px solid rgba(var(--color-base1), 1); } .YJ-custom-base-dialog.view-shed>.content .range-box .range-node-box .range-node-active-text { @@ -2418,7 +2277,7 @@ .YJ-custom-base-dialog.view-shed>.content .range-box input[type="range"]::-webkit-slider-runnable-track { height: 6px; - background: rgba(var(--color-sdk-base-rgb), 0); + background: rgba(var(--color-base1), 0); } .YJ-custom-base-dialog.view-shed>.content .range-box input[type="range"]::-webkit-slider-thumb { @@ -2427,10 +2286,10 @@ width: 20px; height: 20px; border-radius: 50%; - background-color: rgba(var(--color-sdk-base-rgb), 0); - border: 1px solid rgba(var(--color-sdk-base-rgb), 0); + background-color: rgba(var(--color-base1), 0); + border: 1px solid rgba(var(--color-base1), 0); margin-top: -7px; - border-image: linear-gradient(rgba(var(--color-sdk-base-rgb), 0), rgba(var(--color-sdk-base-rgb), 0)) 0 fill / 8 20 8 0 / 0px 0px 0 2000px; + border-image: linear-gradient(rgba(var(--color-base1), 0), rgba(var(--color-base1), 0)) 0 fill / 8 20 8 0 / 0px 0px 0 2000px; } /* 通视分析 */ @@ -2473,7 +2332,7 @@ } .el-slider { - --el-slider-main-bg-color: rgba(var(--color-sdk-base-rgb), 1) + --el-slider-main-bg-color: rgba(var(--color-base1), 1) } /* 地形可视域分析 */ @@ -2704,6 +2563,11 @@ flex: 0 0 160px; } +.YJ-custom-base-dialog>.content>div .spatial-info-table .table-body .td input[type=number] { + font-family: 'ddin'; + font-size: 14px; +} + /* 集结地 */ .YJ-custom-base-dialog.assemble>.content { width: 600px; @@ -2930,33 +2794,33 @@ } .YJ-custom-base-dialog.polyline>.content>div .input-select-unit .datalist { - background-color: rgba(var(--color-sdk-base-rgb), 0.1) !important; + background-color: rgba(var(--color-base1), 0.1) !important; border-radius: 4px 0px 0px 4px !important; } .YJ-custom-base-dialog.polyline>.content>div .input-select-unit:nth-of-type(1) .datalist { - background-color: rgba(var(--color-sdk-base-rgb), 0.1) !important; + background-color: rgba(var(--color-base1), 0.1) !important; border-radius: 4px 0px, 0px, 4px !important; } .YJ-custom-base-dialog.polyline>.content>div .input-select-unit:nth-of-type(2) .datalist { - background-color: rgba(var(--color-sdk-base-rgb), 0.1) !important; + background-color: rgba(var(--color-base1), 0.1) !important; border-radius: 0px 4px 4px 0px !important; } .YJ-custom-base-dialog.polyline>.content>div .input-select-unit:nth-of-type(1) input { - border: 1px solid rgba(var(--color-sdk-base-rgb), 0.5) !important; + border: 1px solid rgba(var(--color-base1), 0.5) !important; } .YJ-custom-base-dialog.polyline>.content>div .input-select-unit:nth-of-type(2) input { - border: 1px solid rgba(var(--color-sdk-base-rgb), 0.5) !important; + border: 1px solid rgba(var(--color-base1), 0.5) !important; } .YJ-custom-base-dialog.polyline>.content input.input-text { background-color: rgba(0, 0, 0, 0.5) !important; border-radius: unset !important; - border-top: 1px solid rgba(var(--color-sdk-base-rgb), 0.5) !important; - border-bottom: 1px solid rgba(var(--color-sdk-base-rgb), 0.5) !important; + border-top: 1px solid rgba(var(--color-base1), 0.5) !important; + border-bottom: 1px solid rgba(var(--color-base1), 0.5) !important; } .YJ-custom-base-dialog.polyline>.content>div .input-select-line-type-box .cy_datalist input { @@ -3057,33 +2921,33 @@ } .YJ-custom-base-dialog.polyline>.content>div .input-select-unit .datalist { - background-color: rgba(var(--color-sdk-base-rgb), 0.1) !important; + background-color: rgba(var(--color-base1), 0.1) !important; border-radius: 4px 0px 0px 4px !important; } .YJ-custom-base-dialog.polyline>.content>div .input-select-unit:nth-of-type(1) .datalist { - background-color: rgba(var(--color-sdk-base-rgb), 0.1) !important; + background-color: rgba(var(--color-base1), 0.1) !important; border-radius: 4px 0px, 0px, 4px !important; } .YJ-custom-base-dialog.polyline>.content>div .input-select-unit:nth-of-type(2) .datalist { - background-color: rgba(var(--color-sdk-base-rgb), 0.1) !important; + background-color: rgba(var(--color-base1), 0.1) !important; border-radius: 0px 4px 4px 0px !important; } .YJ-custom-base-dialog.polyline>.content>div .input-select-unit:nth-of-type(1) input { - border: 1px solid rgba(var(--color-sdk-base-rgb), 0.5) !important; + border: 1px solid rgba(var(--color-base1), 0.5) !important; } .YJ-custom-base-dialog.polyline>.content>div .input-select-unit:nth-of-type(2) input { - border: 1px solid rgba(var(--color-sdk-base-rgb), 0.5) !important; + border: 1px solid rgba(var(--color-base1), 0.5) !important; } .YJ-custom-base-dialog.polyline>.content input.input-text { background-color: rgba(0, 0, 0, 0.5) !important; border-radius: unset !important; - border-top: 1px solid rgba(var(--color-sdk-base-rgb), 0.5) !important; - border-bottom: 1px solid rgba(var(--color-sdk-base-rgb), 0.5) !important; + border-top: 1px solid rgba(var(--color-base1), 0.5) !important; + border-bottom: 1px solid rgba(var(--color-base1), 0.5) !important; } .YJ-custom-base-dialog.polyline>.content>div .input-select-line-type-box .cy_datalist input { @@ -3109,19 +2973,19 @@ } .YJ-custom-base-dialog.polyline>.content>div .input-select-line-type-box .cy_datalist i.line { - border: 1px solid rgba(var(--color-sdk-base-rgb), 1); + border: 1px solid rgba(var(--color-base1), 1); height: 0px; margin-top: 4px; } .YJ-custom-base-dialog.polyline>.content>div .input-select-line-type-box .cy_datalist i.dash-line { - border: 1px dashed rgba(var(--color-sdk-base-rgb), 1); + border: 1px dashed rgba(var(--color-base1), 1); height: 0px; margin-top: 4px; } .YJ-custom-base-dialog.polyline>.content>div .input-select-line-type-box .cy_datalist i.light-line { - border: 1px solid rgba(var(--color-sdk-base-rgb), 1); + border: 1px solid rgba(var(--color-base1), 1); height: 0px; margin-top: 4px; box-shadow: 0 0 3px #fff @@ -3138,13 +3002,13 @@ } .YJ-custom-base-dialog.polyline>.content>div .input-select-line-type-box .cy_datalist i.flow-dash-line1 { - border: 1px dashed rgba(var(--color-sdk-base-rgb), 1); + border: 1px dashed rgba(var(--color-base1), 1); height: 0px; margin-top: 4px; } .YJ-custom-base-dialog.polyline>.content>div .input-select-line-type-box .cy_datalist i.flow-dash-line2 { - border: 1px dashed rgba(var(--color-sdk-base-rgb), 1); + border: 1px dashed rgba(var(--color-base1), 1); height: 0px; margin-top: 4px; } @@ -3213,13 +3077,13 @@ .popup-textarea textarea::-webkit-scrollbar-thumb { border-radius: 5px!important; -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2)!important; - background-color: rgba(var(--color-sdk-base-rgb))!important; + background-color: rgba(var(--color-base1))!important; } .popup-textarea textarea::-webkit-scrollbar-track { -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2)!important; border-radius: 5px!important; - background-color: rgba(var(--color-sdk-base-rgb), 0.1)!important; + background-color: rgba(var(--color-base1), 0.1)!important; } /* 贴地图片 */ @@ -3292,19 +3156,19 @@ .YJ-custom-base-dialog.proj-convert>.content>div .top-line { top: 5px; border-radius: 0 4px 0 0; - border-top: 1px solid rgba(var(--color-sdk-base-rgb), 0.5); - border-right: 1px solid rgba(var(--color-sdk-base-rgb), 0.5); + border-top: 1px solid rgba(var(--color-base1), 0.5); + border-right: 1px solid rgba(var(--color-base1), 0.5); } .YJ-custom-base-dialog.proj-convert>.content>div .bottom-line { bottom: 5px; border-radius: 0 0 4px 0; - border-bottom: 1px solid rgba(var(--color-sdk-base-rgb), 0.5); - border-right: 1px solid rgba(var(--color-sdk-base-rgb), 0.5); + border-bottom: 1px solid rgba(var(--color-base1), 0.5); + border-right: 1px solid rgba(var(--color-base1), 0.5); } .YJ-custom-base-dialog.proj-convert>.content>div .icon-copy-box:hover .icon-copy { - fill: rgba(var(--color-sdk-base-rgb)); + fill: rgba(var(--color-base1)); } /* 高清截图 */ @@ -3325,7 +3189,7 @@ .YJ-custom-base-dialog.screenShotHD>.content>div .progress { width: 200px; height: 6px; - background: rgba(var(--color-sdk-base-rgb), 0.2); + background: rgba(var(--color-base1), 0.2); border-radius: 3px; position: relative; } @@ -3334,7 +3198,7 @@ width: 0%; height: 6px; border-radius: 3px; - background: rgba(var(--color-sdk-base-rgb), 1); + background: rgba(var(--color-base1), 1); } .YJ-custom-base-dialog.screenShotHD>.content>div .progress>.progress-text { @@ -3369,7 +3233,7 @@ } .YJ-custom-base-dialog.screenShotHD>.content>div .range-box .range-bg { - background: rgba(var(--color-sdk-base-rgb), 0.2); + background: rgba(var(--color-base1), 0.2); border-radius: 3px; height: 100%; width: 100%; @@ -3390,13 +3254,13 @@ .YJ-custom-base-dialog.screenShotHD>.content>div .range-box .range-bg .range-process { width: 0; height: 100%; - background: rgba(var(--color-sdk-base-rgb), 1); + background: rgba(var(--color-base1), 1); } .YJ-custom-base-dialog.screenShotHD>.content>div .range-box .range-bg .range-process { width: 0; height: 100%; - background: rgba(var(--color-sdk-base-rgb), 1); + background: rgba(var(--color-base1), 1); } .YJ-custom-base-dialog.screenShotHD>.content>div .range-box .range-node-box { @@ -3431,7 +3295,7 @@ height: 13px; background: #ffffff; border-radius: 50%; - border: 2px solid rgba(var(--color-sdk-base-rgb), 1); + border: 2px solid rgba(var(--color-base1), 1); } .YJ-custom-base-dialog.screenShotHD>.content>div .range-box .range-node-box .range-node-active-text { @@ -3450,7 +3314,7 @@ .YJ-custom-base-dialog.screenShotHD>.content>div .range-box input[type="range"]::-webkit-slider-runnable-track { height: 6px; - background: rgba(var(--color-sdk-base-rgb), 0); + background: rgba(var(--color-base1), 0); } .YJ-custom-base-dialog.screenShotHD>.content>div .range-box input[type="range"]::-webkit-slider-thumb { @@ -3459,10 +3323,10 @@ width: 20px; height: 20px; border-radius: 50%; - background-color: rgba(var(--color-sdk-base-rgb), 0); - border: 1px solid rgba(var(--color-sdk-base-rgb), 0); + background-color: rgba(var(--color-base1), 0); + border: 1px solid rgba(var(--color-base1), 0); margin-top: -7px; - border-image: linear-gradient(rgba(var(--color-sdk-base-rgb), 0), rgba(var(--color-sdk-base-rgb), 0)) 0 fill / 8 20 8 0 / 0px 0px 0 2000px; + border-image: linear-gradient(rgba(var(--color-base1), 0), rgba(var(--color-base1), 0)) 0 fill / 8 20 8 0 / 0px 0px 0 2000px; } /* 地图打印 */ @@ -3577,7 +3441,7 @@ flex: 0 0 25px; padding: 0; border-radius: 5px; - border: 1px solid rgba(var(--color-sdk-base-rgb), 1); + border: 1px solid rgba(var(--color-base1), 1); -webkit-appearance: none; vertical-align: middle; background: rgba(0, 0, 0, 0.5); @@ -3598,7 +3462,7 @@ .YJ-custom-checkbox-left:checked::after, .YJ-custom-checkbox-right:checked::after { content: "✔"; - background-color: rgba(var(--color-sdk-base-rgb), 1); + background-color: rgba(var(--color-base1), 1); color: rgba(var(--color-sdk-auxiliary), 1); width: 25px; height: 25px; @@ -3613,7 +3477,7 @@ flex: 0 0 14px; padding: 0; border-radius: 2px; - border: 1px solid rgba(var(--color-sdk-base-rgb), 1); + border: 1px solid rgba(var(--color-base1), 1); -webkit-appearance: none; vertical-align: middle; background-color: rgba(0, 0, 0, 0.5); @@ -3633,7 +3497,7 @@ .YJ-custom-base-dialog>.content input.YJ-custom-checkbox[type=checkbox]:checked::after { content: "✔"; - background-color: rgba(var(--color-sdk-base-rgb), 1); + background-color: rgba(var(--color-base1), 1); color: rgba(var(--color-sdk-auxiliary), 1); width: 12px; height: 12px; @@ -3727,13 +3591,13 @@ .billboard-attribute-box .DIV-cy-tabs .DIV-cy-tab-content::-webkit-scrollbar-thumb { border-radius: 5px; -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2); - background-color: rgba(var(--color-sdk-base-rgb)); + background-color: rgba(var(--color-base1)); } .billboard-attribute-box .DIV-cy-tabs .DIV-cy-tab-content::-webkit-scrollbar-track { -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2); border-radius: 5px; - background-color: rgba(var(--color-sdk-base-rgb), 0.1); + background-color: rgba(var(--color-base1), 0.1); } .billboard-attribute-box .DIV-cy-tabs .DIV-cy-tab-content-pane { @@ -3748,8 +3612,8 @@ .billboard-attribute-box .billboard-attribute-box-line { position: absolute; width: 0px; - /* border-left: 1px solid rgba(var(--color-sdk-base-rgb), 0.5); */ - border-left: 1px solid rgba(var(--color-sdk-base-rgb), 1); + /* border-left: 1px solid rgba(var(--color-base1), 0.5); */ + border-left: 1px solid rgba(var(--color-base1), 1); /* transform: rotate(45deg); */ transform-origin: 0px 0px; -webkit-pointer-events: none; @@ -3797,7 +3661,7 @@ background-color: #ffffff00; color: #ffffff; overflow: hidden; - border: 1px solid rgba(var(--color-sdk-base-rgb), 0.5); + border: 1px solid rgba(var(--color-base1), 0.5); } .billboard-attribute-box .table .table-head .tr { @@ -3808,11 +3672,11 @@ .billboard-attribute-box .table .tr { display: flex; - border: 1px solid rgba(var(--color-sdk-base-rgb), 0.5); + border: 1px solid rgba(var(--color-base1), 0.5); border-right: none; } .billboard-attribute-box .table .tr .th, .billboard-attribute-box .table .tr .td { - border-right: 1px solid rgba(var(--color-sdk-base-rgb), 0.5); + border-right: 1px solid rgba(var(--color-base1), 0.5); display: flex; justify-content: center; } @@ -3862,8 +3726,8 @@ } #YJ-custom-message.success { - /* background-color: #f0f9eb; */ - /* color: rgb(82, 196, 26); */ + /* background-color: #f0f9eb; + color: rgb(82, 196, 26); */ background: linear-gradient(180deg, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5)), linear-gradient(0deg, rgba(27, 248, 195, 0.5) 0%, rgba(27, 248, 195, 0) 100%);