zhouyulong/electron-4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改el-tooltip样式

Browse Source
This commit is contained in:
zh
2025-11-14 18:10:33 +08:00
parent 128bb9912c
commit 480d4636cb
21 changed files with 576 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/renderer/components.d.ts vendored
View File

@ -11,6 +11,33 @@ declare module 'vue' {
BaseDialog: typeof import('./src/components/dialog/baseDialog.vue')['default'] BaseDialog: typeof import('./src/components/dialog/baseDialog.vue')['default']
Directory: typeof import('./src/components/dialog/directory.vue')['default'] Directory: typeof import('./src/components/dialog/directory.vue')['default']
DirectoryEdit: typeof import('./src/components/dialog/directoryEdit.vue')['default'] DirectoryEdit: typeof import('./src/components/dialog/directoryEdit.vue')['default']
ElButton: typeof import('element-plus/es')['ElButton']
ElCard: typeof import('element-plus/es')['ElCard']
ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
ElCol: typeof import('element-plus/es')['ElCol']
ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
ElDialog: typeof import('element-plus/es')['ElDialog']
ElForm: typeof import('element-plus/es')['ElForm']
ElFormItem: typeof import('element-plus/es')['ElFormItem']
ElIcon: typeof import('element-plus/es')['ElIcon']
ElImage: typeof import('element-plus/es')['ElImage']
ElInput: typeof import('element-plus/es')['ElInput']
ElOption: typeof import('element-plus/es')['ElOption']
ElPagination: typeof import('element-plus/es')['ElPagination']
ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm']
ElPopover: typeof import('element-plus/es')['ElPopover']
ElRow: typeof import('element-plus/es')['ElRow']
ElSelect: typeof import('element-plus/es')['ElSelect']
ElSlider: typeof import('element-plus/es')['ElSlider']
ElSwitch: typeof import('element-plus/es')['ElSwitch']
ElTable: typeof import('element-plus/es')['ElTable']
ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
ElTabPane: typeof import('element-plus/es')['ElTabPane']
ElTabs: typeof import('element-plus/es')['ElTabs']
ElTooltip: typeof import('element-plus/es')['ElTooltip']
ElTree: typeof import('element-plus/es')['ElTree']
ElUpload: typeof import('element-plus/es')['ElUpload']
Index_b: typeof import('./src/components/SvgIcon/index_b.vue')['default'] Index_b: typeof import('./src/components/SvgIcon/index_b.vue')['default']
Pagination: typeof import('./src/components/Pagination/index.vue')['default'] Pagination: typeof import('./src/components/Pagination/index.vue')['default']
RouterLink: typeof import('vue-router')['RouterLink'] RouterLink: typeof import('vue-router')['RouterLink']

369
src/renderer/public/sdk/custom/css/index.css
View File

@ -34,7 +34,7 @@
} }
:root { :root {
--color-sdk-base-rgb: 0, 255, 255; --color-base1: 0, 255, 255;
--color-sdk-auxiliary: 0, 66, 66; --color-sdk-auxiliary: 0, 66, 66;
--color-sdk-auxiliary-public: #ffffff; --color-sdk-auxiliary-public: #ffffff;
--color-sdk-warning-0: #1BF8C3; --color-sdk-warning-0: #1BF8C3;
@ -44,9 +44,9 @@
--color-sdk-text-head: #FFFFFF; --color-sdk-text-head: #FFFFFF;
--color-sdk-text-head-1: #E6F7FF; --color-sdk-text-head-1: #E6F7FF;
--color-sdk-text-head-2: #ADF1FF; --color-sdk-text-head-2: #ADF1FF;
--color-sdk-gradual: rgb(0, 255, 255) 6.25%, rgb(0, 200, 255) 100%; --color-sdk-gradual: rgb(var(--color-base1)) 6.25%, var(--color-border1) 100%;
--color-sdk-bg-gradual: #00ffff33 0%, #00ffff00 100%; --color-sdk-bg-gradual: rgba(var(--color-base1), 0.2) 0%, rgba(var(--color-base1), 0) 100%;
--color-sdk-text-shadow: rgba(20, 118, 255, 1); --color-text-shadow: rgba(20, 118, 255, 1);
} }
.cesium-viewer-cesiumWidgetContainer { .cesium-viewer-cesiumWidgetContainer {
@ -88,7 +88,7 @@
width: 70.5px; width: 70.5px;
height: 6px; height: 6px;
opacity: 1; 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); clip-path: polygon(0 0, calc(100% - 3px) 0, 100% 6px, 0 6px);
} }
@ -158,8 +158,8 @@
border-radius: 4px; border-radius: 4px;
white-space: nowrap; white-space: nowrap;
border-radius: 4px; border-radius: 4px;
background: rgba(var(--color-sdk-base-rgb), 0.2); background: rgba(var(--color-base1), 0.2);
border: 1px solid rgba(var(--color-sdk-base-rgb), 0.5); border: 1px solid rgba(var(--color-base1), 0.5);
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
@ -170,7 +170,7 @@
} }
.YJ-custom-base-dialog button:not(button[disabled]):hover { .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; cursor: pointer;
} }
@ -224,7 +224,7 @@
line-height: 0px; line-height: 0px;
color: rgba(255, 255, 255, 1); color: rgba(255, 255, 255, 1);
text-align: left; 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; -webkit-pointer-events: none;
-moz-pointer-events: none; -moz-pointer-events: none;
-ms-pointer-events: none; -ms-pointer-events: none;
@ -244,7 +244,7 @@
line-height: 0px; line-height: 0px;
color: rgba(255, 255, 255, 1); color: rgba(255, 255, 255, 1);
text-align: left; 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 { .YJ-custom-base-dialog>.title-box>.close-box {
@ -262,7 +262,7 @@
display: block; display: block;
width: 100%; width: 100%;
height: 100%; height: 100%;
background: rgba(var(--color-sdk-base-rgb), 1); background: rgba(var(--color-base1), 1);
opacity: 0.5; opacity: 0.5;
} }
@ -336,7 +336,7 @@
.YJ-custom-base-dialog>.content textarea { .YJ-custom-base-dialog>.content textarea {
font-size: 16px; font-size: 16px;
background-color: rgba(0, 0, 0, 0.5); 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; border-radius: 5px;
line-height: 32px; line-height: 32px;
height: 32px; height: 32px;
@ -351,13 +351,13 @@
} }
.YJ-custom-base-dialog>.content input[type=checkbox]:read-only { .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 input:focus-visible,
.YJ-custom-base-dialog>.content textarea:focus-visible { .YJ-custom-base-dialog>.content textarea:focus-visible {
outline: none; 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 { .YJ-custom-base-dialog>.content select:focus-visible {
@ -366,7 +366,7 @@
} }
.YJ-custom-base-dialog>.content select { .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: 1px solid rgba(0, 255, 255, 0);
border-radius: 5px; border-radius: 5px;
line-height: 32px; line-height: 32px;
@ -455,14 +455,14 @@
background-color: #ffffff00; background-color: #ffffff00;
color: #000; color: #000;
overflow: hidden; 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 input {}
.YJ-custom-base-dialog>.content .table .tr { .YJ-custom-base-dialog>.content .table .tr {
display: flex; 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; border-right: none;
} }
@ -543,19 +543,19 @@
.YJ-custom-base-dialog>.content *::-webkit-scrollbar-thumb { .YJ-custom-base-dialog>.content *::-webkit-scrollbar-thumb {
border-radius: 5px; border-radius: 5px;
-webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2); -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 { .YJ-custom-base-dialog>.content *::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2); -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
border-radius: 5px; 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 .tr .th, .YJ-custom-base-dialog>.content .table .tr .th,
.YJ-custom-base-dialog>.content .table .tr .td { .YJ-custom-base-dialog>.content .table .tr .td {
flex: 1; 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; padding: 5px 10px;
display: flex; display: flex;
align-items: center; align-items: center;
@ -584,71 +584,6 @@
border-right: none; border-right: none;
} }
<<<<<<< Updated upstream
=======
.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;
}
>>>>>>> Stashed changes
.YJ-custom-base-dialog>.content select>option { .YJ-custom-base-dialog>.content select>option {
color: #000; color: #000;
} }
@ -658,7 +593,7 @@
height: 6px; height: 6px;
border: 0; border: 0;
margin-top: 20px; margin-top: 20px;
background: rgba(var(--color-sdk-base-rgb), 0.2); background: rgba(var(--color-base1), 0.2);
-webkit-appearance: none; -webkit-appearance: none;
} */ } */
.YJ-custom-base-dialog>.content [type="range"] { .YJ-custom-base-dialog>.content [type="range"] {
@ -675,7 +610,7 @@
.YJ-custom-base-dialog>.content [type="range"]::-webkit-slider-runnable-track { .YJ-custom-base-dialog>.content [type="range"]::-webkit-slider-runnable-track {
height: 6px; 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 { .YJ-custom-base-dialog>.content [type="range" i]::-webkit-slider-container {
@ -689,10 +624,10 @@
width: 20px; width: 20px;
height: 20px; height: 20px;
border-radius: 50%; border-radius: 50%;
background-color: rgba(var(--color-sdk-base-rgb), 1); background-color: rgba(var(--color-base1), 1);
border: 1px solid rgba(var(--color-sdk-base-rgb), 1); border: 1px solid rgba(var(--color-base1), 1);
margin-top: -7px; 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;
} }
@ -723,11 +658,12 @@
font-weight: 700; font-weight: 700;
font-family: 'D-Din-Bold'; font-family: 'D-Din-Bold';
font-size: 18px; */ font-size: 18px; */
font-size: 12px; font-family: 'ddin';
font-size: 18px;
font-weight: 400; font-weight: 400;
letter-spacing: 0px; letter-spacing: 0px;
line-height: 24px; line-height: 24px;
color: rgba(204, 204, 204, 1); color: rgb(255, 255, 255);
text-align: left; text-align: left;
vertical-align: top; vertical-align: top;
} }
@ -766,6 +702,15 @@
margin-right: -15px; 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] { .YJ-custom-base-dialog>.content .input-number-unit-1 input[type=number] {
padding: 0 26px 0 10px; padding: 0 26px 0 10px;
} }
@ -882,11 +827,11 @@
} }
.fly-roam>.content .table .table-body .tr.active { .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 { .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-left: none;
border-right: none; border-right: none;
} }
@ -901,7 +846,7 @@
cursor: no-drop; cursor: no-drop;
} }
.YJ-custom-base-dialog>.content .fly-roam .table .table-body .tr:last-child .play:hover { .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 { .fly-roam>.content .table .action {
@ -1031,7 +976,7 @@
margin-top: 1px; margin-top: 1px;
font-size: 14px; font-size: 14px;
background-color: rgba(0, 0, 0, 0.5); 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; border-radius: 5px;
line-height: 32px; line-height: 32px;
height: 32px; height: 32px;
@ -1058,7 +1003,7 @@
} }
.YJ-custom-base-dialog .ew-color-picker .icon-pen-box:hover .icon-pen { .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; margin: 0;
} }
@ -1120,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.add,
.YJ-custom-base-dialog .ew-color-picker>.yj-pre-collect-color-container>.yj-pre-collect-color.subtract { .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; background: unset;
line-height: 22px; 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.add:hover,
.YJ-custom-base-dialog .ew-color-picker>.yj-pre-collect-color-container>.yj-pre-collect-color.subtract: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, .YJ-custom-base-dialog .ew-color-picker>.yj-pre-collect-color-container svg,
@ -1411,13 +1356,13 @@
.DIV-cy-tabs .DIV-cy-tab-top::-webkit-scrollbar-thumb { .DIV-cy-tabs .DIV-cy-tab-top::-webkit-scrollbar-thumb {
border-radius: 5px; border-radius: 5px;
-webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2); -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 { .DIV-cy-tabs .DIV-cy-tab-top::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2); -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
border-radius: 5px; 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 { .DIV-cy-tabs .DIV-cy-tab-top::after {
@ -1440,11 +1385,11 @@
} }
.DIV-cy-tabs .DIV-cy-tab-pane-title .DIV-cy-tab-pane-title-p:hover { .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 { .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 { .DIV-cy-tabs .DIV-cy-tab-pane-title:first-child {
@ -1481,11 +1426,11 @@
} }
.DIV-cy-tabs .DIV-cy-tab-pane-title-p.is-active { .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 { .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);
} }
/* 开关按钮样式 */ /* 开关按钮样式 */
@ -1496,8 +1441,8 @@
height: 20px; height: 20px;
padding: 0; padding: 0;
position: relative; position: relative;
border: 1px solid rgba(var(--color-sdk-base-rgb), 0.2); border: 1px solid rgba(var(--color-base1), 0.2);
background-color: rgba(var(--color-sdk-base-rgb), 0.2); background-color: rgba(var(--color-base1), 0.2);
border-radius: 20px; border-radius: 20px;
background-clip: content-box; background-clip: content-box;
display: inline-block; display: inline-block;
@ -1521,9 +1466,9 @@
.YJ-custom-base-dialog>.content .btn-switch:checked, .YJ-custom-base-dialog>.content .btn-switch:checked,
.YJ-custom-base-dialog>.foot .btn-switch:checked { .YJ-custom-base-dialog>.foot .btn-switch:checked {
border-color: rgba(var(--color-sdk-base-rgb), 1); border-color: rgba(var(--color-base1), 1);
box-shadow: rgba(var(--color-sdk-base-rgb)) 0 0 0 16px inset; box-shadow: rgba(var(--color-base1)) 0 0 0 16px inset;
background-color: rgba(var(--color-sdk-base-rgb)); background-color: rgba(var(--color-base1));
} }
.YJ-custom-base-dialog>.content .btn-switch:checked:before, .YJ-custom-base-dialog>.content .btn-switch:checked:before,
@ -1675,12 +1620,12 @@
.YJ-custom-base-dialog>.content .cy_datalist input.datalist { .YJ-custom-base-dialog>.content .cy_datalist input.datalist {
border-color: #00000000; 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 { .YJ-custom-base-dialog>.content .cy_datalist dl {
min-width: 100%; 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 { .YJ-custom-base-dialog>.content .cy_datalist dl dd {
@ -1693,17 +1638,17 @@
} }
.YJ-custom-base-dialog>.content .cy_datalist dl dd:hover { .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; color: white;
} }
.YJ-custom-base-dialog>.content .cy_datalist dl dd.active { .YJ-custom-base-dialog>.content .cy_datalist dl dd.active {
color: rgba(var(--color-sdk-base-rgb)) !important; color: rgba(var(--color-base1)) !important;
/* background-color: rgba(var(--color-sdk-base-rgb), 0.2); */ /* background-color: rgba(var(--color-base1), 0.2); */
} }
.YJ-custom-base-dialog>.content .cy_datalist dl dd.active svg { .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 { .YJ-custom-base-dialog>.content .cy_datalist dl dd.active::before {
@ -1711,8 +1656,8 @@
display: inline-block; display: inline-block;
width: 8px; width: 8px;
height: 4px; height: 4px;
border-bottom: 2px solid rgba(var(--color-sdk-base-rgb)); border-bottom: 2px solid rgba(var(--color-base1));
border-left: 2px solid rgba(var(--color-sdk-base-rgb)); border-left: 2px solid rgba(var(--color-base1));
transform: rotate(-45deg); transform: rotate(-45deg);
position: absolute; position: absolute;
right: 6px; right: 6px;
@ -1735,61 +1680,6 @@
top: 10px; top: 10px;
} }
<<<<<<< Updated upstream
=======
/* 点标注 */
.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;
}
>>>>>>> Stashed changes
/* 富文本 */ /* 富文本 */
.richText-box { .richText-box {
position: absolute; position: absolute;
@ -1911,13 +1801,13 @@
} }
.YJ-custom-base-dialog.trajectory-motion>.content .btn.is-active { .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 { .YJ-custom-base-dialog.trajectory-motion>.content .btn-group .btn.is-active>span {
color: #fff; color: #fff;
font-size: 16px; 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; font-weight: 400;
} }
@ -1998,7 +1888,7 @@
.YJ-custom-base-dialog.sun-shine-surface>.content>div .progress { .YJ-custom-base-dialog.sun-shine-surface>.content>div .progress {
height: 100%; height: 100%;
width: 0; width: 0;
background: rgba(var(--color-sdk-base-rgb), 1); background: rgba(var(--color-base1), 1);
border-radius: 15px; border-radius: 15px;
position: relative; position: relative;
} }
@ -2008,7 +1898,7 @@
height: 16px; height: 16px;
background: white; background: white;
/* border: 3px solid #4285f4; */ /* border: 3px solid #4285f4; */
background: rgba(var(--color-sdk-base-rgb), 1); background: rgba(var(--color-base1), 1);
border-radius: 50%; border-radius: 50%;
position: absolute; position: absolute;
right: -8px; right: -8px;
@ -2224,7 +2114,7 @@
} }
.YJ-custom-base-dialog.submerge>.content .table-body .tr:last-child { .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 { .YJ-custom-base-dialog.submerge>.content .table-empty {
@ -2300,7 +2190,7 @@
} }
.YJ-custom-base-dialog.view-shed>.content .range-box .range-bg { .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%; height: 100%;
width: 100%; width: 100%;
mask: url(../img/range.svg); mask: url(../img/range.svg);
@ -2322,7 +2212,7 @@
.YJ-custom-base-dialog.view-shed>.content .range-box .range-bg .range-process { .YJ-custom-base-dialog.view-shed>.content .range-box .range-bg .range-process {
width: 0; width: 0;
height: 100%; 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 { .YJ-custom-base-dialog.view-shed>.content .range-box .range-node-box {
@ -2368,7 +2258,7 @@
height: 20px; height: 20px;
background: #ffffff; background: #ffffff;
border-radius: 50%; 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 { .YJ-custom-base-dialog.view-shed>.content .range-box .range-node-box .range-node-active-text {
@ -2387,7 +2277,7 @@
.YJ-custom-base-dialog.view-shed>.content .range-box input[type="range"]::-webkit-slider-runnable-track { .YJ-custom-base-dialog.view-shed>.content .range-box input[type="range"]::-webkit-slider-runnable-track {
height: 6px; 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 { .YJ-custom-base-dialog.view-shed>.content .range-box input[type="range"]::-webkit-slider-thumb {
@ -2396,10 +2286,10 @@
width: 20px; width: 20px;
height: 20px; height: 20px;
border-radius: 50%; border-radius: 50%;
background-color: rgba(var(--color-sdk-base-rgb), 0); background-color: rgba(var(--color-base1), 0);
border: 1px solid rgba(var(--color-sdk-base-rgb), 0); border: 1px solid rgba(var(--color-base1), 0);
margin-top: -7px; 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;
} }
/* 通视分析 */ /* 通视分析 */
@ -2442,7 +2332,7 @@
} }
.el-slider { .el-slider {
--el-slider-main-bg-color: rgba(var(--color-sdk-base-rgb), 1) --el-slider-main-bg-color: rgba(var(--color-base1), 1)
} }
/* 地形可视域分析 */ /* 地形可视域分析 */
@ -2673,6 +2563,11 @@
flex: 0 0 160px; 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 { .YJ-custom-base-dialog.assemble>.content {
width: 600px; width: 600px;
@ -2899,33 +2794,33 @@
} }
.YJ-custom-base-dialog.polyline>.content>div .input-select-unit .datalist { .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; border-radius: 4px 0px 0px 4px !important;
} }
.YJ-custom-base-dialog.polyline>.content>div .input-select-unit:nth-of-type(1) .datalist { .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; border-radius: 4px 0px, 0px, 4px !important;
} }
.YJ-custom-base-dialog.polyline>.content>div .input-select-unit:nth-of-type(2) .datalist { .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; border-radius: 0px 4px 4px 0px !important;
} }
.YJ-custom-base-dialog.polyline>.content>div .input-select-unit:nth-of-type(1) input { .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 { .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 { .YJ-custom-base-dialog.polyline>.content input.input-text {
background-color: rgba(0, 0, 0, 0.5) !important; background-color: rgba(0, 0, 0, 0.5) !important;
border-radius: unset !important; border-radius: unset !important;
border-top: 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-sdk-base-rgb), 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 { .YJ-custom-base-dialog.polyline>.content>div .input-select-line-type-box .cy_datalist input {
@ -3026,33 +2921,33 @@
} }
.YJ-custom-base-dialog.polyline>.content>div .input-select-unit .datalist { .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; border-radius: 4px 0px 0px 4px !important;
} }
.YJ-custom-base-dialog.polyline>.content>div .input-select-unit:nth-of-type(1) .datalist { .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; border-radius: 4px 0px, 0px, 4px !important;
} }
.YJ-custom-base-dialog.polyline>.content>div .input-select-unit:nth-of-type(2) .datalist { .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; border-radius: 0px 4px 4px 0px !important;
} }
.YJ-custom-base-dialog.polyline>.content>div .input-select-unit:nth-of-type(1) input { .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 { .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 { .YJ-custom-base-dialog.polyline>.content input.input-text {
background-color: rgba(0, 0, 0, 0.5) !important; background-color: rgba(0, 0, 0, 0.5) !important;
border-radius: unset !important; border-radius: unset !important;
border-top: 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-sdk-base-rgb), 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 { .YJ-custom-base-dialog.polyline>.content>div .input-select-line-type-box .cy_datalist input {
@ -3078,19 +2973,19 @@
} }
.YJ-custom-base-dialog.polyline>.content>div .input-select-line-type-box .cy_datalist i.line { .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; height: 0px;
margin-top: 4px; margin-top: 4px;
} }
.YJ-custom-base-dialog.polyline>.content>div .input-select-line-type-box .cy_datalist i.dash-line { .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; height: 0px;
margin-top: 4px; margin-top: 4px;
} }
.YJ-custom-base-dialog.polyline>.content>div .input-select-line-type-box .cy_datalist i.light-line { .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; height: 0px;
margin-top: 4px; margin-top: 4px;
box-shadow: 0 0 3px #fff box-shadow: 0 0 3px #fff
@ -3107,13 +3002,13 @@
} }
.YJ-custom-base-dialog.polyline>.content>div .input-select-line-type-box .cy_datalist i.flow-dash-line1 { .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; height: 0px;
margin-top: 4px; margin-top: 4px;
} }
.YJ-custom-base-dialog.polyline>.content>div .input-select-line-type-box .cy_datalist i.flow-dash-line2 { .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; height: 0px;
margin-top: 4px; margin-top: 4px;
} }
@ -3182,13 +3077,13 @@
.popup-textarea textarea::-webkit-scrollbar-thumb { .popup-textarea textarea::-webkit-scrollbar-thumb {
border-radius: 5px!important; border-radius: 5px!important;
-webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2)!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 { .popup-textarea textarea::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2)!important; -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2)!important;
border-radius: 5px!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;
} }
/* 贴地图片 */ /* 贴地图片 */
@ -3261,19 +3156,19 @@
.YJ-custom-base-dialog.proj-convert>.content>div .top-line { .YJ-custom-base-dialog.proj-convert>.content>div .top-line {
top: 5px; top: 5px;
border-radius: 0 4px 0 0; border-radius: 0 4px 0 0;
border-top: 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-sdk-base-rgb), 0.5); border-right: 1px solid rgba(var(--color-base1), 0.5);
} }
.YJ-custom-base-dialog.proj-convert>.content>div .bottom-line { .YJ-custom-base-dialog.proj-convert>.content>div .bottom-line {
bottom: 5px; bottom: 5px;
border-radius: 0 0 4px 0; border-radius: 0 0 4px 0;
border-bottom: 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-sdk-base-rgb), 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 { .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));
} }
/* 高清截图 */ /* 高清截图 */
@ -3294,7 +3189,7 @@
.YJ-custom-base-dialog.screenShotHD>.content>div .progress { .YJ-custom-base-dialog.screenShotHD>.content>div .progress {
width: 200px; width: 200px;
height: 6px; height: 6px;
background: rgba(var(--color-sdk-base-rgb), 0.2); background: rgba(var(--color-base1), 0.2);
border-radius: 3px; border-radius: 3px;
position: relative; position: relative;
} }
@ -3303,7 +3198,7 @@
width: 0%; width: 0%;
height: 6px; height: 6px;
border-radius: 3px; 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 { .YJ-custom-base-dialog.screenShotHD>.content>div .progress>.progress-text {
@ -3338,7 +3233,7 @@
} }
.YJ-custom-base-dialog.screenShotHD>.content>div .range-box .range-bg { .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; border-radius: 3px;
height: 100%; height: 100%;
width: 100%; width: 100%;
@ -3359,13 +3254,13 @@
.YJ-custom-base-dialog.screenShotHD>.content>div .range-box .range-bg .range-process { .YJ-custom-base-dialog.screenShotHD>.content>div .range-box .range-bg .range-process {
width: 0; width: 0;
height: 100%; 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 { .YJ-custom-base-dialog.screenShotHD>.content>div .range-box .range-bg .range-process {
width: 0; width: 0;
height: 100%; 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 { .YJ-custom-base-dialog.screenShotHD>.content>div .range-box .range-node-box {
@ -3400,7 +3295,7 @@
height: 13px; height: 13px;
background: #ffffff; background: #ffffff;
border-radius: 50%; 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 { .YJ-custom-base-dialog.screenShotHD>.content>div .range-box .range-node-box .range-node-active-text {
@ -3419,7 +3314,7 @@
.YJ-custom-base-dialog.screenShotHD>.content>div .range-box input[type="range"]::-webkit-slider-runnable-track { .YJ-custom-base-dialog.screenShotHD>.content>div .range-box input[type="range"]::-webkit-slider-runnable-track {
height: 6px; 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 { .YJ-custom-base-dialog.screenShotHD>.content>div .range-box input[type="range"]::-webkit-slider-thumb {
@ -3428,10 +3323,10 @@
width: 20px; width: 20px;
height: 20px; height: 20px;
border-radius: 50%; border-radius: 50%;
background-color: rgba(var(--color-sdk-base-rgb), 0); background-color: rgba(var(--color-base1), 0);
border: 1px solid rgba(var(--color-sdk-base-rgb), 0); border: 1px solid rgba(var(--color-base1), 0);
margin-top: -7px; 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;
} }
/* 地图打印 */ /* 地图打印 */
@ -3546,7 +3441,7 @@
flex: 0 0 25px; flex: 0 0 25px;
padding: 0; padding: 0;
border-radius: 5px; border-radius: 5px;
border: 1px solid rgba(var(--color-sdk-base-rgb), 1); border: 1px solid rgba(var(--color-base1), 1);
-webkit-appearance: none; -webkit-appearance: none;
vertical-align: middle; vertical-align: middle;
background: rgba(0, 0, 0, 0.5); background: rgba(0, 0, 0, 0.5);
@ -3566,8 +3461,8 @@
.YJ-custom-checkbox-left:checked::after, .YJ-custom-checkbox-left:checked::after,
.YJ-custom-checkbox-right:checked::after { .YJ-custom-checkbox-right:checked::after {
content: "✔"; content: "\2714";
background-color: rgba(var(--color-sdk-base-rgb), 1); background-color: rgba(var(--color-base1), 1);
color: rgba(var(--color-sdk-auxiliary), 1); color: rgba(var(--color-sdk-auxiliary), 1);
width: 25px; width: 25px;
height: 25px; height: 25px;
@ -3582,7 +3477,7 @@
flex: 0 0 14px; flex: 0 0 14px;
padding: 0; padding: 0;
border-radius: 2px; border-radius: 2px;
border: 1px solid rgba(var(--color-sdk-base-rgb), 1); border: 1px solid rgba(var(--color-base1), 1);
-webkit-appearance: none; -webkit-appearance: none;
vertical-align: middle; vertical-align: middle;
background-color: rgba(0, 0, 0, 0.5); background-color: rgba(0, 0, 0, 0.5);
@ -3601,8 +3496,8 @@
} }
.YJ-custom-base-dialog>.content input.YJ-custom-checkbox[type=checkbox]:checked::after { .YJ-custom-base-dialog>.content input.YJ-custom-checkbox[type=checkbox]:checked::after {
content: "✔"; content: "\2714";
background-color: rgba(var(--color-sdk-base-rgb), 1); background-color: rgba(var(--color-base1), 1);
color: rgba(var(--color-sdk-auxiliary), 1); color: rgba(var(--color-sdk-auxiliary), 1);
width: 12px; width: 12px;
height: 12px; height: 12px;
@ -3696,13 +3591,13 @@
.billboard-attribute-box .DIV-cy-tabs .DIV-cy-tab-content::-webkit-scrollbar-thumb { .billboard-attribute-box .DIV-cy-tabs .DIV-cy-tab-content::-webkit-scrollbar-thumb {
border-radius: 5px; border-radius: 5px;
-webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2); -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 { .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); -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
border-radius: 5px; 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 { .billboard-attribute-box .DIV-cy-tabs .DIV-cy-tab-content-pane {
@ -3717,8 +3612,8 @@
.billboard-attribute-box .billboard-attribute-box-line { .billboard-attribute-box .billboard-attribute-box-line {
position: absolute; position: absolute;
width: 0px; width: 0px;
/* border-left: 1px solid rgba(var(--color-sdk-base-rgb), 0.5); */ /* border-left: 1px solid rgba(var(--color-base1), 0.5); */
border-left: 1px solid rgba(var(--color-sdk-base-rgb), 1); border-left: 1px solid rgba(var(--color-base1), 1);
/* transform: rotate(45deg); */ /* transform: rotate(45deg); */
transform-origin: 0px 0px; transform-origin: 0px 0px;
-webkit-pointer-events: none; -webkit-pointer-events: none;
@ -3766,7 +3661,7 @@
background-color: #ffffff00; background-color: #ffffff00;
color: #ffffff; color: #ffffff;
overflow: hidden; 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 { .billboard-attribute-box .table .table-head .tr {
@ -3777,11 +3672,11 @@
.billboard-attribute-box .table .tr { .billboard-attribute-box .table .tr {
display: flex; 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; border-right: none;
} }
.billboard-attribute-box .table .tr .th, .billboard-attribute-box .table .tr .td { .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; display: flex;
justify-content: center; justify-content: center;
} }
@ -3831,8 +3726,8 @@
} }
#YJ-custom-message.success { #YJ-custom-message.success {
/* background-color: #f0f9eb; */ /* background-color: #f0f9eb;
/* color: rgb(82, 196, 26); */ color: rgb(82, 196, 26); */
background: background:
linear-gradient(180deg, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5)), 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%); linear-gradient(0deg, rgba(27, 248, 195, 0.5) 0%, rgba(27, 248, 195, 0) 100%);

33
src/renderer/src/I18n/zh-CN.ts
View File

@ -295,20 +295,28 @@ export default {
旋转: '旋转', 旋转: '旋转',
关闭: '关闭', 关闭: '关闭',
确定: '确定', 确定: '确定',
图标设置: '图标设置',
显隐: '显隐', 显隐: '显隐',
图标: '图标', 图标: '图标',
默认图标: '默认图标', times: '倍',
图标倍数: '图标倍数',
倍: '倍',
文字设置: '文字设置',
字体选择: '字体选择',
文字大小: '文字大小',
文字颜色: '文字颜色',
黑体: '黑体', 黑体: '黑体',
思源黑体: '思源黑体', 思源黑体: '思源黑体',
庞门正道标题体: '庞门正道标题体', 庞门正道标题体: '庞门正道标题体',
数黑体: '数黑体', 数黑体: '数黑体',
text: {
color: '字体颜色',
size: '字体大小',
font: '字体类型',
style: '字体样式',
bold: '加粗',
italic: '斜体',
underline: '下划线',
strikethrough: '删除线',
letterSpacing: '字体间距',
},
outline: {
color: '轮廓颜色',
width: '轮廓宽度',
}
}, },
dialog: { dialog: {
point: { point: {
@ -318,6 +326,15 @@ export default {
XAxis: 'X轴', XAxis: 'X轴',
YAxis: 'Y轴', YAxis: 'Y轴',
ZAxis: 'Z轴', ZAxis: 'Z轴',
icon: {
show: '图标显示',
current: '当前图标',
multiple: '图标倍数',
default: '默认图标',
},
text: {
show: '文字显示',
},
}, },
} }
} as const } as const

32
src/renderer/src/I18n/zh-EN.ts
View File

@ -297,17 +297,26 @@ export default {
图标设置: 'Icon settings', 图标设置: 'Icon settings',
显隐: 'show', 显隐: 'show',
图标: 'Icon', 图标: 'Icon',
默认图标: 'Default icon', times: 'times',
图标倍数: 'Icon scale',
倍: 'times',
文字设置: 'text settings',
字体选择: 'Font',
文字大小: 'Text size',
文字颜色: 'Text color',
黑体: 'SimHei', 黑体: 'SimHei',
思源黑体: 'SourceHanSansTi', 思源黑体: 'SourceHanSansTi',
庞门正道标题体: 'PMZDBTTi', 庞门正道标题体: 'PMZDBTTi',
数黑体: 'AlimamaShuHeiTi', 数黑体: 'AlimamaShuHeiTi',
text: {
color: 'Text color',
size: 'Text size',
font: 'Text font',
style: 'Text style',
bold: 'Bold',
italic: 'Italic',
underline: 'Underline',
strikethrough: 'Strikethrough',
letterSpacing: 'Letter spacing',
},
outline: {
color: 'Outline color',
width: 'Outline width',
}
}, },
dialog: { dialog: {
point: { point: {
@ -317,6 +326,15 @@ export default {
XAxis: 'X-axis', XAxis: 'X-axis',
YAxis: 'Y-axis', YAxis: 'Y-axis',
ZAxis: 'Z-axis', ZAxis: 'Z-axis',
icon: {
show: 'Icon show',
current: 'Current icon',
multiple: 'Icon scale',
default: 'Default icon',
},
text: {
show: 'Text show',
},
}, },
} }
} as const } as const

33
src/renderer/src/I18n/zh-TW.ts
View File

@ -293,20 +293,28 @@ export default {
旋转: '旋轉', 旋转: '旋轉',
关闭: '關閉', 关闭: '關閉',
确定: '確定', 确定: '確定',
图标设置: '圖標設置',
显隐: '顯隱', 显隐: '顯隱',
图标: '圖標', 图标: '圖標',
默认图标: '默認圖標', times: '倍',
图标倍数: '圖標倍數',
倍: '倍',
文字设置: '文字設置',
字体选择: '字體選擇',
文字大小: '文字大小',
文字颜色: '文字顔色',
黑体: '黑體', 黑体: '黑體',
思源黑体: '思源黑體', 思源黑体: '思源黑體',
庞门正道标题体: '龐門正道標題體', 庞门正道标题体: '龐門正道標題體',
数黑体: '數黑體', 数黑体: '數黑體',
text: {
color: '字體顔色',
size: '字體大小',
font: '字體類型',
style: '字體樣式',
bold: '加粗',
italic: '斜體',
underline: '下劃線',
strikethrough: '刪除線',
letterSpacing: '字體間距',
},
outline: {
color: '輪廓顔色',
width: '輪廓寬度',
}
}, },
dialog: { dialog: {
point: { point: {
@ -316,6 +324,15 @@ export default {
XAxis: 'X軸', XAxis: 'X軸',
YAxis: 'Y軸', YAxis: 'Y軸',
ZAxis: 'Z軸', ZAxis: 'Z軸',
icon: {
show: '圖標顯示',
current: '當前圖標',
multiple: '圖標倍數',
default: '默認圖標',
},
text: {
show: '文字顯示',
},
}, },
} }
} as const } as const

51
src/renderer/src/assets/styles/global.css
View File

@ -515,51 +515,32 @@ img {
} }
.el-popper.is-customized { .el-popper.is-customized {
padding: 2px 6px; padding: 6px 8px;
background: rgba(0, 0, 0, 0.6); background: linear-gradient(rgba(var(--color-base1), 0.5), rgba(var(--color-base1), 0.5)), rgba(0, 0, 0, 1);
pointer-events: none; pointer-events: none;
line-height: 14px;
} }
.el-popper.is-customized::before { .el-popper.is-customized[data-popper-placement="bottom"] .el-popper__arrow::before {
content: " ";
width: 100%;
height: 100%;
position: absolute;
top: 0;
left: 0;
border-radius: var(--el-popper-border-radius);
background: rgba(var(--color-base1), 0.2);
z-index: -1;
}
.el-popper.is-customized>.el-popper__arrow::before {
background: #ff000000 !important;
margin: 0; margin: 0;
right: 0; right: 0;
width: 0; width: 10px;
height: 0;
border: 5px solid rgba(var(--color-base1), 0.2) !important;
border-bottom-color: transparent !important;
border-right-color: transparent !important;
}
.el-popper.is-customized>.el-popper__arrow::after {
box-sizing: border-box;
content: " ";
height: 10px; height: 10px;
position: absolute; background: linear-gradient(rgba(var(--color-base1), 0.5), rgba(var(--color-base1), 0.5)), rgba(0, 0, 0, 1) !important;
transform: rotate(45deg); clip-path: polygon(0 0, 0 100%, 100% 0) !important;
z-index: -2; }
background: #ff000000;
.el-popper.is-customized[data-popper-placement="top"] .el-popper__arrow::before {
margin: 0; margin: 0;
right: 0; right: 0;
width: 0; width: 10px;
height: 0; height: 10px;
border: 5px solid rgba(0, 0, 0, 0.6); background: linear-gradient(rgba(var(--color-base1), 0.5), rgba(var(--color-base1), 0.5)), rgba(0, 0, 0, 1) !important;
border-bottom-color: transparent !important; clip-path: polygon(0 0, 0 100%, 100% 0) !important;
border-right-color: transparent !important; transform: rotate(-135deg);
} }
#app { #app {
.distance-legend { .distance-legend {
background-color: rgba(0, 0, 0, 0); background-color: rgba(0, 0, 0, 0);

3
src/renderer/src/components/Pagination/index.vue
View File

@ -101,8 +101,9 @@ const handleCurrentChange = (val) => {
::v-deep .el-pagination__jump { ::v-deep .el-pagination__jump {
.el-input__wrapper { .el-input__wrapper {
padding: 0; padding: 0;
box-shadow: none; box-shadow: none !important;
background: none; background: none;
border: none !important
} }
} }
::v-deep .el-pagination__sizes { ::v-deep .el-pagination__sizes {

1
src/renderer/src/icons/svg/prompt.svg Normal file
View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16" fill="none"><path d="M7.14258 12.8635C7.14258 13.3369 7.52633 13.7207 7.99972 13.7207C8.47311 13.7207 8.85686 13.3369 8.85686 12.8635C8.85686 12.3901 8.47311 12.0063 7.99972 12.0063C7.52633 12.0063 7.14258 12.3901 7.14258 12.8635Z" fill="#F16C55" ></path><path d="M8 16C3.58859 16 0 12.4114 0 8C0 3.58859 3.58859 0 8 0C12.4114 0 16 3.58859 16 8C16 12.4114 12.4114 16 8 16ZM8 1.14798C4.22171 1.14798 1.14798 4.22171 1.14798 8C1.14798 11.7777 4.22171 14.852 8 14.852C11.7777 14.852 14.852 11.7778 14.852 8C14.852 4.22171 11.7777 1.14798 8 1.14798Z" fill="#F16C55" ></path><path d="M7.99974 10.8875C7.68429 10.8875 7.42829 10.6315 7.42829 10.3161L7.42829 9.34985C7.42829 8.41497 8.14258 7.70069 8.77344 7.07042C9.2357 6.60756 9.71401 6.12985 9.71401 5.7487C9.71401 4.79613 8.94486 4.02128 7.99974 4.02128C7.03861 4.02128 6.28547 4.76299 6.28547 5.70985C6.28547 6.02528 6.02947 6.28126 5.71402 6.28126C5.39858 6.28126 5.14258 6.02526 5.14258 5.70985C5.14258 4.1487 6.42427 2.87842 7.99974 2.87842C9.5752 2.87842 10.8569 4.16585 10.8569 5.7487C10.8569 6.60413 10.2083 7.25211 9.58145 7.87899C9.08433 8.37499 8.57119 8.88811 8.57119 9.34926L8.57119 10.3155C8.57119 10.631 8.31519 10.8875 7.99974 10.8875Z" fill="#F16C55" ></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

1
src/renderer/src/icons/svg/text-bold.svg Normal file
View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16" fill="none"><path d="M13.2158 9.14111C12.7705 8.45347 12.1135 7.99613 11.2453 7.76971L11.2453 7.72585C11.7055 7.50653 12.0922 7.26141 12.4056 6.99049C12.7197 6.7344 12.9604 6.46347 13.1283 6.17836C13.4565 5.57845 13.6136 4.94952 13.5988 4.29092C13.5988 3.00339 13.201 1.96807 12.4056 1.18497C11.6173 0.409611 10.4383 0.0148363 8.8694 0L2.08008 0L2.08008 16L9.40611 16C10.6616 16 11.7087 15.5794 12.5485 14.7376C13.3954 13.9326 13.8259 12.8392 13.8401 11.4569C13.8401 10.6228 13.6322 9.85067 13.2158 9.14111ZM4.67611 2.16159L8.59589 2.16159C9.47883 2.17642 10.1288 2.39187 10.5445 2.80922C10.968 3.2556 11.1797 3.80068 11.1797 4.44444C11.1797 5.08821 10.968 5.62232 10.5445 6.04677C10.1288 6.50734 9.47883 6.73827 8.59589 6.73827L4.67611 6.73827L4.67611 2.16159ZM10.7968 12.9715C10.3811 13.4469 9.72401 13.692 8.82628 13.7068L4.67611 13.7068L4.67611 8.9005L8.82564 8.9005C9.72337 8.91469 10.3804 9.15272 10.7961 9.61393C11.2119 10.0822 11.4204 10.6454 11.4204 11.304C11.4204 11.9471 11.2125 12.5031 10.7968 12.9715Z" fill="#FFFFFF" ></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

1
src/renderer/src/icons/svg/text-italic.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

1
src/renderer/src/icons/svg/text-line-bottom.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

1
src/renderer/src/icons/svg/text-line-through.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 6.6 KiB

2
src/renderer/src/views/components/propertyBox/CoorLocation.vue
View File

@ -474,7 +474,7 @@ const flyto = async (e) => {
await initMapData('point', params, null) await initMapData('point', params, null)
} }
var pointPosi = {} var pointPosi:any = {}
const draw = async (e) => { const draw = async (e) => {
if (!pointPosi.lng) { if (!pointPosi.lng) {
await getPosition() await getPosition()

16
src/renderer/src/views/components/propertyBox/addGroundText.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<Dialog ref="baseDialog" :title="t('bottomMenu.groundText')" left="calc(50% - 160px)" top="calc(50% - 120px)" :closeCallback="closeCallBack"> <Dialog ref="baseDialog" :title="t('bottomMenu.groundText')" left="calc(50% - 198px)" top="calc(50% - 120px)" :closeCallback="closeCallBack">
<template #content> <template #content>
<textarea style="height: 76px; width: 270px" v-model="text"></textarea> <textarea style="height: 40px; width: 348px;" v-model="text"></textarea>
</template> </template>
<template #footer> <template #footer>
<button @click="confirm">{{ t('btn.confirm') }}</button> <button @click="confirm">{{ t('btn.confirm') }}</button>
@ -86,4 +86,14 @@ defineExpose({
}) })
</script> </script>
<style scoped lang="scss"></style> <style scoped lang="scss">
.YJ-custom-base-dialog {
>.content {
textarea {
min-height: 40px;
max-height: 325px;
resize: vertical;
}
}
}
</style>

16
src/renderer/src/views/components/propertyBox/addStandText.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<Dialog ref="baseDialog" :title="t('bottomMenu.standText')" left="calc(50% - 160px)" top="calc(50% - 120px)" :closeCallback="closeCallBack"> <Dialog ref="baseDialog" :title="t('bottomMenu.standText')" left="calc(50% - 198px)" top="calc(50% - 120px)" :closeCallback="closeCallBack">
<template #content> <template #content>
<textarea style="height: 76px; width: 270px" v-model="text"></textarea> <textarea style="height: 40px; width: 348px;" v-model="text"></textarea>
</template> </template>
<template #footer> <template #footer>
<button @click="confirm">{{ t('btn.confirm') }}</button> <button @click="confirm">{{ t('btn.confirm') }}</button>
@ -84,4 +84,14 @@ defineExpose({
}) })
</script> </script>
<style scoped lang="scss"></style> <style scoped lang="scss">
.YJ-custom-base-dialog {
>.content {
textarea {
min-height: 40px;
max-height: 325px;
resize: vertical;
}
}
}
</style>

255
src/renderer/src/views/components/propertyBox/billboardObject.vue
View File

@ -33,8 +33,8 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row" style="padding-left: 12px;">
<div style="width: 46%"> <div style="width: 46%;">
<div class="row" style="margin-bottom: 5px"> <div class="row" style="margin-bottom: 5px">
<div class="col"> <div class="col">
<span class="label">{{ t('general.经度') }}</span> <span class="label">{{ t('general.经度') }}</span>
@ -85,6 +85,107 @@
</div> </div>
</div> </div>
<span class="custom-divider"></span> <span class="custom-divider"></span>
<div class="div-item">
<!-- <setStyle type="点" :sourceType="sourceType" :entityOptions="entityOptions"></setStyle> -->
<div class="row" style="padding-left: 12px;">
<div class="col">
<span class="label" style="flex: none">{{ t('dialog.point.icon.show') }}</span>
<input class="btn-switch" type="checkbox" v-model="entityOptions.billboardShow" />
</div>
</div>
<div class="row" style="padding-left: 12px;">
<div class="col">
<span class="label" style="flex: none">{{ t('dialog.point.icon.current') }}</span>
<div class="image-box" @click="clickChangeImage">
<img class="image" :src="entityOptions.billboardImage" alt="" />
</div>
</div>
<div class="col">
<span class="label" style="flex: none">{{ t('dialog.point.icon.multiple') }}</span>
<div class="input-number input-number-unit-2">
<input class="input" type="number" title="" min="0.1" max="99" v-model="entityOptions.billboardScale"
@input="$handleInputLimit" />
<span class="unit">{{ t('general.times') }}</span>
<span class="arrow"></span>
</div>
</div>
<div class="col"></div>
</div>
<div class="row" style="padding-left: 12px;">
<div class="col" style="flex: 0 0 80px;">
<span class="label" style="flex: none;">{{ t('dialog.point.text.show') }}</span>
<input class="btn-switch" type="checkbox" v-model="entityOptions.labelShow" />
</div>
</div>
<div class="row" style="padding-left: 12px;">
<div class="col">
<span class="label" style="flex: none;">{{ t('general.text.color') }}</span>
<div class="labelColor" ref="labelColorRef"></div>
</div>
<div class="col">
<span class="label" style="flex: none;">{{ t('general.text.size') }}</span>
<div class="input-number input-number-unit-2">
<input class="input" type="number" title="" min="1" max="99" v-model="entityOptions.labelFontSize"
style="min-width: 70px;" @input="$handleInputLimit" />
<span class="unit">px</span>
<span class="arrow"></span>
</div>
</div>
<div class="col font-select-box">
<span class="label" style="flex: none;">{{ t('general.text.font') }}</span>
<el-select class="input input-select font-select" style="width: 100px"
v-model="entityOptions.labelFontFamily">
<el-option v-for="item in fontList" :key="item.key" :label="t('general.' + item.name)" :value="item.key">
</el-option>
</el-select>
</div>
</div>
<!-- <div class="row" style="padding-left: 12px;">
<div class="col">
<div class="customized-tip"></div>
<span class="label" style="flex: none;">{{ t('general.text.style') }}</span>
<svg class="icon-text bold">
<use xlink:href="#icon-text-bold"></use>
</svg>
<svg class="icon-text italic">
<use xlink:href="#icon-text-italic"></use>
</svg>
<svg class="icon-text line-bottom">
<use xlink:href="#icon-text-line-bottom"></use>
</svg>
<svg class="icon-text line-through">
<use xlink:href="#icon-text-line-through"></use>
</svg>
</div>
<div class="col">
<span class="label" style="flex: none;">{{ t('general.text.letterSpacing') }}</span>
<div class="input-number input-number-unit-2">
<input class="input" type="number" title="" min="0" max="99"
style="min-width: 70px;" @input="$handleInputLimit" />
<span class="unit">px</span>
<span class="arrow"></span>
</div>
</div>
<div class="col"></div>
</div>
<div class="row" style="padding-left: 12px;">
<div class="col">
<span class="label" style="flex: none;">{{ t('general.outline.color') }}</span>
<div class="labelOutlineColorColor" ref="labelOutlineColorRef"></div>
</div>
<div class="col">
<span class="label" style="flex: none;">{{ t('general.outline.width') }}</span>
<div class="input-number input-number-unit-2">
<input class="input" type="number" title="" min="0" max="99"
style="min-width: 70px;" @input="$handleInputLimit" />
<span class="unit">px</span>
<span class="arrow"></span>
</div>
</div>
<div class="col"></div>
</div> -->
</div>
<span class="custom-divider"></span>
<div class="div-item"> <div class="div-item">
<div class="row"> <div class="row">
<div class="col" style="flex: 0 0 120px"> <div class="col" style="flex: 0 0 120px">
@ -110,6 +211,9 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<span class="custom-divider"></span>
<div class="div-item">
<div class="row"> <div class="row">
<el-tabs v-model="activeName" @tab-click="handleClick"> <el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane :label="t('general.属性信息')" name="1"> <el-tab-pane :label="t('general.属性信息')" name="1">
@ -121,7 +225,8 @@
<span class="label" style="flex: 0 0 56px">{{ t('general.高度模式') }}</span> <span class="label" style="flex: 0 0 56px">{{ t('general.高度模式') }}</span>
<el-select class="input input-select height-mode-scelect" style="width: 155px; margin-left: 20px" <el-select class="input input-select height-mode-scelect" style="width: 155px; margin-left: 20px"
v-model="heightMode" @change="heightModeChange" placeholder="请选择"> v-model="heightMode" @change="heightModeChange" placeholder="请选择">
<el-option v-for="item in heightModeData" :key="item.key" :label="t('general.' + item.name)" :value="item.key"> <el-option v-for="item in heightModeData" :key="item.key" :label="t('general.' + item.name)"
:value="item.key">
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
@ -140,21 +245,24 @@
<div class="YJ-custom-checkbox-box" style="display: flex; align-items: center; cursor: pointer" <div class="YJ-custom-checkbox-box" style="display: flex; align-items: center; cursor: pointer"
@click="formatChange(1)"> @click="formatChange(1)">
<input type="checkbox" class="YJ-custom-checkbox" v-model="format1" /> <input type="checkbox" class="YJ-custom-checkbox" v-model="format1" />
<span style="margin-left: 10px; margin-bottom: 1px; user-select: none">{{ t('general.小数格式') }}</span> <span style="margin-left: 10px; margin-bottom: 1px; user-select: none">{{ t('general.小数格式')
}}</span>
</div> </div>
</div> </div>
<div class="col"> <div class="col">
<div class="YJ-custom-checkbox-box" style="display: flex; align-items: center; cursor: pointer" <div class="YJ-custom-checkbox-box" style="display: flex; align-items: center; cursor: pointer"
@click="formatChange(2)"> @click="formatChange(2)">
<input type="checkbox" class="YJ-custom-checkbox" v-model="format2" /> <input type="checkbox" class="YJ-custom-checkbox" v-model="format2" />
<span style="margin-left: 10px; margin-bottom: 1px; user-select: none">{{ t('general.度分格式') }}</span> <span style="margin-left: 10px; margin-bottom: 1px; user-select: none">{{ t('general.度分格式')
}}</span>
</div> </div>
</div> </div>
<div class="col"> <div class="col">
<div class="YJ-custom-checkbox-box" style="display: flex; align-items: center; cursor: pointer" <div class="YJ-custom-checkbox-box" style="display: flex; align-items: center; cursor: pointer"
@click="formatChange(3)"> @click="formatChange(3)">
<input type="checkbox" class="YJ-custom-checkbox" v-model="format3" /> <input type="checkbox" class="YJ-custom-checkbox" v-model="format3" />
<span style="margin-left: 10px; margin-bottom: 1px; user-select: none;white-space: nowrap;">{{ t('general.度分秒格式') }}</span> <span style="margin-left: 10px; margin-bottom: 1px; user-select: none;white-space: nowrap;">{{
t('general.度分秒格式') }}</span>
</div> </div>
</div> </div>
<div class="col"></div> <div class="col"></div>
@ -228,68 +336,6 @@
</div> </div>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label="t('general.标注风格')" name="3">
<div>
<h4>{{ t('general.图标设置') }}</h4>
<div class="row" style="margin-bottom: 10px">
<div class="col" style="flex: 0 0 80px">
<span class="label" style="flex: none">{{ t('general.显隐') }}</span>
<input class="btn-switch" type="checkbox" v-model="entityOptions.billboardShow" />
</div>
<div class="col" style="flex: 0 0 90px">
<span class="label" style="flex: none">{{ t('general.图标') }}</span>
<div class="image-box" @click="clickChangeImage">
<img class="image" :src="entityOptions.billboardImage" alt="" />
</div>
</div>
<div class="col" style="flex: 0 0 90px">
<span class="label" style="flex: none">{{ t('general.默认图标') }}</span>
<div class="image-box" @click="clickChangeDefaultImage">
<img class="image" :src="entityOptions.billboardDefaultImage" alt="" />
</div>
</div>
<div class="col">
<span class="label" style="flex: none">{{ t('general.图标倍数') }}</span>
<div class="input-number input-number-unit-2">
<input class="input" type="number" title="" min="0.1" max="99"
v-model="entityOptions.billboardScale" @input="$handleInputLimit" />
<span class="unit">{{ t('general.倍') }}</span>
<span class="arrow"></span>
</div>
</div>
</div>
</div>
<div>
<h4>{{ t('general.文字设置') }}</h4>
<div class="row">
<div class="col" style="flex: 0 0 80px;">
<span class="label" style="flex: none;">{{ t('general.显隐') }}</span>
<input class="btn-switch" type="checkbox" v-model="entityOptions.labelShow" />
</div>
<div class="col font-select-box">
<span class="label" style="flex: none;">{{ t('general.字体选择') }}</span>
<el-select class="input input-select font-select" style="width: 100px"
v-model="entityOptions.labelFontFamily">
<el-option v-for="item in fontList" :key="item.key" :label="t('general.' + item.name)" :value="item.key">
</el-option>
</el-select>
</div>
<div class="col">
<span class="label" style="flex: none;">{{ t('general.文字大小') }}</span>
<div class="input-number input-number-unit-2">
<input class="input" type="number" title="" min="1" max="99" v-model="entityOptions.labelFontSize"
style="min-width: 70px;" @input="$handleInputLimit" />
<span class="unit">px</span>
<span class="arrow"></span>
</div>
</div>
<div class="col">
<span class="label" style="flex: none;">{{ t('general.文字颜色') }}</span>
<div class="labelColor" ref="labelColorRef"></div>
</div>
</div>
</div>
</el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
</div> </div>
@ -317,6 +363,7 @@ import { TreeApi } from '@/api/tree'
import { ElMessage, ElMessageBox } from 'element-plus' import { ElMessage, ElMessageBox } from 'element-plus'
import Dialog from '@/components/dialog/baseDialog.vue' import Dialog from '@/components/dialog/baseDialog.vue'
import attribute from './attribute.vue' import attribute from './attribute.vue'
import setStyle from './defaultStyle/index.vue'
import { getFontList } from './fontSelect' import { getFontList } from './fontSelect'
import { useTreeNode } from '@/views/components/tree/hooks/treeNode' import { useTreeNode } from '@/views/components/tree/hooks/treeNode'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
@ -388,11 +435,13 @@ const z = ref()
const coordinate = ref('EPSG:4326') const coordinate = ref('EPSG:4326')
const heightMode = ref(0) const heightMode = ref(0)
const labelColorRef = ref(null) const labelColorRef = ref(null)
const sourceType = ref('')
let originalOptions let originalOptions
let that let that
const open = async (id) => { const open = async (id, type) => {
that = window.earth.entityMap.get(id) that = window.earth.entityMap.get(id)
sourceType.value = type
originalOptions = structuredClone(that.options) originalOptions = structuredClone(that.options)
entityOptions.value = that entityOptions.value = that
heightMode.value = entityOptions.value.heightMode heightMode.value = entityOptions.value.heightMode
@ -418,6 +467,47 @@ const open = async (id) => {
entityOptions.value.labelColor = 'rgba(255,255,255,1)' entityOptions.value.labelColor = 'rgba(255,255,255,1)'
} //点击清空按钮事件回调 } //点击清空按钮事件回调
}) })
let iconTextBold = document.getElementsByClassName('bold')[0]
let iconTextItalic = document.getElementsByClassName('italic')[0]
let iconTextLineBottom = document.getElementsByClassName('line-bottom')[0]
let iconTextLineThrough = document.getElementsByClassName('line-through')[0]
let tip: any = document.getElementsByClassName('customized-tip')[0]
iconTextBold.addEventListener('mouseleave', (event:any) => {
tip.style.display = 'none'
})
iconTextBold.addEventListener('mousemove', (event:any) => {
tip.innerHTML = t('general.text.bold')
tip.style.left = (event.layerX + 8) + 'px'
tip.style.top = (event.layerY + 18) + 'px'
tip.style.display = 'block'
})
iconTextItalic.addEventListener('mouseleave', (event:any) => {
tip.style.display = 'none'
})
iconTextItalic.addEventListener('mousemove', (event:any) => {
tip.innerHTML = t('general.text.italic')
tip.style.left = (event.layerX + 8) + 'px'
tip.style.top = (event.layerY + 18) + 'px'
tip.style.display = 'block'
})
iconTextLineBottom.addEventListener('mouseleave', (event:any) => {
tip.style.display = 'none'
})
iconTextLineBottom.addEventListener('mousemove', (event:any) => {
tip.innerHTML = t('general.text.underline')
tip.style.left = (event.layerX + 8) + 'px'
tip.style.top = (event.layerY + 18) + 'px'
tip.style.display = 'block'
})
iconTextLineThrough.addEventListener('mouseleave', (event:any) => {
tip.style.display = 'none'
})
iconTextLineThrough.addEventListener('mousemove', (event:any) => {
tip.innerHTML = t('general.text.strikethrough')
tip.style.left = (event.layerX + 8) + 'px'
tip.style.top = (event.layerY + 18) + 'px'
tip.style.display = 'block'
})
} }
const closeCallback = () => { const closeCallback = () => {
@ -677,26 +767,48 @@ defineExpose({
pointer-events: none; pointer-events: none;
} }
::v-deep >.content { ::v-deep>.content {
width: 590px; width: 590px;
.title1 { .title1 {
width: 46%; width: 46%;
} }
.title2 { .title2 {
width: 50%; width: 50%;
} }
.icon-text {
width: 16px;
height: 16px;
}
.customized-tip {
display: none;
background: linear-gradient(rgba(var(--color-base1), 0.5), rgba(var(--color-base1), 0.5)), rgba(0, 0, 0, 1);
font-size: 12px;
position: absolute;
z-index: 1;
pointer-events: none;
padding: 6px 8px;
border-radius: 4px;
line-height: 12px;
}
} }
} }
.billboard-object.dialog-en { .billboard-object.dialog-en {
::v-deep >.content { ::v-deep>.content {
width: 690px; width: 690px;
.title1 { .title1 {
width: 40%; width: 40%;
} }
.title2 { .title2 {
width: 60%; width: 60%;
} }
.attribute-content-link .table .tr .th:nth-child(2), .attribute-content-link .table .tr .th:nth-child(2),
.attribute-content-link .table .tr .td:nth-child(2), .attribute-content-link .table .tr .td:nth-child(2),
.attribute-content-vr .table .tr .th:nth-child(2), .attribute-content-vr .table .tr .th:nth-child(2),
@ -727,6 +839,7 @@ defineExpose({
flex: 0 0 56px; flex: 0 0 56px;
white-space: nowrap; white-space: nowrap;
} }
.billboard-object.dialog-en>.content>div .div-item:nth-of-type(2) .row .label { .billboard-object.dialog-en>.content>div .div-item:nth-of-type(2) .row .label {
flex: 0 0 65px; flex: 0 0 65px;
} }

67
src/renderer/src/views/components/propertyBox/defaultStyle/index.vue Normal file
View File

@ -0,0 +1,67 @@
<template>
<div class="row">
<div class="col">
<span class="lable-left-line">新增{{ props.type }}风格设置</span>
<div style="display: flex;align-items: center;margin-right: 30px;">
<button style="margin-right: 10px;" @click="setInitialStyle">初始风格</button>
<el-tooltip
effect="customized" :hide-after="0" placement="top">
<template #content>初始系统默认的{{props.type}}风格<br />点击“初始风格”按钮，将{{props.type}}系统初始风格设置为新增{{props.type}}风格</template>
<svg class="icon-prompt">
<use xlink:href="#icon-prompt"></use>
</svg>
</el-tooltip>
</div>
<div style="display: flex;align-items: center;">
<button style="margin-right: 10px;">当前风格</button>
<el-tooltip
effect="customized" :hide-after="0" placement="top">
<template #content>当前面板设置的{{props.type}}风格<br />点击“当前风格”按钮，将{{props.type}}当前面板风格设置为新增{{props.type}}风格</template>
<svg class="icon-prompt">
<use xlink:href="#icon-prompt"></use>
</svg>
</el-tooltip>
</div>
</div>
</div>
</template>
<script setup lang="ts">
import { getdefaultStyle } from './style'
const props = defineProps({
type: {
type: String,
default: ''
},
sourceType: {
type: String,
default: ''
},
entityOptions: {
type: Object,
default: {}
}
})
const setInitialStyle = () => {
let style = getdefaultStyle(props.sourceType)
let defaultStyle = JSON.parse(localStorage.getItem('defaultStyle') || '{}')
defaultStyle[props.sourceType] = style
localStorage.setItem('defaultStyle', JSON.stringify(defaultStyle))
}
</script>
<style scoped>
.lable-left-line {
margin-right: 10px;
}
.icon-prompt {
fill: rgba(241, 108, 85, 1) !important;
width: 16px;
height: 16px;
margin: 0;
}
</style>

36
src/renderer/src/views/components/propertyBox/defaultStyle/style.ts Normal file
View File

@ -0,0 +1,36 @@
const { ipcRenderer } = require('electron')
let availablePort = 55110
ipcRenderer.invoke('get-available-port').then((port) => {
availablePort = port
})
export const getdefaultStyle = (type) => {
switch (type) {
case 'point':
return {
billboard: {
show: true,
image: "http://localhost:" +
availablePort +
"/" +
"GEMarker1/A-ablu-blank.png",
scale: 3,
},
label: {
show: true,
fontSize: 39,
color: 'rgba(0, 255, 255, 1)',
fontFamily: 'Helvetica',
}
}
case 'line':
return {
color: 'rgba(241, 108, 85, 1)',
fontSize: 12,
fontName: '微软雅黑',
fontWeight: '400',
fontStyle: 'normal',
textDecoration: 'none',
background: 'rgba(0, 0, 0, 0.5)',
}
}
}

8
src/renderer/src/views/components/propertyBox/labelStyle.vue
View File

@ -1,13 +1,5 @@
<template> <template>
<div> <div>
<div class="row">
<div class="col">
<span class="label">新增{{ type }}标签风格设置</span>
<button style="margin-right: 56px">初始风格</button>
<button>当前风格</button>
</div>
</div>
<span class="custom-divider"></span>
<div class="row"></div> <div class="row"></div>
<div class="row"> <div class="row">
<div class="col"> <div class="col">

1
src/renderer/src/views/components/tree/hooks/treeNode.ts
View File

@ -455,7 +455,6 @@ export const useTreeNode = () => {
else { else {
type = node.sourceType || node.type; type = node.sourceType || node.type;
} }
console.log("----------", type);
let name = [ let name = [
"gdslImagery", "gdslImagery",
"gdlwImagery", "gdlwImagery",

10
src/renderer/src/views/home/index.vue
View File

@ -173,7 +173,7 @@ eventBus.on('openDialog', async (sourceType: any, id: any) => {
case 'vrImage': case 'vrImage':
currentComponent.value = billboardObject currentComponent.value = billboardObject
await nextTick() await nextTick()
dynamicComponentRef.value?.open(id) dynamicComponentRef.value?.open(id, sourceType)
break break
case 'line': case 'line':
currentComponent.value = polylineObject currentComponent.value = polylineObject
@ -636,7 +636,7 @@ onMounted(async () => {
// function highlightSheetIndex(sdk, object) { // function highlightSheetIndex(sdk, object) {
// let viewer = sdk.viewer; // let viewer = sdk.viewer;
// let height = 8848 // let height = 8849
// let positions = [ // let positions = [
// Cesium.Cartesian3.fromDegrees(object.longitude[0], object.latitude[0], height), // Cesium.Cartesian3.fromDegrees(object.longitude[0], object.latitude[0], height),
// Cesium.Cartesian3.fromDegrees(object.longitude[1], object.latitude[0], height), // Cesium.Cartesian3.fromDegrees(object.longitude[1], object.latitude[0], height),
@ -648,15 +648,15 @@ onMounted(async () => {
// gridPrimitives.name = 'highlightSheetIndexGridPrimitives'; // gridPrimitives.name = 'highlightSheetIndexGridPrimitives';
// viewer.scene.primitives.add(gridPrimitives); // viewer.scene.primitives.add(gridPrimitives);
// const geometryInstances = new Cesium.GeometryInstance({ // const geometryInstances = new Cesium.GeometryInstance({
// geometry: new Cesium.GroundPolylineGeometry({ // geometry: new Cesium.PolylineGeometry({
// positions: positions, // positions: positions,
// width: 1, // width: 5,
// vertexFormat: Cesium.PerInstanceColorAppearance.VERTEX_FORMAT, // vertexFormat: Cesium.PerInstanceColorAppearance.VERTEX_FORMAT,
// arcType: Cesium.ArcType.RHUMB, // arcType: Cesium.ArcType.RHUMB,
// }) // })
// }); // });
// gridPrimitives.add(new Cesium.GroundPolylinePrimitive({ // gridPrimitives.add(new Cesium.Primitive({
// geometryInstances: geometryInstances, // geometryInstances: geometryInstances,
// appearance: new Cesium.PolylineMaterialAppearance({ // appearance: new Cesium.PolylineMaterialAppearance({
// material: Cesium.Material.fromType('Color', { // material: Cesium.Material.fromType('Color', {