af-mobile-client-vue3 1.1.2 → 1.1.4

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>

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

@@ -1,17 +1,23 @@
 <script setup lang="ts">
 import { queryProse } from '@af-mobile-client-vue3/api/mock'
+import { getUserPermissions } from '@af-mobile-client-vue3/services/api/search'
 import { post } from '@af-mobile-client-vue3/services/restTools'
+import useUserStore from '@af-mobile-client-vue3/stores/modules/user'
 import { showToast, Button as VanButton, Cell as VanCell, CellGroup as VanCellGroup } from 'vant'
 import { reactive, ref } from 'vue'
 import { useRouter } from 'vue-router'
 
 // 路由
 const router = useRouter()
+// 用户store
+const userStore = useUserStore()
 
 // 数据定义
 const requestTypes = ref('GET, POST, DELETE')
 const getResult = ref('')
 const postResult = ref('')
+const permissionsResult = ref('')
+const storePermissionsResult = ref('')
 const postData = reactive({
   name: '',
   value: '',
@@ -36,6 +42,31 @@ async function handleGetRequest() {
   }
 }
 
+// 获取用户权限
+async function handleGetPermissions() {
+  try {
+    const userInfo = userStore.getUserInfo()
+    if (!userInfo || !userInfo.id) {
+      showToast('请先登录')
+      return
+    }
+
+    // 从API获取权限
+    const permissions = await getUserPermissions(userInfo.id.toString())
+    permissionsResult.value = JSON.stringify(permissions, null, 2)
+
+    // 从Store获取权限
+    const storePermissions = userStore.getPermissions()
+    storePermissionsResult.value = JSON.stringify(storePermissions, null, 2)
+
+    showToast('获取权限成功')
+  }
+  catch (error) {
+    console.error('获取权限失败:', error)
+    showToast('获取权限失败')
+  }
+}
+
 // 定义请求数据类型
 interface RequestData {
   name: string
@@ -118,6 +149,24 @@ const userInfo = await get<UserInfo>('/api/user/info')
           </div>
         </div>
 
+        <!-- 用户权限部分 -->
+        <div class="request-section">
+          <h3>用户权限获取</h3>
+          <VanButton type="primary" size="small" @click="handleGetPermissions">
+            获取用户权限
+          </VanButton>
+
+          <div v-if="permissionsResult" class="result-box">
+            <h4>API请求权限结果：</h4>
+            <pre>{{ permissionsResult }}</pre>
+          </div>
+
+          <div v-if="storePermissionsResult" class="result-box">
+            <h4>Store缓存权限结果：</h4>
+            <pre>{{ storePermissionsResult }}</pre>
+          </div>
+        </div>
+
         <!-- 类型定义说明 -->
         <div class="code-section">
           <h3>类型定义</h3>

package/src/views/component/index.vue

@@ -51,9 +51,13 @@ const list = ref([
     to: '/Component/XFormAppraiseView/2/debug',
   },
   {
-    name: 'XOlmap 地图组件',
+    name: 'XOlMap 地图组件',
     to: '/Component/XOlMapView',
   },
+  {
+    name: 'XOlMap 地址选择器',
+    to: '/Component/XOlMapView/XLocationPicker',
+  },
   {
     name: '请求示例',
     to: '/Component/XRequestView',

package/src/views/user/login/LoginForm.vue

@@ -172,7 +172,6 @@ async function afterGeneral(result) {
   // 如果result中没有返回 权限 需要主动获取权限列表
   if (!result.permissions) {
     result.permissions = await getUserPermissions(result.id)
-    console.log(result.permissions, '====')
   }
   userState.setPermissions(result.permissions)
   userState.setRoles([{ id: 'admin', operation: ['add', 'edit', 'delete'] }])