天气

src/renderer/src/I18n/zh-CN.ts

@@ -9,7 +9,8 @@ export default {
   },
   btn: {
     search: '搜索',
-    treePlaceholder: '关键词搜索',
+    treePlaceholder: '请输入所需查找的地点',
+    treeLayerholder: '请输入图层名称',
     selectPlaceholder: '请选择',
     selectNoText: '无数据',
     confirm: '确定'

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) {
+          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()
+            }
+          })
         }
       })
     }

src/renderer/src/views/components/headers/components/setPup/components/setting.vue

@@ -8,7 +8,7 @@
       <div class="seting_content">
         <!-- 语言设置 -->
         <div class="detailSkin">
-          <span>{{ t('systemSetting.setLanguage') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.setLanguage') }}</span>
           <el-select
             style="width: 175px"
             v-model="systemSetting.language"
@@ -22,7 +22,7 @@
         <!-- 主题色 -->
         <div class="detailSkin"></div>
         <div class="detailSkin">
-          <span>{{ t('systemSetting.theme') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.theme') }}</span>
           <el-select
             style="width: 175px"
             v-model="systemSetting.skinInfo"
@@ -48,7 +48,7 @@
       <div class="seting_content">
         <!-- 坐标系 -->
         <div class="detailSkin">
-          <span>{{ t('systemSetting.coordinateSystem') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.coordinateSystem') }}</span>
           <!-- <el-select
             style="width: 175px"
             v-model="systemSetting.coordinate"
@@ -126,7 +126,7 @@
         </div>
         <div class="detailSkin"></div>
         <div class="detailSkin" v-show="showPosiType">
-          <span>{{ t('systemSetting.latitude') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.latitude') }}</span>
           <el-select
             style="width: 175px"
             v-model="systemSetting.positionType"
@@ -151,7 +151,7 @@
       </div>
       <div class="seting_content1">
         <div class="detailSkin1">
-          <span>{{ t('systemSetting.lengthUnit') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.lengthUnit') }}</span>
           <el-select
             style="width: 175px"
             v-model="systemSetting.coordinate"
@@ -169,7 +169,7 @@
         </div>
         <div class="detailSkin1"></div>
         <div class="detailSkin1">
-          <span>{{ t('systemSetting.areaUnit') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.areaUnit') }}</span>
           <el-select
             style="width: 175px"
             v-model="systemSetting.coordinate"
@@ -186,7 +186,7 @@
           </el-select>
         </div>
         <div class="detailSkin1">
-          <span>{{ t('systemSetting.heightUnit') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.heightUnit') }}</span>
           <el-select
             style="width: 175px"
             v-model="systemSetting.coordinate"
@@ -204,7 +204,7 @@
         </div>
         <div class="detailSkin1"></div>
         <div class="detailSkin1">
-          <span>{{ t('systemSetting.speedUnit') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.speedUnit') }}</span>
           <el-select
             style="width: 175px"
             v-model="systemSetting.coordinate"
@@ -229,21 +229,21 @@
       </div>
       <div class="seting_switch">
         <div class="detailSkin2">
-          <span>{{ t('systemSetting.defaultViewLabel') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.defaultViewLabel') }}</span>
           <el-button @click="setView"
             ><svg-icon name="sitting" :size="12" style="margin-right: 5px"></svg-icon>
             {{ t('systemSetting.defaultView') }}</el-button
           >
         </div>
         <div class="detailSkin2">
-          <span>{{ t('systemSetting.defaultDataLabel') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.defaultDataLabel') }}</span>
           <el-button color="#005c5c" @click="setData"
             ><svg-icon name="add" :size="12" style="margin-right: 5px"></svg-icon
             >{{ t('systemSetting.defaultData') }}</el-button
           >
         </div>
         <div class="detailSkin2">
-          <span>{{ t('systemSetting.management') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.management') }}</span>
           <el-button color="#005c5c" @click="intoBack"
             ><svg-icon name="out_login" :size="12" style="margin-right: 5px"></svg-icon
             >{{ t('systemSetting.intoBack') }}</el-button
@@ -252,7 +252,7 @@
       </div>
       <div class="seting_content1">
         <div class="detailSkin1">
-          <span>{{ t('searchWay.title') }}：</span>
+          <span class="titleLabel">{{ t('searchWay.title') }}</span>
           <el-select
             style="width: 150px"
             v-model="searchWay"
@@ -270,7 +270,7 @@
         </div>
         <div class="detailSkin1"></div>
         <div class="detailSkin1">
-          <span>{{ t('ConcurrencyControl') }}：</span>
+          <span class="titleLabel">{{ t('ConcurrencyControl') }}</span>
           <el-select
             style="width: 150px"
             v-model="concurrentcode"
@@ -289,7 +289,7 @@
       </div>
       <div class="seting_switch">
         <div class="detailSkin2">
-          <span>{{ t('systemSetting.showCompass') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.showCompass') }}</span>
           <el-switch
             @change="sysChange"
             v-model="systemSetting.showCompass"
@@ -301,7 +301,7 @@
           </el-switch>
         </div>
         <div class="detailSkin2">
-          <span>{{ t('systemSetting.showToolBar') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.showToolBar') }}</span>
           <el-switch
             @change="sysChange"
             v-model="systemSetting.showToolBar"
@@ -313,7 +313,7 @@
           </el-switch>
         </div>
         <div class="detailSkin2">
-          <span>{{ t('systemSetting.showDistanceLegend') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.showDistanceLegend') }}</span>
           <el-switch
             @change="sysChange"
             v-model="systemSetting.showDistanceLegend"
@@ -325,7 +325,7 @@
           </el-switch>
         </div>
         <div class="detailSkin2">
-          <span>{{ t('systemSetting.showMapX') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.showMapX') }}</span>
 
           <el-switch
             @change="sysChange"
@@ -339,7 +339,7 @@
         </div>
 
         <div class="detailSkin2">
-          <span>{{ t('systemSetting.showFPS') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.showFPS') }}</span>
 
           <el-switch
             @change="sysChange"
@@ -353,7 +353,7 @@
         </div>
 
         <div class="detailSkin2">
-          <span>{{ t('systemSetting.administrativeArea') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.administrativeArea') }}</span>
 
           <el-switch
             @change="sysChange"
@@ -367,7 +367,7 @@
         </div>
 
         <div class="detailSkin2">
-          <span>{{ t('systemSetting.showLatitudeLongitudeNetwork') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.showLatitudeLongitudeNetwork') }}</span>
 
           <el-switch
             @change="sysChange"
@@ -380,7 +380,7 @@
           </el-switch>
         </div>
         <div class="detailSkin2">
-          <span>{{ t('systemSetting.showFangliNet') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.showFangliNet') }}</span>
 
           <el-switch
             @change="sysChange"
@@ -393,7 +393,7 @@
           </el-switch>
         </div>
         <div class="detailSkin2">
-          <span>{{ t('systemSetting.sheetIndexStatusSwitch') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.sheetIndexStatusSwitch') }}</span>
 
           <el-switch
             @change="sysChange"
@@ -407,7 +407,7 @@
         </div>
 
         <div class="detailSkin2">
-          <span>{{ t('systemSetting.occlusion') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.occlusion') }}</span>
 
           <el-switch
             @change="sysChange"
@@ -421,7 +421,7 @@
         </div>
 
         <div v-if="false" class="detailSkin2">
-          <span>{{ t('systemSetting.battery') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.battery') }}</span>
           <el-switch
             @change="batteryChange"
             v-model="showBattery"
@@ -790,4 +790,7 @@ onMounted(() => {
 .arrowActive {
   color: rgba(var(--color-base1), 1);
 }
+.titleLabel {
+  margin-right: 10px;
+}
 </style>

src/renderer/src/views/components/headers/components/weather/index.vue

@@ -515,7 +515,7 @@ var shadowChange = () => {
       margin-top: 4px;
       font-size: 12px !important;
       font-weight: 400 !important;
-      line-height: 24px !important;
+      line-height: 20px !important;
       cursor: pointer;
     }
 
@@ -597,4 +597,13 @@ var shadowChange = () => {
     }
   }
 }
+/* 隐藏Webkit内核浏览器中的上下箭头及白色背景 */
+.input ::v-deep(input::-webkit-outer-spin-button),
+.input ::v-deep(input::-webkit-inner-spin-button) {
+  -webkit-appearance: none !important;
+  appearance: none !important;
+  margin: 0;
+  background: none; /* 移除白色背景 */
+  display: none; /* 彻底隐藏元素 */
+}
 </style>

src/renderer/src/views/components/headers/index.vue

@@ -3,7 +3,12 @@
     <div class="head_box">
       <!-- <span class="head_title">实景三维电子沙盘系统</span> -->
       <!-- <headSvg style="width: 100%;height: 100%;"></headSvg> -->
-      <img width="100%" height="100%" :src="headImg" alt="" />
+      <img
+        width="100%"
+        height="100%"
+        :src="`../../../src/assets/images/theme/${skinInfo}/head.png`"
+        alt=""
+      />
     </div>
     <div class="dateTime">
       <span>{{ date.hms }}</span>
@@ -12,7 +17,12 @@
         <span>{{ t(`week.4`) }}</span>
       </div>
       <div class="weather">
-        <svg-icon name="weather" :size="40" @click="clickFun"></svg-icon>
+        <svg-icon
+          name="weatherBase"
+          :class="weatherClick ? 'weatherIcon' : ''"
+          :size="40"
+          @click="clickFun"
+        ></svg-icon>
       </div>
     </div>
     <setTool ref="setToolRef"></setTool>
@@ -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;
       }
     }

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"
           />