gemercheung hace 1 año
padre
commit
75eb0ba18b

+ 9 - 9
pnpm-lock.yaml

@@ -38,8 +38,8 @@ importers:
         specifier: ^7.4.1
         specifier: ^7.4.1
         version: 7.5.3(vue@3.2.26)
         version: 7.5.3(vue@3.2.26)
       '@vueuse/router':
       '@vueuse/router':
-        specifier: ^10.11.0
-        version: 10.11.1(vue-router@4.0.12(vue@3.2.26))(vue@3.2.26)
+        specifier: ^11.0.0
+        version: 11.0.3(vue-router@4.0.12(vue@3.2.26))(vue@3.2.26)
       '@vueuse/shared':
       '@vueuse/shared':
         specifier: ^7.4.1
         specifier: ^7.4.1
         version: 7.5.3(vue@3.2.26)
         version: 7.5.3(vue@3.2.26)
@@ -1597,13 +1597,13 @@ packages:
       vue:
       vue:
         optional: true
         optional: true
 
 
-  '@vueuse/router@10.11.1':
-    resolution: {integrity: sha512-tXtDofDwgmADrnLY2mK2LtHKV9CBehaNfT2ar00HZTJ00QxmCOjYp626WdGtQsUi4E64vTScV/s+yKTXhZfl1w==}
+  '@vueuse/router@11.0.3':
+    resolution: {integrity: sha512-Sa8wNATd4DoAWkO5NgV+sfTU9dOtC8pi+GEbtzOdC7/99fWK8k5/dfbfkt+OWcpwXoToNidBqnAZafknlYb2ig==}
     peerDependencies:
     peerDependencies:
       vue-router: '>=4.0.0-rc.1'
       vue-router: '>=4.0.0-rc.1'
 
 
-  '@vueuse/shared@10.11.1':
-    resolution: {integrity: sha512-LHpC8711VFZlDaYUXEBbFBCQ7GS3dVU9mjOhhMhXP6txTV4EhYQg/KGnQuvt/sPAtoUKq7VVUnL6mVtFoL42sA==}
+  '@vueuse/shared@11.0.3':
+    resolution: {integrity: sha512-0rY2m6HS5t27n/Vp5cTDsKTlNnimCqsbh/fmT2LgE+aaU42EMfXo8+bNX91W9I7DDmxfuACXMmrd7d79JxkqWA==}
 
 
   '@vueuse/shared@7.5.3':
   '@vueuse/shared@7.5.3':
     resolution: {integrity: sha512-BJ71cxHN5VByW1S58Gl85NFJaQu93F7Vs7K/MuAKsIIuHm9PBbkR5Vxkg9ko9cBdiKVt+FNoo13BhdbA+Vwycg==}
     resolution: {integrity: sha512-BJ71cxHN5VByW1S58Gl85NFJaQu93F7Vs7K/MuAKsIIuHm9PBbkR5Vxkg9ko9cBdiKVt+FNoo13BhdbA+Vwycg==}
@@ -8357,16 +8357,16 @@ snapshots:
     optionalDependencies:
     optionalDependencies:
       vue: 3.2.26
       vue: 3.2.26
 
 
-  '@vueuse/router@10.11.1(vue-router@4.0.12(vue@3.2.26))(vue@3.2.26)':
+  '@vueuse/router@11.0.3(vue-router@4.0.12(vue@3.2.26))(vue@3.2.26)':
     dependencies:
     dependencies:
-      '@vueuse/shared': 10.11.1(vue@3.2.26)
+      '@vueuse/shared': 11.0.3(vue@3.2.26)
       vue-demi: 0.14.10(vue@3.2.26)
       vue-demi: 0.14.10(vue@3.2.26)
       vue-router: 4.0.12(vue@3.2.26)
       vue-router: 4.0.12(vue@3.2.26)
     transitivePeerDependencies:
     transitivePeerDependencies:
       - '@vue/composition-api'
       - '@vue/composition-api'
       - vue
       - vue
 
 
-  '@vueuse/shared@10.11.1(vue@3.2.26)':
+  '@vueuse/shared@11.0.3(vue@3.2.26)':
     dependencies:
     dependencies:
       vue-demi: 0.14.10(vue@3.2.26)
       vue-demi: 0.14.10(vue@3.2.26)
     transitivePeerDependencies:
     transitivePeerDependencies:

+ 4 - 1
src/locales/lang/json/zh-CN.json

@@ -625,5 +625,8 @@
   "layout.map.mapShare": "地图分享",
   "layout.map.mapShare": "地图分享",
   "layout.map.view": "查看",
   "layout.map.view": "查看",
   "layout.map.addScene": "添加场景",
   "layout.map.addScene": "添加场景",
-  "layout.map.projectScene": "项目场景"
+  "layout.map.projectScene": "项目场景",
+  "layout.map.mapSelect": "地图选择",
+  "layout.map.mapSearch": "地图搜索"
+  
 }
 }

+ 3 - 1
src/views/map/addProjectModal.vue

@@ -12,7 +12,9 @@
         <template #location>
         <template #location>
           <div class="map-select">
           <div class="map-select">
             <a-input v-model:value="location" allow-clear disabled />
             <a-input v-model:value="location" allow-clear disabled />
-            <a-button type="default" @click="handleOpenMap">地图搜索</a-button>
+            <a-button type="default" @click="handleOpenMap">{{
+              t('layout.map.mapSearch')
+            }}</a-button>
           </div>
           </div>
         </template>
         </template>
       </BasicForm>
       </BasicForm>

+ 1 - 1
src/views/map/mapSelectModal.vue

@@ -2,7 +2,7 @@
   <BasicModal
   <BasicModal
     v-bind="$attrs"
     v-bind="$attrs"
     @register="register"
     @register="register"
-    title="地图选择"
+    :title="t('layout.map.mapSelect')"
     @ok="handleSubmit"
     @ok="handleSubmit"
     @cancel="handleCancel"
     @cancel="handleCancel"
     :width="828"
     :width="828"