diff --git a/src/renderer/src/I18n/zh-CN.ts b/src/renderer/src/I18n/zh-CN.ts index a0d24ae..ce8b8e0 100644 --- a/src/renderer/src/I18n/zh-CN.ts +++ b/src/renderer/src/I18n/zh-CN.ts @@ -9,7 +9,8 @@ export default { }, btn: { search: '搜索', - treePlaceholder: '关键词搜索', + treePlaceholder: '请输入所需查找的地点', + treeLayerholder: '请输入图层名称', selectPlaceholder: '请选择', selectNoText: '无数据', confirm: '确定' diff --git a/src/renderer/src/icons/svg/weather.svg b/src/renderer/src/icons/svg/weather.svg index 98103e7..c95a14d 100644 --- a/src/renderer/src/icons/svg/weather.svg +++ b/src/renderer/src/icons/svg/weather.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/renderer/src/icons/svg/weatherBase.svg b/src/renderer/src/icons/svg/weatherBase.svg new file mode 100644 index 0000000..3b1fab3 --- /dev/null +++ b/src/renderer/src/icons/svg/weatherBase.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/renderer/src/views/components/headers/components/setPup/components/engineering.vue b/src/renderer/src/views/components/headers/components/setPup/components/engineering.vue index dcdb9c9..72ce57d 100644 --- a/src/renderer/src/views/components/headers/components/setPup/components/engineering.vue +++ b/src/renderer/src/views/components/headers/components/setPup/components/engineering.vue @@ -240,11 +240,29 @@ const poiImport = () => { path: path[0] }).then((res) => { if (res.code === 200) { - ElMessage({ - message: '上传成功', - type: 'success' + PoiApi.getPoiList().then((list) => { + poiList.splice(0, poiList.length, ...list.data) + //只有一个poi时默认启用 + if (poiList.length == 1) { + + let formData = new FormData() + formData.append('id', poiList[0].id) + PoiApi.enablePoi(formData).then((res) => { + if (res.code === 200) { + ElMessage({ + message: '上传并启用成功', + type: 'success' + }) + getPoiList() + } + }) + } else { + ElMessage({ + message: '上传成功', + type: 'success' + }) + } }) - getPoiList() } }) } 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 222229d..be2698c 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 @@ -8,7 +8,7 @@
- {{ t('systemSetting.setLanguage') }}： + {{ t('systemSetting.setLanguage') }}
- {{ t('systemSetting.theme') }}： + {{ t('systemSetting.theme') }}
- {{ t('systemSetting.coordinateSystem') }}： + {{ t('systemSetting.coordinateSystem') }} - +
{{ date.hms }} @@ -12,7 +17,12 @@ {{ t(`week.4`) }}
- +
@@ -53,8 +63,7 @@ const headImg = computed(() => { } }) - -const skinInfo = ref(JSON.parse(localStorage.getItem("systemSetting") || '{}').skinInfo || 'color1') +const skinInfo = ref(JSON.parse(localStorage.getItem('systemSetting') || '{}').skinInfo || 'color1') const { t } = useI18n() const date = ref({ @@ -62,26 +71,25 @@ const date = ref({ hms: '', week: 0 }) -window.addEventListener("setItemEvent", (e: any) => { +window.addEventListener('setItemEvent', (e: any) => { console.log('e', e) - if (e.key == "systemSetting") { - let obj = JSON.parse(e.newValue); - skinInfo.value = obj.skinInfo; + if (e.key == 'systemSetting') { + let obj = JSON.parse(e.newValue) + skinInfo.value = obj.skinInfo let setting = JSON.parse(e.newValue) let dialogElm: any = document.getElementsByClassName('YJ-custom-base-dialog') if (setting.language === 'zh-EN') { for (let i = 0; i < dialogElm.length; i++) { - dialogElm[i].classList.add('dialog-en'); + dialogElm[i].classList.add('dialog-en') } - } - else { + } else { for (let i = 0; i < dialogElm.length; i++) { - dialogElm[i].classList.remove('dialog-en'); + dialogElm[i].classList.remove('dialog-en') } } } -}); +}) var weatherClick = ref(false) const setTime = () => { let date1 = new Date() @@ -132,7 +140,7 @@ var clickFun = () => { z-index: 999; pointer-events: none; - >* { + > * { pointer-events: all; } @@ -177,7 +185,7 @@ var clickFun = () => { align-items: center; font-family: 'alimamashuheiti'; - &>span:first-child { + & > span:first-child { letter-spacing: 1px; font-size: 2rem; font-family: 'alimamashuheiti'; @@ -189,20 +197,23 @@ var clickFun = () => { display: flex; flex-direction: column; - &>span:first-child { + & > span:first-child { font-size: 0.9rem; } - &>span:last-child { + & > span:last-child { font-size: 0.8rem; } } .weather { margin-left: 15px; + .weatherIcon { + fill: rgba(var(--color-base1), 1) !important; + } svg { - fill: rgba(var(--color-base1), 1) !important; + // fill: rgba(var(--color-base1), 1) !important; cursor: pointer; } } diff --git a/src/renderer/src/views/components/tree/index.vue b/src/renderer/src/views/components/tree/index.vue index c8989be..9cae530 100644 --- a/src/renderer/src/views/components/tree/index.vue +++ b/src/renderer/src/views/components/tree/index.vue @@ -186,7 +186,7 @@ style="width: 50px" id="keyword" type="text" - :placeholder="t('btn.treePlaceholder')" + :placeholder="select == 'poi' ? t('btn.treePlaceholder') : t('btn.treeLayerholder')" @input="clearResult" @change="searchPlace" />