diff --git a/src/renderer/src/I18n/zh-CN.ts b/src/renderer/src/I18n/zh-CN.ts index ed51521..f437ee9 100644 --- a/src/renderer/src/I18n/zh-CN.ts +++ b/src/renderer/src/I18n/zh-CN.ts @@ -152,14 +152,14 @@ export default { }, system: { systemTitle: '系统面板', - authorize: '授权信息', - setting: '系统设置', + authorize: '授权管理', + setting: '系统管理', project: '工程管理', device: '设备管理', materials: '物资管理', modelManage: '模型管理', - graphLabelManage: '军标管理', photoManage: '图标管理', + graphLabelManage: '军标管理', version: '版本信息' }, auths: { diff --git a/src/renderer/src/icons/svg/close.svg b/src/renderer/src/icons/svg/close.svg new file mode 100644 index 0000000..d2316ca --- /dev/null +++ b/src/renderer/src/icons/svg/close.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/renderer/src/icons/svg/crossPoint.svg b/src/renderer/src/icons/svg/crossPoint.svg new file mode 100644 index 0000000..faed398 --- /dev/null +++ b/src/renderer/src/icons/svg/crossPoint.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/renderer/src/icons/svg/posiFly.svg b/src/renderer/src/icons/svg/posiFly.svg new file mode 100644 index 0000000..5011eaf --- /dev/null +++ b/src/renderer/src/icons/svg/posiFly.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/renderer/src/views/components/headers/components/setPup/components/setting.vue b/src/renderer/src/views/components/headers/components/setPup/components/setting.vue index be2698c..acdbe89 100644 --- a/src/renderer/src/views/components/headers/components/setPup/components/setting.vue +++ b/src/renderer/src/views/components/headers/components/setPup/components/setting.vue @@ -20,7 +20,7 @@ -
+
{{ t('systemSetting.theme') }}
地理坐标系 @@ -74,14 +80,26 @@ v-if="isHotGroupOpen" name="arrow2" :size="10" - color="rgba(0, 255, 255, 1)" + :color=" + name_map1.filter((item) => { + return item.epsg == systemSetting.coordinate + }).length > 0 + ? 'rgba(0, 255, 255, 1)' + : 'rgba(255, 255, 255, 1)' + " style="margin-left: 10px" >
@@ -95,7 +113,13 @@
投影坐标系 @@ -103,14 +127,26 @@ v-if="isHotGroupOpen2" name="arrow2" :size="10" - color="rgba(0, 255, 255, 1)" + :color=" + name_map2.filter((item) => { + return item.epsg == systemSetting.coordinate + }).length > 0 + ? 'rgba(0, 255, 255, 1)' + : 'rgba(255, 255, 255, 1)' + " style="margin-left: 10px" >
@@ -124,7 +160,7 @@ -
+
{{ t('systemSetting.latitude') }}
-
+
{{ t('systemSetting.areaUnit') }}
-
+
{{ t('systemSetting.speedUnit') }}
-
+
{{ t('ConcurrencyControl') }} { } } .seting_content { - width: 100%; - padding: 15px 0 0 22px; + width: calc(100% - 22px); + margin: 15px 0 0 22px; display: grid; grid-template-columns: repeat(3, 1fr); + display: flex; + justify-content: space-between; + .detailSkin { - width: 100%; + width: 50%; display: flex; - align-items: center; + align-items: left; box-sizing: border-box; + flex-direction: row; padding-bottom: 15px; > span { font-size: 0.9rem; color: #c8cfcf; display: block; - width: 86px; + // width: 86px; text-align: right; } } @@ -725,10 +765,12 @@ onMounted(() => { .seting_content1 { width: 100%; padding: 15px 0 0 22px; - display: grid; grid-template-columns: repeat(3, 1fr); + display: flex; + justify-content: space-between; + flex-wrap: wrap; .detailSkin1 { - width: 100%; + width: 50%; display: flex; align-items: center; box-sizing: border-box; @@ -737,7 +779,7 @@ onMounted(() => { font-size: 0.9rem; color: #c8cfcf; display: inline-block; - width: 86px; + // width: 86px; text-align: right; } } @@ -760,7 +802,7 @@ onMounted(() => { font-size: 0.9rem; color: #c8cfcf; display: inline-block; - width: 86px; + // width: 86px; text-align: right; } } @@ -792,5 +834,6 @@ onMounted(() => { } .titleLabel { margin-right: 10px; + text-align: left !important; } diff --git a/src/renderer/src/views/components/headers/components/setPup/setPup.vue b/src/renderer/src/views/components/headers/components/setPup/setPup.vue index 167be4a..484fd2f 100644 --- a/src/renderer/src/views/components/headers/components/setPup/setPup.vue +++ b/src/renderer/src/views/components/headers/components/setPup/setPup.vue @@ -105,12 +105,12 @@ - - - + + +