ソースを参照

迭代二 跳转

Hwf 8 ヶ月 前
コミット
3306fec5fe

+ 1 - 1
.env.development

@@ -5,7 +5,7 @@ VITE_APP_TITLE = 应急指挥一张图
 VITE_APP_ENV = 'development'
 
 # 开发环境
-VITE_APP_BASE_API = 'http://10.181.7.235'
+VITE_APP_BASE_API = 'http://19.155.220.206'
 
 # 应用访问路径 例如使用前缀 /admin/
 VITE_APP_CONTEXT_PATH = '/'

+ 1 - 1
.env.production

@@ -14,7 +14,7 @@ VITE_APP_MONITOR_ADMIN = '/admin/applications'
 VITE_APP_SNAILJOB_ADMIN = '/snail-job'
 
 # 生产环境
-VITE_APP_BASE_API = 'http://10.181.7.235'
+VITE_APP_BASE_API = 'http://19.155.220.206'
 
 # 是否在打包时开启压缩,支持 gzip 和 brotli
 VITE_BUILD_COMPRESS = gzip

+ 12 - 12
src/views/globalMap/index.vue

@@ -1,25 +1,25 @@
 <template>
   <div class="global-map">
     <MapLogical v-if="activeMap === 'logical'" :map-data="mapData" />
-<!--    <YztMap-->
-<!--      v-else-if="activeMap === 'satellite2'"-->
-<!--      ref="map2Ref"-->
-<!--      v-model:drawing="mouseToolState.drawing"-->
-<!--      :activeMap="activeMap"-->
-<!--      :color="mouseToolState.color"-->
-<!--      :draw-type="mouseToolState.drawType"-->
-<!--      :graphics-type="mouseToolState.graphicsType"-->
-<!--      @selectGraphics="analysisSpatial"-->
-<!--    />-->
-    <YMap
+    <YztMap
       v-else-if="activeMap === 'satellite2'"
       ref="map2Ref"
       v-model:drawing="mouseToolState.drawing"
+      :activeMap="activeMap"
       :color="mouseToolState.color"
       :draw-type="mouseToolState.drawType"
       :graphics-type="mouseToolState.graphicsType"
-      :active-map="activeMap"
+      @selectGraphics="analysisSpatial"
     />
+<!--    <YMap-->
+<!--      v-else-if="activeMap === 'satellite2'"-->
+<!--      ref="map2Ref"-->
+<!--      v-model:drawing="mouseToolState.drawing"-->
+<!--      :color="mouseToolState.color"-->
+<!--      :draw-type="mouseToolState.drawType"-->
+<!--      :graphics-type="mouseToolState.graphicsType"-->
+<!--      :active-map="activeMap"-->
+<!--    />-->
     <Map
       v-else
       ref="mapRef"

+ 2 - 0
src/views/routineCommandMap/RightSection/KnowledgeDialog.vue

@@ -67,6 +67,8 @@ let dateRange = ref(['', '']);
 const queryParams = reactive({
   pageNum: 1,
   pageSize: 10,
+  sortBy: 'publishDate',
+  sortOrder: 'desc',
   summary: '',
   eventType: ''
 });

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

@@ -107,7 +107,9 @@ const showPlanManageDetail = () => {
 const knowledgeBaseState = reactive({
   queryParams: {
     pageNum: 1,
-    pageSize: 5
+    pageSize: 5,
+    sortBy: 'publishDate',
+    sortOrder: 'desc'
   },
   listData: [],
   showListDialog: false