af-mobile-client-vue3 1.1.43 → 1.1.45

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

@@ -1,24 +1,147 @@
 <script setup lang="ts">
 import XCellList from '@af-mobile-client-vue3/components/data/XCellList/index.vue'
-import { ref } from 'vue'
+import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
+import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
+import { defineEmits, ref } from 'vue'
 import { useRouter } from 'vue-router'
 
-// 巡检计划
-defineOptions({
-  name: 'PatrolPlan',
-})
-
+// 定义事件
+const emit = defineEmits(['deleteRow'])
+const userInfo = useUserStore().getUserInfo()
+// 访问路由
 const router = useRouter()
-const configName = ref('crud_patroltask_managePhoneCRUD')
-const xCellListRefPatrolPlan = ref()
+// 获取默认值
+const idKey = ref('o_id')
+
+// 简易crud表单测试
+// const configName = ref('orderCarInMobileCRUD')
+// const serviceName = ref('af-gaslink')
+// const configName = ref('lngPriceManageMobileCRUD')
+const configName = ref('测试')
+const serviceName = ref('af-gaslink')
+// const configName = ref('mobile_liushuiQueryCRUD')
+// const serviceName = ref('af-revenue')
+
+// 资源权限测试
+// const configName = ref('crud_sources_test')
+// const serviceName = ref('af-system')
+
+// 实际业务测试
+// const configName = ref('lngChargeAuditMobileCRUD')
+// const serviceName = ref('af-gaslink')
+
+// 跳转到详情页面
+// function toDetail(item) {
+//   router.push({
+//     name: 'XCellDetailView',
+//     params: { id: item[idKey.value] }, // 如果使用命名路由，推荐使用路由参数而不是直接构建 URL
+//     query: {
+//       operName: item[operNameKey.value],
+//       method:item[methodKey.value],
+//       requestMethod:item[requestMethodKey.value],
+//       operatorType:item[operatorTypeKey.value],
+//       operUrl:item[operUrlKey.value],
+//       operIp:item[operIpKey.value],
+//       costTime:item[costTimeKey.value],
+//       operTime:item[operTimeKey.value],
+//
+//       title: item[titleKey.value],
+//       businessType: item[businessTypeKey.value],
+//       status:item[statusKey.value]
+//     }
+//   })
+// }
+
+// 跳转到表单——以表单组来渲染纯表单
+function toDetail(item) {
+  router.push({
+    name: 'XFormGroupView',
+    // query: {
+    //   id: item[idKey.value],
+    // id: item.rr_id,
+    // o_id: item.o_id,
+    // },
+  })
+}
+
+// 新增功能
+// function addOption(totalCount) {
+//   router.push({
+//     name: 'XFormView',
+//     params: { id: totalCount, openid: totalCount },
+//     query: {
+//       configName: configName.value,
+//       serviceName: serviceName.value,
+//       mode: '新增',
+//     },
+//   })
+// }
+function addOption(callback) {
+  router.push({
+    name: 'XFormGroupView',
+    // params: { id: totalCount.value },
+    // query: {
+    //   configName: configName.value,
+    //   serviceName: serviceName.value,
+    //   mode: '新增',
+    // },
+  })
+  // 如果存在回调函数，调用它并传递true表示已处理
+  if (typeof callback === 'function') {
+    callback(true)
+  }
+}
+
+// 修改功能
+function updateRow(result, callback) {
+  console.log('用户----', userInfo)
+  router.push({
+    name: 'XFormGroupView',
+    // params: { id: result.o_id, openid: result.o_id },
+    // query: {
+    //   configName: configName.value,
+    //   serviceName: serviceName.value,
+    //   mode: '修改',
+    // },
+  })
+
+  // 如果存在回调函数，调用它并传递true表示已处理
+  if (typeof callback === 'function') {
+    callback(true)
+  }
+}
+
+// 删除功能
+function deleteRow(result) {
+  emit('deleteRow', result.o_id)
+}
 </script>
 
 <template>
-  <XCellList
-    ref="xCellListRefPatrolPlan"
-    service-name="af-linepatrol"
-    :config-name="configName"
-  />
+  <NormalDataLayout id="XCellListView" title="工作计划">
+    <template #layout_content>
+      <XCellList
+        :config-name="configName"
+        :service-name="serviceName"
+        :id-key="idKey"
+        @to-detail="toDetail"
+        @delete-row="deleteRow"
+        @update="updateRow"
+        @add="addOption"
+      />
+
+      <!--      :fix-query-form="{ u_f_price_state: ['生效', '待生效'] }" -->
+
+      <!--      <XCellList -->
+      <!--        :config-name="configName" -->
+      <!--        :service-name="serviceName" -->
+      <!--        :fix-query-form="{ o_f_oper_name: 'edu_test' }" -->
+      <!--        :id-key="idKey" -->
+      <!--        @to-detail="toDetail" -->
+      <!--        @delete-row="deleteRow" -->
+      <!--      /> -->
+    </template>
+  </NormalDataLayout>
 </template>
 
 <style scoped lang="less">

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

@@ -5,9 +5,19 @@ import { showDialog } from 'vant'
 import { ref } from 'vue'
 import { useRoute } from 'vue-router'
 
+// const configName = ref('reviewFormGroup')
+// const serviceName = ref('af-revenue')
+
 // 纯表单
-const configName = ref('AddConstructionForm')
-const serviceName = ref('af-linepatrol')
+// const configName = ref('form_check_test')
+// const serviceName = ref('af-system')
+
+// const configName = ref("计划下发Form")
+// const serviceName = ref("af-linepatrol")
+
+// 表单组
+const configName = ref('lngChargeAuditMobileFormGroup')
+const serviceName = ref('af-gaslink')
 
 const formData = ref({})
 const formGroup = ref(null)
@@ -18,6 +28,36 @@ function submit(_result) {
     history.back()
   })
 }
+
+// 表单组——数据
+// function initComponents () {
+//   runLogic('getlngChargeAuditMobileFormGroupData', {id: 29}, 'af-gaslink').then((res) => {
+//     formData.value = {...res}
+//   })
+// }
+
+// 纯表单——数据
+// function initComponents() {
+//   formData.value = { plan_name: 'af-llllll', plan_point: '1号点位', plan_single: '1号点位', plan_range: '2024-12-12' }
+// }
+
+// function initComponents() {
+//   runLogic('getlngChargeAuditMobileFormGroupData', { id: route.query?.id, o_id: route.query?.o_id }, 'af-gaslink').then((res) => {
+//     console.log('res------', res)
+//     formData.value = { ...res }
+// formGroup.value.init({
+//   configName: configName.value,
+//   serviceName: serviceName.value,
+//   groupFormData: { ...res },
+//   mode: "新增"
+// })
+//     isInit.value = true
+//   })
+// }
+
+// onBeforeMount(() => {
+//   initComponents()
+// })
 </script>
 
 <template>

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

@@ -12,19 +12,16 @@ const formGroupAddConstruction = ref(null)
 <template>
   <NormalDataLayout id="XFormGroupView" title="纯表单">
     <template #layout_content>
-      <div class="form">   <XForm
+      <XForm
         ref="formGroupAddConstruction"
         mode="新增"
         :config-name="configName"
         :service-name="serviceName"
-      /></div>
-
+      />
     </template>
   </NormalDataLayout>
 </template>
 
 <style scoped lang="less">
-.form {
-  margin-top: 2px;
-}
+
 </style>

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

@@ -1,118 +1,118 @@
-<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"
-            :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>
+<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"
+            :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

@@ -3,6 +3,7 @@ import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDat
 import { showNotify } from 'vant'
 import { onMounted, ref } from 'vue'
 import XOlMap from '../../../components/data/XOlMap/index.vue'
+import { trackTestData } from './testData'
 import 'vant/lib/index.css'
 
 const mapRef = ref()
@@ -265,6 +266,13 @@ function handleAddMassPoints() {
   })
 }
 
+// 添加轨迹测试
+function handleAddTrack() {
+  trackTestData.forEach((track) => {
+    mapRef.value.addTrackLayer(track)
+  })
+}
+
 // 导航模式相关
 const isNavigationMode = ref(false)
 
@@ -322,6 +330,15 @@ function stopNavigation() {
             </van-button>
           </div>
 
+          <div class="control-group">
+            <div class="group-title">
+              轨迹示例
+            </div>
+            <van-button type="primary" size="small" @click="handleAddTrack">
+              添加测试轨迹
+            </van-button>
+          </div>
+
           <div class="control-group">
             <div class="group-title">
               导航模式测试

package/src/views/component/XOlMapView/testData.ts

@@ -0,0 +1,64 @@
+/**
+ * 轨迹测试数据
+ */
+
+// 轨迹数据类型定义
+export interface TrackData {
+  id: number
+  name: string
+  trackData: [number, number][] // 经纬度数组
+  color: string
+  show?: boolean // 是否显示
+}
+
+/**
+ * 生成随机轨迹点
+ * @param startPoint - 起始点 [经度, 纬度]
+ * @param pointCount - 点的数量
+ * @param maxOffset - 最大偏移量（经纬度）
+ * @returns 轨迹点数组
+ */
+function generateRandomTrack(
+  startPoint: [number, number],
+  pointCount: number,
+  maxOffset: number = 0.01,
+): [number, number][] {
+  const points: [number, number][] = [startPoint]
+  let currentPoint = startPoint
+
+  for (let i = 1; i < pointCount; i++) {
+    // 生成随机偏移量，使用正态分布使轨迹更自然
+    const offsetLng = (Math.random() - 0.5) * maxOffset * (1 + Math.random() * 0.5)
+    const offsetLat = (Math.random() - 0.5) * maxOffset * (1 + Math.random() * 0.5)
+
+    // 添加一些随机性，使轨迹更自然
+    const randomFactor = Math.random() > 0.8 ? 2 : 1 // 偶尔会有较大的偏移
+    const newPoint: [number, number] = [
+      currentPoint[0] + offsetLng * randomFactor,
+      currentPoint[1] + offsetLat * randomFactor,
+    ]
+
+    points.push(newPoint)
+    currentPoint = newPoint
+  }
+
+  return points
+}
+
+// 测试数据
+export const trackTestData: TrackData[] = [
+  {
+    id: 1,
+    name: '张三的轨迹',
+    trackData: generateRandomTrack([108.948024, 34.263161], 1000, 0.005),
+    color: '#FF0000',
+    show: true,
+  },
+  {
+    id: 2,
+    name: '李四的轨迹',
+    trackData: generateRandomTrack([108.948024, 34.263161], 500, 0.003),
+    color: '#00FF00',
+    show: true,
+  },
+] 

package/vite.config.ts

@@ -1,8 +1,8 @@
 import type { ConfigEnv, UserConfig } from 'vite'
 import path from 'node:path'
 import process from 'node:process'
-import autoprefixer from 'autoprefixer'
-import viewport from 'postcss-mobile-forever'
+// import autoprefixer from 'autoprefixer'
+// import viewport from 'postcss-mobile-forever'
 import { loadEnv } from 'vite'
 import { createVitePlugins } from './build/vite'
 
@@ -95,15 +95,15 @@ export default ({ mode }: ConfigEnv): UserConfig => {
       postcss: {
         plugins: [
           // 自动获取浏览器的流行度和能够支持的属性，并为 CSS 规则添加前缀
-          autoprefixer(),
-          viewport({
-            appSelector: '#system-app',
-            viewportWidth: 375,
-            maxDisplayWidth: 800,
-            appContainingBlock: 'auto',
-            necessarySelectorWhenAuto: '.app-wrapper',
-            rootContainingBlockSelectorList: ['van-tabbar', 'van-popup'],
-          }),
+          // autoprefixer(),
+          // viewport({
+          //   appSelector: '#system-app',
+          //   viewportWidth: 375,
+          //   maxDisplayWidth: 800,
+          //   appContainingBlock: 'auto',
+          //   necessarySelectorWhenAuto: '.app-wrapper',
+          //   rootContainingBlockSelectorList: ['van-tabbar', 'van-popup'],
+          // }),
         ],
       },
     },

package/src/views/component/XFormView/oldindex.vue

@@ -1,70 +0,0 @@
-<script setup lang="ts">
-import XForm from '@af-mobile-client-vue3/components/data/XForm/index.vue'
-import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
-import { getConfigByName } from '@af-mobile-client-vue3/services/api/common'
-import { onBeforeMount, ref, toRaw } from 'vue'
-
-const configName = ref('AddConstructionForm')
-const serviceName = ref('af-linepatrol')
-const formGroup = ref(null)
-const formConfig = ref(null)
-const submitSimple = ref(null)
-const isLoading = ref(true)
-
-function safeStringify(obj) {
-  const seen = new WeakSet()
-  return JSON.stringify(toRaw(obj), (key, val) => {
-    if (typeof val === 'object' && val !== null) {
-      if (seen.has(val))
-        return
-      seen.add(val)
-    }
-    return val
-  }, 2)
-}
-
-function submit(result) {
-  console.log('>>>> result: ', safeStringify(result))
-}
-
-function loadConfig() {
-  return new Promise((resolve) => {
-    getConfigByName(configName.value, (result) => {
-      submitSimple.value = result.showSubmitBtn
-      formConfig.value = result
-      resolve(result)
-    }, serviceName.value)
-  })
-}
-
-onBeforeMount(async () => {
-  try {
-    await loadConfig()
-  }
-  finally {
-    isLoading.value = false
-  }
-})
-</script>
-
-<template>
-  <NormalDataLayout id="XFormGroupView" title="纯表单">
-    <template #layout_content>
-      <van-loading v-if="isLoading" />
-      <XForm
-        v-else
-        ref="formGroup"
-        mode="查询"
-        :service-name="serviceName"
-        :group-form-items="formConfig"
-        :form-data="{}"
-        :form-name="formConfig?.groupName || '11111'"
-        :submit-button="submitSimple"
-        @on-submit="submit"
-      />
-    </template>
-  </NormalDataLayout>
-</template>
-
-<style scoped lang="less">
-</style>