Browse Source

地图调整

Hwf 1 year ago
parent
commit
dafd2941fa

+ 1 - 1
src/utils/olMap/olMap.ts

@@ -26,7 +26,7 @@ import axios from 'axios';
 proj4.defs('EPSG:4490', '+proj=longlat +ellps=GRS80 +no_defs +type=crs');
 proj4.defs('EPSG:4525', '+proj=tmerc +lat_0=0 +lon_0=111 +k=1 +x_0=37500000 +y_0=0 +ellps=GRS80 +units=m +no_defs +type=crs');
 register(proj4);
-const commonUrl = import.meta.env.VITE_APP_BASE_API + '/api/oneShare/proxyHandler/gd/';
+const commonUrl = '/api/oneShare/proxyHandler/gd/';
 const projection = new Projection({
   code: 'EPSG:4490',
   units: 'degrees'

+ 1 - 1
src/views/routineCommandMap/MiddleSection.vue

@@ -4,7 +4,7 @@
       <el-button type="primary" @click="handleQuery1" :disabled="true">备战防御</el-button>
       <el-button type="primary" @click="handleQuery2">指挥调度</el-button>
     </div>
-    <PositionMap id="positionMap" v-model:visible="mapDialogVisible" @change="handleMapChange" />
+    <PositionMap id="positionMap" v-if="mapDialogVisible" v-model:visible="mapDialogVisible" @change="handleMapChange" />
     <GlobalMap is-component width="3894" height="2140" />
   </div>
 </template>

+ 3 - 3
src/views/routineCommandMap/PositionMap.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <div v-if="visible" class="dialog-wrap">
-      <div class="dialog">
+    <div class="dialog-wrap">
+      <div class="dialog" ref="containerRef" :style="{ width: width, height: height }">
         <div class="dialog-header">
           <div class="dialog-title">{{ title }}</div>
           <div class="icon-close" @click="handleClose">
@@ -23,7 +23,7 @@
               <el-button type="primary" size="large" @click="submit">确定</el-button>
             </el-form-item>
           </el-form>
-          <div ref="containerRef" class="map_box">
+          <div class="map_box">
             <div id="map" class="map"></div>
             <div class="search">
               <!-- @input="handleInput(0)" -->

+ 1 - 1
src/views/routineCommandMap/index.vue

@@ -29,7 +29,7 @@ onMounted(() => {
       dh: 2520,
       el: '#dashboard-container',
       resize: false,
-      ignore: ['#aMap', '#YztMap']
+      ignore: ['#aMap', '#YztMap', '#positionMap']
     },
     false
   );