af-mobile-client-vue3 1.5.68 → 1.5.70

package/.env

@@ -1,11 +1,11 @@
-VITE_APP_PUBLIC_PATH=/vue-client-app
-VITE_APP_PREVIEW=true
-VITE_APP_API_BASE_URL=/api
-VITE_APP_OUT_DIR=dist_af-library-mobile-web
-VITE_APP_VCONSOLE=false
-# 自定义参数
-VITE_APP_WEB_CONFIG_KEY=admin.webconfig
-VITE_APP_SYSTEM_NAME=af-system
-# 最低兼容性 V4（最新产品）V3(V3产品) OA(公司OA)
-VITE_APP_COMPATIBLE=V4
-VITE_RSA_PRIVATE_KEY=MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAIRrmftLDHCQqREEJ132Onu+W3vmFbdF7QD751SrcDDGDTfzuz1zBuElvkHhuDBb7KZkXrCIe+MhvX2IvxcLObl3faX+evYlnfj2HRbF0hIpQLuIq22tL06ZcV5w7wqLxUZRpFElIFm8gZTkUvfKXVuHw89e4daDVhU5hK3GHNGTAgMBAAECgYABiINrFaE1E8pkBYx1JJA5yuhL73aUktfd2TeCU00vFg6kyrWCI85Sa2RKu/6CJNZWeOFgdubEUv7a22tRrNIZb3yUMaqtTwSso78mspIOJqjWXTkTH9WPElfTcdpdIse/lgZtPz6egxkuhadSvwrM9Y6NgusiW/5+x95Ct08iOQJBAN5aK+7uISURvGQj2EaRtgGEd8+d4oHl+BYvvTeG3qSgUikHQW3j0sp4gXPw2kxw6sjVgLFOc4FB6LGqwzOTzokCQQCYdYG8ty3Uo/ebUlNzeJFxHXjy/KvBSytAUzAXkRu3nZrkEaPQsi3dgOkZgk+F1fMDzfQ4EbDIU6xvqOoZXHg7AkATCW9XfoXR8anKfRMoP5Nwn9HOMbtR2cmaxK2TknV/bMZ8AsYETYwfj5+tuIJIJybC2RyykX/sIiN1CqS5xr7ZAkArj19rMRdaKyMi8MnBM1Cy9g3Jt2HHj5ejAGG8SgyWUOShh1y70z0BjcSMMkxQXAncK2s83ekZw7aADM4eQupjAkARRgTwwMOnn3IoKmQusKhZk0uxilZ4Zc2LH6Z4GiWnvteM0W8Zw4Z1lJUcjgQq3dGqL2RdmzeQZ+HgPIOXrZVK
+VITE_APP_PUBLIC_PATH=/vue-client-app
+VITE_APP_PREVIEW=true
+VITE_APP_API_BASE_URL=/api
+VITE_APP_OUT_DIR=dist_af-library-mobile-web
+VITE_APP_VCONSOLE=false
+# 自定义参数
+VITE_APP_WEB_CONFIG_KEY=admin.webconfig
+VITE_APP_SYSTEM_NAME=af-system
+# 最低兼容性 V4（最新产品）V3(V3产品) OA(公司OA)
+VITE_APP_COMPATIBLE=V4
+VITE_RSA_PRIVATE_KEY=MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAIRrmftLDHCQqREEJ132Onu+W3vmFbdF7QD751SrcDDGDTfzuz1zBuElvkHhuDBb7KZkXrCIe+MhvX2IvxcLObl3faX+evYlnfj2HRbF0hIpQLuIq22tL06ZcV5w7wqLxUZRpFElIFm8gZTkUvfKXVuHw89e4daDVhU5hK3GHNGTAgMBAAECgYABiINrFaE1E8pkBYx1JJA5yuhL73aUktfd2TeCU00vFg6kyrWCI85Sa2RKu/6CJNZWeOFgdubEUv7a22tRrNIZb3yUMaqtTwSso78mspIOJqjWXTkTH9WPElfTcdpdIse/lgZtPz6egxkuhadSvwrM9Y6NgusiW/5+x95Ct08iOQJBAN5aK+7uISURvGQj2EaRtgGEd8+d4oHl+BYvvTeG3qSgUikHQW3j0sp4gXPw2kxw6sjVgLFOc4FB6LGqwzOTzokCQQCYdYG8ty3Uo/ebUlNzeJFxHXjy/KvBSytAUzAXkRu3nZrkEaPQsi3dgOkZgk+F1fMDzfQ4EbDIU6xvqOoZXHg7AkATCW9XfoXR8anKfRMoP5Nwn9HOMbtR2cmaxK2TknV/bMZ8AsYETYwfj5+tuIJIJybC2RyykX/sIiN1CqS5xr7ZAkArj19rMRdaKyMi8MnBM1Cy9g3Jt2HHj5ejAGG8SgyWUOShh1y70z0BjcSMMkxQXAncK2s83ekZw7aADM4eQupjAkARRgTwwMOnn3IoKmQusKhZk0uxilZ4Zc2LH6Z4GiWnvteM0W8Zw4Z1lJUcjgQq3dGqL2RdmzeQZ+HgPIOXrZVK

package/package.json

@@ -1,121 +1,121 @@
-{
-  "name": "af-mobile-client-vue3",
-  "type": "module",
-  "version": "1.5.68",
-  "packageManager": "pnpm@10.13.1",
-  "description": "Vue + Vite component lib",
-  "engines": {
-    "node": ">=20.19.0"
-  },
-  "scripts": {
-    "dev": "cross-env MOCK_SERVER_PORT=8086 vite",
-    "compress": "node ./compress.js",
-    "build:dev": "vue-tsc --noEmit && vite build --mode development && pnpm run compress",
-    "build:pro": "vue-tsc --noEmit && vite build --mode production && pnpm run compress",
-    "preview": "vite preview",
-    "lint": "eslint .",
-    "lint:fix": "eslint . --fix",
-    "release": "bumpp --commit --push --tag",
-    "typecheck": "vue-tsc --noEmit",
-    "commitlint": "commitlint --edit",
-    "prepare": "simple-git-hooks"
-  },
-  "dependencies": {
-    "@iconify/vue": "4.3.0",
-    "@matechat/core": "^1.11.1",
-    "@micro-zoe/micro-app": "1.0.0-rc.26",
-    "@unhead/vue": "2.0.12",
-    "@vant/area-data": "^2.0.0",
-    "@vant/touch-emulator": "^1.4.0",
-    "@vant/use": "^1.6.0",
-    "@vueuse/core": "^13.5.0",
-    "mermaid": "11.12.2",
-    "axios": "^1.10.0",
-    "bcryptjs": "^2.4.3",
-    "crypto-js": "^4.2.0",
-    "moment": "^2.21.0",
-    "dayjs": "^1.11.13",
-    "echarts": "^5.6.0",
-    "jsencrypt": "^3.3.2",
-    "lodash-es": "^4.17.21",
-    "nprogress": "^0.2.0",
-    "ol": "^10.5.0",
-    "pinia": "^3.0.3",
-    "pinia-plugin-persistedstate": "^4.4.1",
-    "resize-detector": "^0.3.0",
-    "vant": "^4.9.21",
-    "vconsole": "^3.15.1",
-    "vue": "^3.5.17",
-    "vue-i18n": "^11.1.10",
-    "vue-router": "^4.5.1",
-    "vue3-hash-calendar": "^1.1.3",
-    "weixin-js-sdk": "^1.6.5",
-    "js-base64": "^3.7.8"
-  },
-  "devDependencies": {
-    "@antfu/eslint-config": "4.17.0",
-    "@commitlint/cli": "^19.8.1",
-    "@commitlint/config-conventional": "^19.8.1",
-    "@commitlint/types": "^19.8.1",
-    "@iconify/json": "2.2.318",
-    "@iconify/utils": "^2.3.0",
-    "@intlify/unplugin-vue-i18n": "^6.0.8",
-    "@types/crypto-js": "^4.2.2",
-    "@types/lodash-es": "^4.17.12",
-    "@types/node": "^24.0.14",
-    "@types/nprogress": "^0.2.3",
-    "@unocss/eslint-config": "66.3.3",
-    "@vitejs/plugin-legacy": "^7.0.1",
-    "@vitejs/plugin-vue": "^6.0.0",
-    "autoprefixer": "^10.4.21",
-    "bumpp": "^10.2.0",
-    "consola": "^3.4.2",
-    "cross-env": "^7.0.3",
-    "eslint": "^9.31.0",
-    "eslint-plugin-format": "^1.0.1",
-    "less": "^4.4.0",
-    "lint-staged": "^16.1.2",
-    "mockjs": "^1.1.0",
-    "postcss-mobile-forever": "^5.0.0",
-    "rollup": "^4.45.1",
-    "simple-git-hooks": "^2.13.0",
-    "tar": "^7.4.3",
-    "terser": "^5.43.1",
-    "typescript": "^5.8.3",
-    "unocss": "66.3.3",
-    "vite": "^7.0.5",
-    "vite-plugin-compression": "^0.5.1",
-    "vite-plugin-mock-dev-server": "^1.9.1",
-    "vite-plugin-pwa": "^1.0.1",
-    "vite-plugin-sitemap": "^0.8.2",
-    "vite-plugin-vconsole": "^2.1.1",
-    "vite-plugin-vue-devtools": "^7.7.7",
-    "vue-tsc": "^3.0.2"
-  },
-  "pnpm": {
-    "allowedDeprecatedVersions": {
-      "glob": "7.2.3",
-      "inflight": "1.0.6",
-      "sourcemap-codec": "1.4.8"
-    },
-    "peerDependencyRules": {
-      "allowedVersions": {}
-    },
-    "onlyBuiltDependencies": [
-      "core-js",
-      "esbuild",
-      "simple-git-hooks",
-      "unrs-resolver"
-    ]
-  },
-  "resolutions": {
-    "vite": "^7.0.5"
-  },
-  "simple-git-hooks": {
-    "pre-commit": "pnpm lint-staged",
-    "commit-msg": "pnpm commitlint $1"
-  },
-  "lint-staged": {
-    "*": "eslint --fix"
-  }
-}
+{
+  "name": "af-mobile-client-vue3",
+  "type": "module",
+  "version": "1.5.70",
+  "packageManager": "pnpm@10.13.1",
+  "description": "Vue + Vite component lib",
+  "engines": {
+    "node": ">=20.19.0"
+  },
+  "scripts": {
+    "dev": "cross-env MOCK_SERVER_PORT=8086 vite",
+    "compress": "node ./compress.js",
+    "build:dev": "vue-tsc --noEmit && vite build --mode development && pnpm run compress",
+    "build:pro": "vue-tsc --noEmit && vite build --mode production && pnpm run compress",
+    "preview": "vite preview",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
+    "release": "bumpp --commit --push --tag",
+    "typecheck": "vue-tsc --noEmit",
+    "commitlint": "commitlint --edit",
+    "prepare": "simple-git-hooks"
+  },
+  "dependencies": {
+    "@iconify/vue": "4.3.0",
+    "@matechat/core": "^1.11.1",
+    "@micro-zoe/micro-app": "1.0.0-rc.26",
+    "@unhead/vue": "2.0.12",
+    "@vant/area-data": "^2.0.0",
+    "@vant/touch-emulator": "^1.4.0",
+    "@vant/use": "^1.6.0",
+    "@vueuse/core": "^13.5.0",
+    "mermaid": "11.12.2",
+    "axios": "^1.10.0",
+    "bcryptjs": "^2.4.3",
+    "crypto-js": "^4.2.0",
+    "moment": "^2.21.0",
+    "dayjs": "^1.11.13",
+    "echarts": "^5.6.0",
+    "jsencrypt": "^3.3.2",
+    "lodash-es": "^4.17.21",
+    "nprogress": "^0.2.0",
+    "ol": "^10.5.0",
+    "pinia": "^3.0.3",
+    "pinia-plugin-persistedstate": "^4.4.1",
+    "resize-detector": "^0.3.0",
+    "vant": "^4.9.21",
+    "vconsole": "^3.15.1",
+    "vue": "^3.5.17",
+    "vue-i18n": "^11.1.10",
+    "vue-router": "^4.5.1",
+    "vue3-hash-calendar": "^1.1.3",
+    "weixin-js-sdk": "^1.6.5",
+    "js-base64": "^3.7.8"
+  },
+  "devDependencies": {
+    "@antfu/eslint-config": "4.17.0",
+    "@commitlint/cli": "^19.8.1",
+    "@commitlint/config-conventional": "^19.8.1",
+    "@commitlint/types": "^19.8.1",
+    "@iconify/json": "2.2.318",
+    "@iconify/utils": "^2.3.0",
+    "@intlify/unplugin-vue-i18n": "^6.0.8",
+    "@types/crypto-js": "^4.2.2",
+    "@types/lodash-es": "^4.17.12",
+    "@types/node": "^24.0.14",
+    "@types/nprogress": "^0.2.3",
+    "@unocss/eslint-config": "66.3.3",
+    "@vitejs/plugin-legacy": "^7.0.1",
+    "@vitejs/plugin-vue": "^6.0.0",
+    "autoprefixer": "^10.4.21",
+    "bumpp": "^10.2.0",
+    "consola": "^3.4.2",
+    "cross-env": "^7.0.3",
+    "eslint": "^9.31.0",
+    "eslint-plugin-format": "^1.0.1",
+    "less": "^4.4.0",
+    "lint-staged": "^16.1.2",
+    "mockjs": "^1.1.0",
+    "postcss-mobile-forever": "^5.0.0",
+    "rollup": "^4.45.1",
+    "simple-git-hooks": "^2.13.0",
+    "tar": "^7.4.3",
+    "terser": "^5.43.1",
+    "typescript": "^5.8.3",
+    "unocss": "66.3.3",
+    "vite": "^7.0.5",
+    "vite-plugin-compression": "^0.5.1",
+    "vite-plugin-mock-dev-server": "^1.9.1",
+    "vite-plugin-pwa": "^1.0.1",
+    "vite-plugin-sitemap": "^0.8.2",
+    "vite-plugin-vconsole": "^2.1.1",
+    "vite-plugin-vue-devtools": "^7.7.7",
+    "vue-tsc": "^3.0.2"
+  },
+  "pnpm": {
+    "allowedDeprecatedVersions": {
+      "glob": "7.2.3",
+      "inflight": "1.0.6",
+      "sourcemap-codec": "1.4.8"
+    },
+    "peerDependencyRules": {
+      "allowedVersions": {}
+    },
+    "onlyBuiltDependencies": [
+      "core-js",
+      "esbuild",
+      "simple-git-hooks",
+      "unrs-resolver"
+    ]
+  },
+  "resolutions": {
+    "vite": "^7.0.5"
+  },
+  "simple-git-hooks": {
+    "pre-commit": "pnpm lint-staged",
+    "commit-msg": "pnpm commitlint $1"
+  },
+  "lint-staged": {
+    "*": "eslint --fix"
+  }
+}

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/api/user/index.ts

@@ -1,50 +1,50 @@
-import { loginApi } from '@af-mobile-client-vue3/services/api/Login'
-
-import { get, post } from '@af-mobile-client-vue3/services/restTools'
-import { http } from '@af-mobile-client-vue3/utils/http'
-
-export interface BasicResponseModel<T = any> {
-  code: number
-  msg: string
-  data: T
-}
-
-export function login(data: any) {
-  return post(
-    loginApi.Login,
-    data,
-  )
-}
-
-export function OALogin(data: any) {
-  return get(`/af-system/user/${data.username}/${data.password}/智慧OA`)
-}
-
-/**
- * @description: 获取用户信息
- */
-export function getUserInfo(data: any) {
-  const params = {
-    resourceName: data.resourceName,
-    isMobile: true,
-  }
-  return get(
-    `/af-system/user/info/${data.username}`,
-    params,
-  )
-}
-/**
- * @description: 获取微信用户信息
- */
-export function getPlatformUser(params: { platformUserId?: string, tenantName?: string }) {
-  return post(`/af-system/user/getPlatformUserInfo`, params)
-}
-/**
- * @description: 用户登出
- */
-export function doLogout() {
-  return http.request({
-    url: loginApi.Logout,
-    method: 'DELETE',
-  })
-}
+import { loginApi } from '@af-mobile-client-vue3/services/api/Login'
+
+import { get, post } from '@af-mobile-client-vue3/services/restTools'
+import { http } from '@af-mobile-client-vue3/utils/http'
+
+export interface BasicResponseModel<T = any> {
+  code: number
+  msg: string
+  data: T
+}
+
+export function login(data: any) {
+  return post(
+    loginApi.Login,
+    data,
+  )
+}
+
+export function OALogin(data: any) {
+  return get(`/af-system/user/${data.username}/${data.password}/智慧OA`)
+}
+
+/**
+ * @description: 获取用户信息
+ */
+export function getUserInfo(data: any) {
+  const params = {
+    resourceName: data.resourceName,
+    isMobile: true,
+  }
+  return get(
+    `/af-system/user/info/${data.username}`,
+    params,
+  )
+}
+/**
+ * @description: 获取微信用户信息
+ */
+export function getPlatformUser(params: { platformUserId?: string, tenantName?: string }) {
+  return post(`/af-system/user/getPlatformUserInfo`, params)
+}
+/**
+ * @description: 用户登出
+ */
+export function doLogout() {
+  return http.request({
+    url: loginApi.Logout,
+    method: 'DELETE',
+  })
+}