af-mobile-client-vue3 1.5.69 → 1.5.71

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.5.69",
+  "version": "1.5.71",
   "packageManager": "pnpm@10.13.1",
   "description": "Vue + Vite component lib",
   "engines": {

package/src/api/map/trackApi.ts

@@ -0,0 +1,94 @@
+import { getConfigByNameAsync } from '@af-mobile-client-vue3/services/api/common'
+import { post } from '@af-mobile-client-vue3/services/restTools'
+import useUserStore from '@af-mobile-client-vue3/stores/modules/user'
+import { trajectoryThinning } from '@af-mobile-client-vue3/utils/map/track'
+import { trajectoryGrouping } from '@af-mobile-client-vue3/utils/map/trackUtils'
+import dayjs from 'dayjs/esm/index'
+
+/**
+ * trajectoryThinning 是否抽稀 默认 false
+ * trajectoryCorrection 是否高德纠偏 默认 false
+ * group 是否分组 默认 false 要进行高德纠偏必须分组
+ * AMAP_KEY 高德key 用来纠偏
+ * gapMs 分组时间间隔 毫秒 默认 30分钟
+ * rdpEpsilon RDP 精度（度） 默认 0.000001
+ * dbscanEpsilon DBSCAN聚类半径(km) 默认 0.01
+ * minPuts DBSCAN聚类 最小开始聚类点数 默认 20
+ * minDistance 分组数据进行高德纠偏起始纠偏数 默认 20 不能低于20 否则就会纠偏失败，失败也算次数
+ */
+export interface TrajectoryParams {
+  trajectoryThinning?: boolean
+  trajectoryCorrection?: boolean
+  group?: boolean
+  AMAP_KEY?: string
+  gapMs?: number
+  rdpEpsilon?: number
+  dbscanEpsilon?: number
+  minPuts?: number
+  minDistance?: number
+  orderTime?: string
+  serviceName?: string
+}
+export const defaultTrajectoryParams: Required<TrajectoryParams> = {
+  trajectoryThinning: false,
+  trajectoryCorrection: false,
+  group: false,
+  AMAP_KEY: '',
+  gapMs: 1800000,
+  rdpEpsilon: 0.000001,
+  dbscanEpsilon: 0.01,
+  minPuts: 20,
+  minDistance: 20,
+  orderTime: 'f_realtime asc',
+  serviceName: 'af-linepatrol',
+}
+/**
+ *
+ * @param userId 查询的用户id
+ * @param dateStr 查询的轨迹日期
+ * @param trajectoryParams 后台轨迹纠偏参数
+ */
+export async function getDeviceState(
+  userId: string = useUserStore().getLogin().id,
+  dateStr: string = dayjs().format('YYYY-MM-DD'),
+  trajectoryParams: TrajectoryParams = defaultTrajectoryParams,
+) {
+  const condition = `1 = 1 and f_user_id = ${userId}  and (f_realtime between '${dateStr} 00:00:00' and '${dateStr} 23:59:59'`
+  const param = {
+    condition,
+    dateStr,
+    userId,
+    ...trajectoryParams,
+  }
+  // 获取轨迹
+  const trackPoint = await post(`/api/${trajectoryParams.serviceName}/logic/getDeviceStateLogic`, param)
+  // 轨迹数据未处理，需要对原始数据进行 处理
+  if (trackPoint.state === 'error') {
+    // 轨迹抽稀
+    if (trackPoint.points.length >= 30) {
+      // 轨迹抽稀
+      let path = trajectoryThinning(trackPoint.points)
+      // 存储 path 数据供表格使用
+      const webConfig = await getConfigByNameAsync('webConfig')
+      if (webConfig?.setting?.lesseeName === 'jinbin') {
+        path = path.filter(item => item.sp !== '0.0')
+      }
+      // 轨迹分组
+      const trajectoryGroupingResult = trajectoryGrouping(path, {})
+      console.warn('>>>> trajectoryGroupingResult', trajectoryGroupingResult)
+      return trajectoryGroupingResult
+
+      // const graspRoadCorrectRes = await graspRoadCorrect(trajectoryGroupingResult)
+      // console.warn('>>>> graspRoadCorrect', graspRoadCorrectRes)
+      // console.warn('>>>> graspRoadCorrect', graspRoadCorrectRes.value)
+      // 返回数据
+      // return JSON.parse(graspRoadCorrectRes.value)
+    }
+    else {
+      console.warn('当日使用app时间较短或行程较少,不足够生成轨迹')
+    }
+  }
+  if (trackPoint.state === 'success') {
+    return trackPoint.points
+  }
+}

package/src/components/common/otherCharge/ChargePrintSelectorAndRemarks.vue

@@ -1,137 +1,137 @@
-<script setup lang="ts">
-import CardContainer from '@af-mobile-client-vue3/components/data/CardContainer/CardContainer.vue'
-import CardHeader from '@af-mobile-client-vue3/components/data/CardContainer/CardHeader.vue'
-import {
-  Field as VanField,
-  Picker as VanPicker,
-  Popup as VanPopup,
-} from 'vant'
-import { ref, watch } from 'vue'
-
-const props = defineProps<{
-  modelValue: string
-  remarks: string
-}>()
-
-const emit = defineEmits<{
-  (e: 'update:modelValue', value: string): void
-  (e: 'update:remarks', value: string): void
-}>()
-
-const printOptions = [
-  { text: '电子发票', value: '电子发票' },
-  { text: '普通收据', value: '普通收据' },
-  { text: '两者都需要', value: 'both' },
-]
-
-const selectedOption = ref(getOptionText(props.modelValue))
-const remarks = ref(props.remarks)
-const showPicker = ref(false)
-
-function getOptionText(value: string): string {
-  const option = printOptions.find(opt => opt.value === value)
-  return option ? option.text : ''
-}
-
-function onConfirm({ selectedValues }: { selectedValues: string[] }) {
-  selectedOption.value = selectedValues[0]
-  emit('update:modelValue', selectedValues[0])
-  showPicker.value = false
-}
-
-watch(() => remarks.value, (newValue) => {
-  emit('update:remarks', newValue)
-})
-
-// 当从外部更新值时更新内部状态
-watch(() => props.modelValue, (newValue) => {
-  selectedOption.value = getOptionText(newValue)
-})
-
-watch(() => props.remarks, (newValue) => {
-  remarks.value = newValue
-})
-</script>
-
-<template>
-  <CardContainer class="charge-print-and-remarks">
-    <CardHeader title="打印及备注" />
-    <div class="charge-print-options">
-      <div class="charge-print-options__section">
-        <label class="charge-print-options__label">收据打印选项</label>
-        <div class="charge-print-options__selector">
-          <VanField
-            v-model="selectedOption"
-            is-link
-            readonly
-            placeholder="请选择打印方式"
-            @click="showPicker = true"
-          />
-        </div>
-      </div>
-
-      <div class="charge-print-options__section">
-        <label class="charge-print-options__label">备注</label>
-        <div class="charge-print-options__selector">
-          <VanField
-            v-model="remarks"
-            type="textarea"
-            placeholder="可选填写备注信息"
-            rows="2"
-            autosize
-            maxlength="200"
-            show-word-limit
-          />
-        </div>
-      </div>
-
-      <VanPopup v-model:show="showPicker" position="bottom" round teleport="body">
-        <VanPicker
-          :columns="printOptions"
-          show-toolbar
-          title="选择打印方式"
-          @confirm="onConfirm"
-          @cancel="showPicker = false"
-        />
-      </VanPopup>
-    </div>
-  </CardContainer>
-</template>
-
-<style scoped lang="less">
-.charge-print-and-remarks {
-  margin-bottom: 16px;
-}
-
-.charge-print-options {
-  &__section {
-    margin-bottom: 16px;
-
-    &:last-child {
-      margin-bottom: 0;
-    }
-  }
-
-  &__label {
-    display: block;
-    font-size: 12px;
-    font-weight: 500;
-    color: #6b7280;
-    margin-bottom: 4px;
-  }
-
-  &__selector {
-    position: relative;
-
-    :deep(.van-field) {
-      background-color: #f9fafb;
-      border-radius: 6px;
-    }
-  }
-
-  :deep(.van-field__control) {
-    background-color: #f9fafb;
-    border-radius: 6px;
-  }
-}
-</style>
+<script setup lang="ts">
+import CardContainer from '@af-mobile-client-vue3/components/data/CardContainer/CardContainer.vue'
+import CardHeader from '@af-mobile-client-vue3/components/data/CardContainer/CardHeader.vue'
+import {
+  Field as VanField,
+  Picker as VanPicker,
+  Popup as VanPopup,
+} from 'vant'
+import { ref, watch } from 'vue'
+
+const props = defineProps<{
+  modelValue: string
+  remarks: string
+}>()
+
+const emit = defineEmits<{
+  (e: 'update:modelValue', value: string): void
+  (e: 'update:remarks', value: string): void
+}>()
+
+const printOptions = [
+  { text: '电子发票', value: '电子发票' },
+  { text: '普通收据', value: '普通收据' },
+  { text: '两者都需要', value: 'both' },
+]
+
+const selectedOption = ref(getOptionText(props.modelValue))
+const remarks = ref(props.remarks)
+const showPicker = ref(false)
+
+function getOptionText(value: string): string {
+  const option = printOptions.find(opt => opt.value === value)
+  return option ? option.text : ''
+}
+
+function onConfirm({ selectedValues }: { selectedValues: string[] }) {
+  selectedOption.value = selectedValues[0]
+  emit('update:modelValue', selectedValues[0])
+  showPicker.value = false
+}
+
+watch(() => remarks.value, (newValue) => {
+  emit('update:remarks', newValue)
+})
+
+// 当从外部更新值时更新内部状态
+watch(() => props.modelValue, (newValue) => {
+  selectedOption.value = getOptionText(newValue)
+})
+
+watch(() => props.remarks, (newValue) => {
+  remarks.value = newValue
+})
+</script>
+
+<template>
+  <CardContainer class="charge-print-and-remarks">
+    <CardHeader title="打印及备注" />
+    <div class="charge-print-options">
+      <div class="charge-print-options__section">
+        <label class="charge-print-options__label">收据打印选项</label>
+        <div class="charge-print-options__selector">
+          <VanField
+            v-model="selectedOption"
+            is-link
+            readonly
+            placeholder="请选择打印方式"
+            @click="showPicker = true"
+          />
+        </div>
+      </div>
+
+      <div class="charge-print-options__section">
+        <label class="charge-print-options__label">备注</label>
+        <div class="charge-print-options__selector">
+          <VanField
+            v-model="remarks"
+            type="textarea"
+            placeholder="可选填写备注信息"
+            rows="2"
+            autosize
+            maxlength="200"
+            show-word-limit
+          />
+        </div>
+      </div>
+
+      <VanPopup v-model:show="showPicker" position="bottom" round teleport="body">
+        <VanPicker
+          :columns="printOptions"
+          show-toolbar
+          title="选择打印方式"
+          @confirm="onConfirm"
+          @cancel="showPicker = false"
+        />
+      </VanPopup>
+    </div>
+  </CardContainer>
+</template>
+
+<style scoped lang="less">
+.charge-print-and-remarks {
+  margin-bottom: 16px;
+}
+
+.charge-print-options {
+  &__section {
+    margin-bottom: 16px;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  &__label {
+    display: block;
+    font-size: 12px;
+    font-weight: 500;
+    color: #6b7280;
+    margin-bottom: 4px;
+  }
+
+  &__selector {
+    position: relative;
+
+    :deep(.van-field) {
+      background-color: #f9fafb;
+      border-radius: 6px;
+    }
+  }
+
+  :deep(.van-field__control) {
+    background-color: #f9fafb;
+    border-radius: 6px;
+  }
+}
+</style>