From 480d4636cb2e5fb99d8e3308e05a21dce6f62585 Mon Sep 17 00:00:00 2001 From: zh <972939975@qq.com> Date: Fri, 14 Nov 2025 18:10:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9el-tooltip=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/components.d.ts | 27 ++ src/renderer/public/sdk/custom/css/index.css | 369 +++++++----------- src/renderer/src/I18n/zh-CN.ts | 33 +- src/renderer/src/I18n/zh-EN.ts | 32 +- src/renderer/src/I18n/zh-TW.ts | 33 +- src/renderer/src/assets/styles/global.css | 51 +-- .../src/components/Pagination/index.vue | 3 +- src/renderer/src/icons/svg/prompt.svg | 1 + src/renderer/src/icons/svg/text-bold.svg | 1 + src/renderer/src/icons/svg/text-italic.svg | 1 + .../src/icons/svg/text-line-bottom.svg | 1 + .../src/icons/svg/text-line-through.svg | 1 + .../components/propertyBox/CoorLocation.vue | 2 +- .../components/propertyBox/addGroundText.vue | 16 +- .../components/propertyBox/addStandText.vue | 16 +- .../propertyBox/billboardObject.vue | 255 ++++++++---- .../propertyBox/defaultStyle/index.vue | 67 ++++ .../propertyBox/defaultStyle/style.ts | 36 ++ .../components/propertyBox/labelStyle.vue | 8 - .../views/components/tree/hooks/treeNode.ts | 1 - src/renderer/src/views/home/index.vue | 10 +- 21 files changed, 576 insertions(+), 388 deletions(-) create mode 100644 src/renderer/src/icons/svg/prompt.svg create mode 100644 src/renderer/src/icons/svg/text-bold.svg create mode 100644 src/renderer/src/icons/svg/text-italic.svg create mode 100644 src/renderer/src/icons/svg/text-line-bottom.svg create mode 100644 src/renderer/src/icons/svg/text-line-through.svg create mode 100644 src/renderer/src/views/components/propertyBox/defaultStyle/index.vue create mode 100644 src/renderer/src/views/components/propertyBox/defaultStyle/style.ts diff --git a/src/renderer/components.d.ts b/src/renderer/components.d.ts index 5f5348d..de57ab9 100644 --- a/src/renderer/components.d.ts +++ b/src/renderer/components.d.ts @@ -11,6 +11,33 @@ declare module 'vue' { BaseDialog: typeof import('./src/components/dialog/baseDialog.vue')['default'] Directory: typeof import('./src/components/dialog/directory.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'] Pagination: typeof import('./src/components/Pagination/index.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] diff --git a/src/renderer/public/sdk/custom/css/index.css b/src/renderer/public/sdk/custom/css/index.css index fe9901d..bb1b514 100644 --- a/src/renderer/public/sdk/custom/css/index.css +++ b/src/renderer/public/sdk/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,8 +158,8 @@ 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: center; align-items: center; @@ -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; @@ -455,14 +455,14 @@ 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; } @@ -543,19 +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 .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; @@ -584,71 +584,6 @@ 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 { color: #000; } @@ -658,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"] { @@ -675,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 { @@ -689,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; } @@ -723,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; } @@ -766,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; } @@ -882,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; } @@ -901,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 { @@ -1031,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; @@ -1058,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; } @@ -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.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, @@ -1411,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 { @@ -1440,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 { @@ -1481,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); } /* 开关按钮样式 */ @@ -1496,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; @@ -1521,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, @@ -1675,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 { @@ -1693,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 { @@ -1711,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; @@ -1735,61 +1680,6 @@ 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 { position: absolute; @@ -1911,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; } @@ -1998,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; } @@ -2008,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; @@ -2224,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 { @@ -2300,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); @@ -2322,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 { @@ -2368,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 { @@ -2387,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 { @@ -2396,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; } /* 通视分析 */ @@ -2442,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) } /* 地形可视域分析 */ @@ -2673,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; @@ -2899,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 { @@ -3026,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 { @@ -3078,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 @@ -3107,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; } @@ -3182,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; } /* 贴地图片 */ @@ -3261,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)); } /* 高清截图 */ @@ -3294,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; } @@ -3303,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 { @@ -3338,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%; @@ -3359,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 { @@ -3400,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 { @@ -3419,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 { @@ -3428,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; } /* 地图打印 */ @@ -3546,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); @@ -3566,8 +3461,8 @@ .YJ-custom-checkbox-left:checked::after, .YJ-custom-checkbox-right:checked::after { - content: "✔"; - background-color: rgba(var(--color-sdk-base-rgb), 1); + content: "\2714"; + background-color: rgba(var(--color-base1), 1); color: rgba(var(--color-sdk-auxiliary), 1); width: 25px; height: 25px; @@ -3582,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); @@ -3601,8 +3496,8 @@ } .YJ-custom-base-dialog>.content input.YJ-custom-checkbox[type=checkbox]:checked::after { - content: "✔"; - background-color: rgba(var(--color-sdk-base-rgb), 1); + content: "\2714"; + background-color: rgba(var(--color-base1), 1); color: rgba(var(--color-sdk-auxiliary), 1); width: 12px; height: 12px; @@ -3696,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 { @@ -3717,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; @@ -3766,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 { @@ -3777,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; } @@ -3831,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%); diff --git a/src/renderer/src/I18n/zh-CN.ts b/src/renderer/src/I18n/zh-CN.ts index c3930b3..ed51521 100644 --- a/src/renderer/src/I18n/zh-CN.ts +++ b/src/renderer/src/I18n/zh-CN.ts @@ -295,20 +295,28 @@ export default { 旋转: '旋转', 关闭: '关闭', 确定: '确定', - 图标设置: '图标设置', 显隐: '显隐', 图标: '图标', - 默认图标: '默认图标', - 图标倍数: '图标倍数', - 倍: '倍', - 文字设置: '文字设置', - 字体选择: '字体选择', - 文字大小: '文字大小', - 文字颜色: '文字颜色', + times: '倍', 黑体: '黑体', 思源黑体: '思源黑体', 庞门正道标题体: '庞门正道标题体', 数黑体: '数黑体', + text: { + color: '字体颜色', + size: '字体大小', + font: '字体类型', + style: '字体样式', + bold: '加粗', + italic: '斜体', + underline: '下划线', + strikethrough: '删除线', + letterSpacing: '字体间距', + }, + outline: { + color: '轮廓颜色', + width: '轮廓宽度', + } }, dialog: { point: { @@ -318,6 +326,15 @@ export default { XAxis: 'X轴', YAxis: 'Y轴', ZAxis: 'Z轴', + icon: { + show: '图标显示', + current: '当前图标', + multiple: '图标倍数', + default: '默认图标', + }, + text: { + show: '文字显示', + }, }, } } as const diff --git a/src/renderer/src/I18n/zh-EN.ts b/src/renderer/src/I18n/zh-EN.ts index 93bfdbb..c0905a4 100644 --- a/src/renderer/src/I18n/zh-EN.ts +++ b/src/renderer/src/I18n/zh-EN.ts @@ -297,17 +297,26 @@ export default { 图标设置: 'Icon settings', 显隐: 'show', 图标: 'Icon', - 默认图标: 'Default icon', - 图标倍数: 'Icon scale', - 倍: 'times', - 文字设置: 'text settings', - 字体选择: 'Font', - 文字大小: 'Text size', - 文字颜色: 'Text color', + times: 'times', 黑体: 'SimHei', 思源黑体: 'SourceHanSansTi', 庞门正道标题体: 'PMZDBTTi', 数黑体: '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: { point: { @@ -317,6 +326,15 @@ export default { XAxis: 'X-axis', YAxis: 'Y-axis', ZAxis: 'Z-axis', + icon: { + show: 'Icon show', + current: 'Current icon', + multiple: 'Icon scale', + default: 'Default icon', + }, + text: { + show: 'Text show', + }, }, } } as const diff --git a/src/renderer/src/I18n/zh-TW.ts b/src/renderer/src/I18n/zh-TW.ts index 7e67ee3..ec8f8f7 100644 --- a/src/renderer/src/I18n/zh-TW.ts +++ b/src/renderer/src/I18n/zh-TW.ts @@ -293,20 +293,28 @@ export default { 旋转: '旋轉', 关闭: '關閉', 确定: '確定', - 图标设置: '圖標設置', 显隐: '顯隱', 图标: '圖標', - 默认图标: '默認圖標', - 图标倍数: '圖標倍數', - 倍: '倍', - 文字设置: '文字設置', - 字体选择: '字體選擇', - 文字大小: '文字大小', - 文字颜色: '文字顔色', + times: '倍', 黑体: '黑體', 思源黑体: '思源黑體', 庞门正道标题体: '龐門正道標題體', 数黑体: '數黑體', + text: { + color: '字體顔色', + size: '字體大小', + font: '字體類型', + style: '字體樣式', + bold: '加粗', + italic: '斜體', + underline: '下劃線', + strikethrough: '刪除線', + letterSpacing: '字體間距', + }, + outline: { + color: '輪廓顔色', + width: '輪廓寬度', + } }, dialog: { point: { @@ -316,6 +324,15 @@ export default { XAxis: 'X軸', YAxis: 'Y軸', ZAxis: 'Z軸', + icon: { + show: '圖標顯示', + current: '當前圖標', + multiple: '圖標倍數', + default: '默認圖標', + }, + text: { + show: '文字顯示', + }, }, } } as const diff --git a/src/renderer/src/assets/styles/global.css b/src/renderer/src/assets/styles/global.css index b5dfd2a..08c9fc9 100644 --- a/src/renderer/src/assets/styles/global.css +++ b/src/renderer/src/assets/styles/global.css @@ -515,51 +515,32 @@ img { } .el-popper.is-customized { - padding: 2px 6px; - background: rgba(0, 0, 0, 0.6); + padding: 6px 8px; + background: linear-gradient(rgba(var(--color-base1), 0.5), rgba(var(--color-base1), 0.5)), rgba(0, 0, 0, 1); pointer-events: none; + line-height: 14px; } -.el-popper.is-customized::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; +.el-popper.is-customized[data-popper-placement="bottom"] .el-popper__arrow::before { margin: 0; right: 0; - width: 0; - 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: " "; + width: 10px; height: 10px; - position: absolute; - transform: rotate(45deg); - z-index: -2; - background: #ff000000; + background: linear-gradient(rgba(var(--color-base1), 0.5), rgba(var(--color-base1), 0.5)), rgba(0, 0, 0, 1) !important; + clip-path: polygon(0 0, 0 100%, 100% 0) !important; +} + +.el-popper.is-customized[data-popper-placement="top"] .el-popper__arrow::before { margin: 0; right: 0; - width: 0; - height: 0; - border: 5px solid rgba(0, 0, 0, 0.6); - border-bottom-color: transparent !important; - border-right-color: transparent !important; + width: 10px; + height: 10px; + background: linear-gradient(rgba(var(--color-base1), 0.5), rgba(var(--color-base1), 0.5)), rgba(0, 0, 0, 1) !important; + clip-path: polygon(0 0, 0 100%, 100% 0) !important; + transform: rotate(-135deg); } + #app { .distance-legend { background-color: rgba(0, 0, 0, 0); diff --git a/src/renderer/src/components/Pagination/index.vue b/src/renderer/src/components/Pagination/index.vue index c426b7a..0e32a65 100644 --- a/src/renderer/src/components/Pagination/index.vue +++ b/src/renderer/src/components/Pagination/index.vue @@ -101,8 +101,9 @@ const handleCurrentChange = (val) => { ::v-deep .el-pagination__jump { .el-input__wrapper { padding: 0; - box-shadow: none; + box-shadow: none !important; background: none; + border: none !important } } ::v-deep .el-pagination__sizes { diff --git a/src/renderer/src/icons/svg/prompt.svg b/src/renderer/src/icons/svg/prompt.svg new file mode 100644 index 0000000..1ec5971 --- /dev/null +++ b/src/renderer/src/icons/svg/prompt.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/renderer/src/icons/svg/text-bold.svg b/src/renderer/src/icons/svg/text-bold.svg new file mode 100644 index 0000000..87c564a --- /dev/null +++ b/src/renderer/src/icons/svg/text-bold.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/renderer/src/icons/svg/text-italic.svg b/src/renderer/src/icons/svg/text-italic.svg new file mode 100644 index 0000000..be65ba5 --- /dev/null +++ b/src/renderer/src/icons/svg/text-italic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/renderer/src/icons/svg/text-line-bottom.svg b/src/renderer/src/icons/svg/text-line-bottom.svg new file mode 100644 index 0000000..ab119e3 --- /dev/null +++ b/src/renderer/src/icons/svg/text-line-bottom.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/renderer/src/icons/svg/text-line-through.svg b/src/renderer/src/icons/svg/text-line-through.svg new file mode 100644 index 0000000..a5e003b --- /dev/null +++ b/src/renderer/src/icons/svg/text-line-through.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/renderer/src/views/components/propertyBox/CoorLocation.vue b/src/renderer/src/views/components/propertyBox/CoorLocation.vue index b3f4ee9..81050d0 100644 --- a/src/renderer/src/views/components/propertyBox/CoorLocation.vue +++ b/src/renderer/src/views/components/propertyBox/CoorLocation.vue @@ -474,7 +474,7 @@ const flyto = async (e) => { await initMapData('point', params, null) } -var pointPosi = {} +var pointPosi:any = {} const draw = async (e) => { if (!pointPosi.lng) { await getPosition() diff --git a/src/renderer/src/views/components/propertyBox/addGroundText.vue b/src/renderer/src/views/components/propertyBox/addGroundText.vue index 01af335..2f500dc 100644 --- a/src/renderer/src/views/components/propertyBox/addGroundText.vue +++ b/src/renderer/src/views/components/propertyBox/addGroundText.vue @@ -1,7 +1,7 @@