Merge remote-tracking branch 'origin/dev' into dev

src/components/Map/index.vue

@@ -49,9 +49,7 @@ const mapUtils = useAMap({
     AMap = getAMap();
     map = getMap();
     mapStore.setMapLoaded(true);
-    if (!['logical', 'vectorgraph'].includes(mapStore.activeMap)) {
-      switchMap(mapStore.activeMap);
-    }
+    switchMap(mapStore.activeMap);
     map.on('zoomchange', zoomChangeHandler);
     // 添加遮罩
     if (mapStore.showMask) {

src/views/dataFilling/myFilling.vue

@@ -67,7 +67,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="total > 0" v-model:page="queryParams.page" v-model:limit="queryParams.pageSize" :total="total" @pagination="tableData" />
+        <pagination v-show="total > 0" v-model:page="queryParams.page" v-model:limit="queryParams.pageSize" :total="total" @pagination="fetchFillList" />
       </div>
     </div>
     <WriteForm v-if="writeFormState.show" :event-id="writeFormState.eventId" @refresh="fetchFillList" @close="handleCancel" />
@@ -119,7 +119,7 @@ const data = reactive({
   }
 });
 
-const { queryParams, form } = toRefs(data);
+const { queryParams } = toRefs(data);
 
 let writeFormState = reactive({
   show: false,