af-mobile-client-vue3 1.1.3 → 1.1.4

package/src/components/data/XOlMap/types.ts

@@ -0,0 +1,138 @@
+/** 地址选择结果接口 */
+export interface LocationResult {
+  /** 经度 */
+  longitude: number
+  /** 纬度 */
+  latitude: number
+  /** 地址描述 */
+  address: string
+}
+
+/** 手机状态接口 */
+export interface PhoneLocationStatus {
+  /** 纬度 */
+  f_latitude: number
+  /** 经度 */
+  f_longitude: number
+  /** 其他可能的状态属性 */
+  [key: string]: unknown
+}
+
+/** 初始化参数接口 */
+export interface InitParams {
+  /** 地图中心点坐标 [经度, 纬度] */
+  center?: [number, number]
+  /** 地图缩放级别 */
+  zoom?: number
+  /** 最大缩放级别 */
+  maxZoom?: number
+  /** 最小缩放级别 */
+  minZoom?: number
+  /** 天地图密钥 */
+  tianDiTuKey?: string
+  /** 是否开启地址选择模式 */
+  enableLocationPicker?: boolean
+  /** 高德地图 API key */
+  amapKey?: string
+}
+
+/** 点位数据接口 */
+export interface PointData {
+  /** 经度 */
+  longitude: number
+  /** 纬度 */
+  latitude: number
+  /** 点标题 */
+  title?: string
+  /** 自定义数据 */
+  extData?: Record<string, any>
+}
+
+/** 点位数据提供者函数类型 */
+export type PointDataProvider = () => PointData[] | Promise<PointData[]>
+
+/** 点位图层配置接口 */
+export interface PointLayerConfig {
+  /** 图层ID */
+  id: number
+  /** 图层名称 */
+  value: string
+  /** 是否显示 */
+  show: boolean
+  /** 是否在控制面板显示 */
+  showInControl?: boolean
+  /** 图标URL */
+  icon: string
+  /** 图标锚点 */
+  iconAnchor?: [number, number]
+  /** 点击事件处理函数 */
+  onClick?: (point: PointData, event: any) => void
+  /** 点位数据提供者 */
+  dataProvider?: () => PointData[] | Promise<PointData[]>
+}
+
+/** WebGL渲染配置接口 */
+export interface WebGLPointOptions extends PointLayerConfig {
+  /** 图标大小 */
+  iconSize?: [number, number]
+  /** 是否开启聚合 */
+  enableCluster?: boolean
+  /** 聚合距离，单位像素 */
+  clusterDistance?: number
+  /** 聚合样式配置 */
+  clusterStyle?: {
+    /** 填充颜色 */
+    fillColor?: string
+    /** 边框颜色 */
+    strokeColor?: string
+    /** 文字颜色 */
+    textColor?: string
+  }
+  /** 渲染性能配置 */
+  performance?: {
+    /** 是否开启分块加载 */
+    enableChunk?: boolean
+    /** 每块数据量 */
+    chunkSize?: number
+    /** 是否开启节流 */
+    enableThrottle?: boolean
+    /** 节流时间间隔(ms) */
+    throttleWait?: number
+  }
+}
+
+/** WMS 图层配置接口 */
+export interface WMSLayerConfig {
+  /** 图层名称 */
+  layerName: string
+  /** 图层显示名称 */
+  value: string
+  /** 是否显示 */
+  show: boolean
+  /** 手机端是否显示 */
+  phoneShow: boolean
+  /** 图层 ID */
+  id: number
+}
+
+/** WMS 服务配置接口 */
+export interface WMSConfig {
+  /** 工作空间 */
+  workspace: string
+  /** 坐标系 */
+  srs: string
+  /** 图片格式 */
+  format: string
+  /** WMS 版本 */
+  version: string
+  /** WMS 服务地址 */
+  url: string
+}
+
+/** WMS 完整配置接口 */
+export interface WMSOptions {
+  /** WMS 图层列表 */
+  layers: WMSLayerConfig[]
+  /** WMS 服务配置 */
+  wms: WMSConfig
+}

package/src/router/routes.ts

@@ -1,6 +1,5 @@
 import type { RouteRecordRaw } from 'vue-router'
 import XForm from '@af-mobile-client-vue3/components/data/XForm/index.vue'
-import XOlMapView from '@af-mobile-client-vue3/components/data/XOlMap/demo.vue'
 import XReport from '@af-mobile-client-vue3/components/data/XReportGrid/XReport.vue'
 import GridView from '@af-mobile-client-vue3/layout/GridView/index.vue'
 import PageLayout from '@af-mobile-client-vue3/layout/PageLayout.vue'
@@ -13,6 +12,8 @@ import XCellListView from '@af-mobile-client-vue3/views/component/XCellListView/
 import XFormAppraiseView from '@af-mobile-client-vue3/views/component/XFormAppraiseView/index.vue'
 import XFormGroupView from '@af-mobile-client-vue3/views/component/XFormGroupView/index.vue'
 import XFormView from '@af-mobile-client-vue3/views/component/XFormView/index.vue'
+import XOlMapView from '@af-mobile-client-vue3/views/component/XOlMapView/index.vue'
+import XLocationPicker from '@af-mobile-client-vue3/views/component/XOlMapView/XLocationPicker/index.vue'
 import XReportFormIframeView from '@af-mobile-client-vue3/views/component/XReportFormIframeView/index.vue'
 import XReportFormView from '@af-mobile-client-vue3/views/component/XReportFormView/index.vue'
 import XReportGridView from '@af-mobile-client-vue3/views/component/XReportGridView/index.vue'
@@ -82,6 +83,11 @@ const routes: Array<RouteRecordRaw> = [
         name: 'XOlMapView',
         component: XOlMapView,
       },
+      {
+        path: '/Component/XOlMapView/XLocationPicker',
+        name: 'XLocationPicker',
+        component: XLocationPicker,
+      },
       // {
       //   path: '/Components/XForm',
       //   name: 'XForm',

package/src/services/api/common.ts

@@ -50,8 +50,8 @@ export function getConfigByNameWithoutIndexedDB(configName: string, serviceName
 /**
  * 通用执行业务逻辑
  */
-export function runLogic(logicName: string, parameter: object, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
-  return post(`/${serviceName}/logic/${logicName}`, parameter)
+export function runLogic<T>(logicName: string, parameter: object, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME): Promise<T> {
+  return post<T>(`/${serviceName}/logic/${logicName}`, parameter)
 }
 
 /**

package/src/views/component/XOlMapView/XLocationPicker/index.vue

@@ -0,0 +1,120 @@
+<script setup lang="ts">
+import type { LocationResult } from '@af-mobile-client-vue3/components/data/XOlMap/types'
+import LocationPicker from '@af-mobile-client-vue3/components/data/XOlMap/XLocationPicker/index.vue'
+import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
+import { showNotify } from 'vant'
+import { ref } from 'vue'
+
+const selectedLocation = ref<LocationResult>()
+
+// 处理位置选择
+function handleLocationConfirm(location: LocationResult) {
+  console.log('选择的位置:', location)
+  selectedLocation.value = location
+  showNotify({ type: 'success', message: '位置已选择' })
+}
+</script>
+
+<template>
+  <NormalDataLayout id="XLocationPicker" title="XOlMap地址选择器">
+    <template #layout_content>
+      <div class="location-picker-demo">
+        <!-- 页面标题 -->
+        <div class="page-header">
+          <div class="title">
+            位置选择
+          </div>
+        </div>
+
+        <!-- 选择结果展示 -->
+        <div v-if="selectedLocation" class="location-result">
+          <div class="label">
+            已选位置:
+          </div>
+          <div class="value">
+            {{ selectedLocation.address }}
+          </div>
+          <div class="coordinates">
+            经度: {{ selectedLocation.longitude.toFixed(6) }},
+            纬度: {{ selectedLocation.latitude.toFixed(6) }}
+          </div>
+        </div>
+
+        <!-- 地图组件 -->
+        <div class="map-container">
+          <LocationPicker
+            v-model="selectedLocation"
+            tian-di-tu-key="c16876b28898637c0a1a68b3fa410504"
+            amap-key="5ebabc4536d4b42e0dd1e20175cca8ab"
+            :default-center="[108.948024, 34.263161]"
+            :default-zoom="12"
+            @confirm="handleLocationConfirm"
+          />
+        </div>
+      </div>
+    </template>
+  </NormalDataLayout>
+</template>
+
+<style scoped lang="less">
+.location-picker-demo {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  background-color: #f7f8fa;
+}
+
+.page-header {
+  height: 44px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: white;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
+  position: relative;
+  z-index: 1;
+
+  .title {
+    font-size: 16px;
+    color: #333;
+    font-weight: 500;
+  }
+}
+
+.location-result {
+  background: white;
+  padding: 12px 16px;
+  margin: 10px;
+  border-radius: 8px;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
+
+  .label {
+    font-size: 14px;
+    color: #666;
+    margin-bottom: 4px;
+  }
+
+  .value {
+    font-size: 16px;
+    color: #333;
+    margin-bottom: 8px;
+    word-break: break-all;
+  }
+
+  .coordinates {
+    font-size: 12px;
+    color: #999;
+  }
+}
+
+.map-container {
+  flex: 1;
+  position: relative;
+  margin: 0 10px 10px 10px;
+  border-radius: 8px;
+  overflow: hidden;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+</style>

package/src/views/component/XOlMapView/index.vue

@@ -0,0 +1,420 @@
+<script setup lang="ts">
+import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
+import { showNotify } from 'vant'
+import { onMounted, ref } from 'vue'
+import XOlMap from '../../../components/data/XOlMap/index.vue'
+import 'vant/lib/index.css'
+
+const mapRef = ref()
+
+// WMS 配置
+const wmsConfig = {
+  layers: [
+    {
+      phoneShow: false,
+      show: false,
+      id: 1,
+      layerName: 'gis:lp',
+      value: '低压管线',
+    },
+    {
+      phoneShow: true,
+      show: true,
+      id: 2,
+      layerName: 'gis:mp',
+      value: '中压管线',
+    },
+    {
+      phoneShow: false,
+      show: false,
+      id: 3,
+      layerName: 'gis:surface_valve',
+      value: '地面阀门',
+    },
+    {
+      phoneShow: false,
+      show: false,
+      id: 4,
+      layerName: 'gis:valve_chamber',
+      value: '阀门井',
+    },
+    {
+      phoneShow: false,
+      show: false,
+      id: 6,
+      layerName: 'gis:hp',
+      value: '高压管线',
+    },
+    {
+      phoneShow: false,
+      show: false,
+      id: 5,
+      layerName: 'gis:pressure_regulating_box',
+      value: '调压箱',
+    },
+  ],
+  wms: {
+    workspace: 'gis',
+    srs: 'EPSG:3857',
+    format: 'image/png',
+    version: '1.1.0',
+    url: '/linepatrol/geoserver/gis/wms',
+  },
+}
+
+// 初始化地图
+onMounted(() => {
+  mapRef.value.init({
+    center: [108.948024, 34.263161], // 西安坐标
+    zoom: 12,
+    maxZoom: 18,
+    minZoom: 4,
+    tianDiTuKey: 'c16876b28898637c0a1a68b3fa410504',
+  })
+  mapRef.value.addWMSLayers(wmsConfig)
+})
+
+// 地图控制函数
+const handleSetCenter = () => mapRef.value.setCenter([116.404, 39.915]) // 切换到北京
+const handleSetZoom = () => mapRef.value.setZoom(14) // 设置缩放级别为14
+const handleGetZoom = () => showNotify({ type: 'primary', message: `当前缩放级别：${mapRef.value.getZoom()}` })
+const handleSetCenterAndZoom = () => mapRef.value.setCenterAndZoom([120.153576, 30.287459], 15) // 切换到杭州
+
+// 点位数据
+const poiPoints = [
+  {
+    longitude: 108.988024,
+    latitude: 34.283161,
+    title: '大雁塔',
+    extData: { type: 'poi' },
+  },
+  {
+    longitude: 108.948024,
+    latitude: 34.263161,
+    title: '钟楼',
+    extData: { type: 'poi' },
+  },
+  {
+    longitude: 108.968024,
+    latitude: 34.273161,
+    title: '小寨',
+    extData: { type: 'poi' },
+  },
+]
+
+const schoolPoints = [
+  {
+    longitude: 108.968024,
+    latitude: 34.273161,
+    title: '西安电子科技大学',
+    extData: {
+      type: 'school',
+      level: '985',
+      studentCount: 25000,
+      departments: ['通信学院', '计算机学院', '电子工程学院'],
+    },
+  },
+]
+
+const hospitalPoints = [
+  {
+    longitude: 108.948024,
+    latitude: 34.263161,
+    title: '西安市第一医院',
+    extData: {
+      type: 'hospital',
+      level: '三甲',
+      departments: ['急诊科', '内科', '外科'],
+      contact: '029-12345678',
+      address: '西安市雁塔区',
+    },
+  },
+  {
+    longitude: 108.978024,
+    latitude: 34.278161,
+    title: '西安市中心医院',
+    extData: {
+      type: 'hospital',
+      level: '三甲',
+      departments: ['急诊科', '内科', '外科'],
+      contact: '029-87654321',
+      address: '西安市新城区',
+    },
+  },
+]
+
+// 点位处理函数
+function handlePointClick(point: any) {
+  showNotify({
+    type: 'primary',
+    message: `点击了: ${point.title}\n类型: ${point.extData.type}`,
+  })
+}
+
+// 添加点位示例
+function handleAddPoints() {
+  mapRef.value.addPointLayer({
+    id: 1,
+    value: '学校啊啊啊',
+    show: true,
+    showInControl: false, // 不添加图层控制按钮
+    icon: 'https://a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-red.png',
+    iconAnchor: [0.5, 1],
+    onClick: handlePointClick,
+    dataProvider: async () => {
+      // 模拟从API获取学校数据
+      return new Promise((resolve) => {
+        setTimeout(() => {
+          resolve([
+            {
+              longitude: 108.968024,
+              latitude: 34.273161,
+              title: '普通点位',
+              extData: {
+                type: 'school',
+                level: '985',
+                studentCount: 25000,
+              },
+            },
+          ])
+        }, 1000)
+      })
+    },
+  })
+}
+
+// 添加分类点位示例
+function handleAddPointLayer() {
+  // 添加学校点位图层
+  mapRef.value.addPointLayer({
+    id: 1,
+    value: '学校',
+    show: true,
+    icon: 'https://a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png',
+    iconAnchor: [0.5, 1],
+    onClick: handlePointClick,
+    dataProvider: async () => {
+      // 模拟从API获取学校数据
+      return new Promise((resolve) => {
+        setTimeout(() => {
+          resolve([
+            {
+              longitude: 108.958024,
+              latitude: 34.283161,
+              title: '西安交通大学',
+              extData: {
+                type: 'school',
+                level: '985',
+                studentCount: 30000,
+                departments: ['机械学院', '电气学院', '管理学院'],
+              },
+            },
+          ])
+        }, 1000)
+      })
+    },
+  })
+
+  // 添加医院点位图层
+  mapRef.value.addPointLayer({
+    id: 2,
+    value: '医院',
+    show: true,
+    icon: 'https://a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png',
+    iconAnchor: [0.5, 1],
+    onClick: handlePointClick,
+    dataProvider: async () => {
+      // 模拟从API获取医院数据
+      return new Promise((resolve) => {
+        setTimeout(() => {
+          resolve([
+            {
+              longitude: 108.978024,
+              latitude: 34.278161,
+              title: '西安市中心医院',
+              extData: {
+                type: 'hospital',
+                level: '三甲',
+                departments: ['急诊科', '内科', '外科'],
+                contact: '029-87654321',
+                address: '西安市新城区',
+              },
+            },
+          ])
+        }, 1000)
+      })
+    },
+  })
+}
+
+// 添加海量点示例
+function handleAddMassPoints() {
+  mapRef.value.addWebGLPoints({
+    id: 3,
+    value: '海量点',
+    show: true,
+    icon: 'https://a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-red.png',
+    iconSize: [6, 6],
+    onClick: handlePointClick,
+    dataProvider: () => {
+      // 生成10000个随机点
+      return Array.from({ length: 10000 }, (_, index) => ({
+        longitude: 108.948024 + (Math.random() - 0.5) * 0.1,
+        latitude: 34.263161 + (Math.random() - 0.5) * 0.1,
+        title: `点位${index + 1}`,
+        extData: { type: 'mass' },
+      }))
+    },
+  })
+}
+
+// 导航模式相关
+const isNavigationMode = ref(false)
+
+// 开启导航模式
+function startNavigation() {
+  isNavigationMode.value = true
+  mapRef.value?.startNavigation()
+}
+
+// 停止导航模式
+function stopNavigation() {
+  isNavigationMode.value = false
+  mapRef.value?.stopNavigation()
+}
+</script>
+
+<template>
+  <NormalDataLayout id="XOlMapView" title="XOlMap地图组件">
+    <template #layout_content>
+      <div class="demo-container">
+        <div class="map-container">
+          <XOlMap ref="mapRef" />
+        </div>
+        <div class="control-panel">
+          <div class="control-group">
+            <div class="group-title">
+              地图控制
+            </div>
+            <van-button type="primary" size="small" @click="handleSetCenter">
+              切换到北京
+            </van-button>
+            <van-button type="primary" size="small" @click="handleSetZoom">
+              设置缩放级别14
+            </van-button>
+            <van-button type="primary" size="small" @click="handleGetZoom">
+              获取当前缩放级别
+            </van-button>
+            <van-button type="primary" size="small" @click="handleSetCenterAndZoom">
+              切换到杭州(级别15)
+            </van-button>
+          </div>
+
+          <div class="control-group">
+            <div class="group-title">
+              点位示例
+            </div>
+            <van-button type="success" size="small" @click="handleAddPoints">
+              添加普通点位
+            </van-button>
+            <van-button type="success" size="small" @click="handleAddPointLayer">
+              添加分类点位
+            </van-button>
+            <van-button type="warning" size="small" @click="handleAddMassPoints">
+              添加海量点(1万)
+            </van-button>
+          </div>
+
+          <div class="control-group">
+            <div class="group-title">
+              导航模式测试
+            </div>
+            <van-button
+              :type="isNavigationMode ? 'danger' : 'primary'"
+              size="small"
+              @click="isNavigationMode ? stopNavigation() : startNavigation()"
+            >
+              {{ isNavigationMode ? '停止导航' : '开始导航' }}
+            </van-button>
+          </div>
+        </div>
+      </div>
+    </template>
+  </NormalDataLayout>
+</template>
+
+<style scoped lang="less">
+.demo-container {
+  width: 100%;
+  height: 100%;
+  position: relative;
+}
+
+.map-container {
+  width: 100%;
+  height: 100%;
+}
+
+.control-panel {
+  position: absolute;
+  left: 10px;
+  top: 10px;
+  z-index: 1000;
+  background: white;
+  padding: 10px;
+  border-radius: 4px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+
+  .control-group {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+
+    .group-title {
+      font-size: 14px;
+      font-weight: 500;
+      color: #333;
+      padding-left: 4px;
+      border-left: 3px solid #1989fa;
+    }
+
+    :deep(.van-button) {
+      margin-bottom: 8px;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
+    }
+  }
+
+  :deep(.van-button) {
+    width: 140px;
+  }
+}
+
+// 移动端适配
+@media screen and (max-width: 768px) {
+  .control-panel {
+    left: 8px;
+    top: 8px;
+    padding: 8px;
+    gap: 12px;
+
+    .control-group {
+      gap: 6px;
+
+      .group-title {
+        font-size: 12px;
+      }
+    }
+
+    :deep(.van-button) {
+      width: 120px;
+      font-size: 12px;
+    }
+  }
+}
+</style>