af-mobile-client-vue3 1.3.51 → 1.3.53

package/src/views/user/my/index.vue

@@ -18,7 +18,7 @@ const showModifyPassword = ref(false)
 // 退出登录确认弹窗显示状态
 const showLogoutConfirm = ref(false)
 // 在setup函数中
-let intervalId = null
+let intervalId: number | null = null
 
 // 定义一个变量来存储上一次的上传结果
 const lastUploadResult = ref(null)
@@ -51,102 +51,73 @@ interface UploadResult {
 }
 
 // 兼容 lastUploadResult 可能为字符串或对象
-const lastUploadResultObj = computed<UploadResult | null>(() => {
-  if (!lastUploadResult.value)
-    return null
-  if (typeof lastUploadResult.value === 'string') {
-    try {
-      return JSON.parse(lastUploadResult.value)
-    }
-    catch {
-      return null
-    }
-  }
-  return lastUploadResult.value
-})
+interface LocationStatusTag { text: string, color: 'red' | 'green' | 'yellow' }
+interface LocationStatusInfo { uploadTime: string, latitude: number, longitude: number }
 
-const uploadDisplayInfo = computed(() => {
-  const result = lastUploadResultObj.value
-  if (!result)
-    return { error: null, info: null }
-  // response.code 不为 200
-  if (result.response && result.response.code !== 200) {
-    return { error: result.response.msg || '未知错误', info: null }
+const locationStatus = computed(() => {
+  console.warn('上次定位信息:', lastUploadResult.value)
+  if (lastUploadResult.value === null) {
+    return { error: null, statusTag: { text: '正在获取上次上传定位信息', color: 'yellow' } }
+  }
+  if (lastUploadResult.value.status === 'error') {
+    console.warn('上次定位信息解析失败:', lastUploadResult.value)
+    return { error: null, statusTag: { text: lastUploadResult.value.msg, color: 'yellow' } }
   }
 
-  // location.errorCode 存在且 isError 为 true
-  if (result.location && result.location.isError && result.location.errorCode) {
-    return { error: result.location.errorCode, info: null }
+  if (lastUploadResult.value.data.location && lastUploadResult.value.data.location.isError) {
+    const error = lastUploadResult.value.data.location.errorCode
+    return { error, info: null, statusTag: { text: '获取定位失败', color: 'red' } }
   }
 
-  // 正常展示
-  if (result.location) {
-    return {
-      error: null,
-      info: {
-        uploadTime: result.uploadTime,
-        latitude: result.location.f_latitude,
-        longitude: result.location.f_longitude,
-      },
+  if (lastUploadResult.value.data.location) {
+    const info: LocationStatusInfo = {
+      uploadTime: lastUploadResult.value.data.uploadTime,
+      latitude: lastUploadResult.value.data.location.f_latitude,
+      longitude: lastUploadResult.value.data.location.f_longitude,
     }
+    return { error: null, info, statusTag: { text: '正在上传定位', color: 'green' } }
   }
 
-  return { error: null, info: null }
+  return { error: null, info: null, statusTag: null }
 })
 
-const uploadStatusTag = computed(() => {
-  const result = uploadDisplayInfo.value
-  if (result.error) {
-    return { text: '上传定位失败', color: 'red' }
+// 安全获取上次实时上传结果（封装 try/catch，避免初始化失败）
+function fetchLastRealtimeUploadResult(): void {
+  try {
+    mobileUtil.execute({
+      param: {},
+      funcName: 'getLastRealtimeUploadResult',
+      callbackFunc: (res: PhoneLocationStatus) => {
+        try {
+          console.warn('获取到的上次定位信息:', res)
+          if (res && res.status === 'success') {
+            lastUploadResult.value = res
+          }
+          else {
+            // 失败也不抛错，保留可能的返回内容用于显示错误状态
+            lastUploadResult.value = res ?? null
+          }
+        }
+        catch (err) {
+          console.error('处理定位回调异常:', err)
+        }
+      },
+    })
   }
-  if (result.info) {
-    return { text: '正在上传定位', color: 'green' }
+  catch (err) {
+    console.error('获取定位信息异常:', err)
   }
-  return null
-})
+}
 
 onMounted(() => {
   if (roleName?.includes('需要定位人员')) {
-    try {
-      mobileUtil.execute({
-        param: {},
-        funcName: 'getLastRealtimeUploadResult',
-        callbackFunc: (result: PhoneLocationStatus) => {
-          try {
-            if (result.status === 'success') {
-              lastUploadResult.value = result.data
-
-              // 首次成功才启动定时器
-              intervalId = setInterval(() => {
-                try {
-                  mobileUtil.execute({
-                    param: {},
-                    funcName: 'getLastRealtimeUploadResult',
-                    callbackFunc: (res: PhoneLocationStatus) => {
-                      if (res.status === 'success') {
-                        lastUploadResult.value = res.data
-                      }
-                    },
-                  })
-                }
-                catch (err) {
-                  console.error('定时获取定位信息异常:', err)
-                }
-              }, 10000)
-            }
-            else {
-              console.warn('首次定位获取失败，不启动定时器:', result)
-            }
-          }
-          catch (err) {
-            console.error('处理首次定位结果异常:', err)
-          }
-        },
-      })
-    }
-    catch (err) {
-      console.error('首次获取定位信息异常:', err)
-    }
+    // 立即尝试获取一次（失败也不会阻断初始化）
+    fetchLastRealtimeUploadResult()
+
+    // 无论首次结果如何，都启动定时器持续获取
+    intervalId = window.setInterval(() => {
+      fetchLastRealtimeUploadResult()
+    }, 10000)
   }
 })
 
@@ -208,10 +179,10 @@ const webMobileConfig = useSettingStore().getSetting()
             <h2 class="username">
               {{ username }}
               <span
-                v-if="uploadStatusTag"
-                class="upload-status-tag" :class="[uploadStatusTag.color]"
+                v-if="locationStatus.statusTag"
+                class="upload-status-tag" :class="[locationStatus.statusTag.color]"
               >
-                {{ uploadStatusTag.text }}
+                {{ locationStatus.statusTag.text }}
               </span>
             </h2>
             <p class="user-role">
@@ -403,6 +374,11 @@ const webMobileConfig = useSettingStore().getSetting()
               background: #fdeaea;
               border: 1px solid #ef4444;
             }
+            &.yellow {
+              color: #f59e0b;
+              background: #fffbeb;
+              border: 1px solid #f59e0b;
+            }
           }
 
           .user-role {

package/src/views/user/register/index.vue

@@ -313,7 +313,7 @@ async function submitRegistration(): Promise<void> {
     if (response.success) {
       showSuccess.value = true
       showSuccessToast('注册成功')
-    }
+    }
     else {
       showSuccessToast(`注册失败,${response.msg}!`)
     }

package/vite.config.ts

@@ -1,114 +1,114 @@
-import type { ConfigEnv, UserConfig } from 'vite'
-import path from 'node:path'
-import process from 'node:process'
-import { loadEnv } from 'vite'
-import { createVitePlugins } from './build/vite'
-import { exclude, include } from './build/vite/optimize'
-
-export default ({ mode }: ConfigEnv): UserConfig => {
-  const root = process.cwd()
-  const env = loadEnv(mode, root)
-
-  const appProxys = {}
-
-  const v4Server = 'http://192.168.50.67:31567'
-  const v3Server = 'http://192.168.50.67:31567'
-  const OSSServerDev = 'http://192.168.50.67:30351'
-  const geoserver = 'http://39.104.49.8:30372'
-  const mockServer = 'http://127.0.0.1:8086'
-  // const OSSServerProd = 'http://192.168.50.67:31351'
-
-  return {
-    base: env.VITE_APP_PUBLIC_PATH,
-    plugins: createVitePlugins(mode),
-
-    server: {
-      host: true,
-      port: 7190,
-      allowedHosts: [
-        'www.aofengcloud.com',
-        '.aofengcloud.com',
-      ],
-      proxy: Object.assign({
-        '/api/af-system/user': {
-          target: 'http://127.0.0.1:9002/',
-          rewrite: (path: string) => path.replace(/^\/api\/af-system\//, '/'),
-          ws: false,
-          changeOrigin: true,
-        },
-        '/api/invoice': {
-          target: 'http://219.153.176.6:8400/',
-          rewrite: (path: string) => path.replace(/^\/api\//, '/'),
-          ws: false,
-          changeOrigin: true,
-        },
-        '/api/af-system/entity/t_files': {
-          target: v3Server,
-          ws: false,
-          changeOrigin: true,
-        },
-        '/resource': {
-          // pathRewrite: { '^/resource': '/' },
-          target: v4Server,
-          changeOrigin: true,
-        },
-        // '/api/af-auth/login': {
-        //   target: 'http://127.0.0.1:9200/',
-        //   rewrite: (path: string) => path.replace(/^\/api\/af-auth\//, '/'),
-        //   ws: false,
-        //   changeOrigin: true,
-        // },
-        // geoserver 转发
-        '/linepatrol/geoserver': {
-          target: geoserver,
-          changeOrigin: true,
-          rewrite: path => path.replace(/^\/linepatrol\/geoserver/, '/geoserver'),
-        },
-        '/api': {
-          // v3用
-          // rewrite: (path: string) => path.replace(/^\/api\/af-system\//, '/rs/'),
-          target: v4Server,
-          ws: false,
-          changeOrigin: true,
-        },
-        '/oss': {
-          target: OSSServerDev,
-          rewrite: (path: string) => path.replace(/^\/oss\//, '/'),
-          changeOrigin: true,
-        },
-      }, appProxys),
-    },
-
-    resolve: {
-      alias: {
-        '@': path.join(__dirname, './src'),
-        '~': path.join(__dirname, './src/assets'),
-        '~root': path.join(__dirname, '.'),
-        '@af-mobile-client-vue3': path.join(__dirname, './src'),
-      },
-    },
-
-    build: {
-      cssCodeSplit: false,
-      chunkSizeWarningLimit: 2048,
-      outDir: `./dist/${env.VITE_APP_OUT_DIR}`,
-      rollupOptions: {
-        output: {
-          // 打包时分割资源
-          chunkFileNames: 'static/js/[name]-[hash].js',
-          entryFileNames: 'static/js/[name]-[hash].js',
-          assetFileNames: 'static/[ext]/[name]-[hash].[ext]',
-          manualChunks(id) {
-            if (id.includes('node_modules'))
-              return 'third' // 代码分割为第三方包
-
-            if (id.includes('views'))
-              return 'views' // 代码分割为业务视图
-          },
-        },
-      },
-    },
-
-    optimizeDeps: { include, exclude },
-  }
-}
+import type { ConfigEnv, UserConfig } from 'vite'
+import path from 'node:path'
+import process from 'node:process'
+import { loadEnv } from 'vite'
+import { createVitePlugins } from './build/vite'
+import { exclude, include } from './build/vite/optimize'
+
+export default ({ mode }: ConfigEnv): UserConfig => {
+  const root = process.cwd()
+  const env = loadEnv(mode, root)
+
+  const appProxys = {}
+
+  const v4Server = 'http://192.168.50.67:31567'
+  const v3Server = 'http://192.168.50.67:31567'
+  const OSSServerDev = 'http://192.168.50.67:30351'
+  const geoserver = 'http://39.104.49.8:30372'
+  const mockServer = 'http://127.0.0.1:8086'
+  // const OSSServerProd = 'http://192.168.50.67:31351'
+
+  return {
+    base: env.VITE_APP_PUBLIC_PATH,
+    plugins: createVitePlugins(mode),
+
+    server: {
+      host: true,
+      port: 80,
+      allowedHosts: [
+        'www.aofengcloud.com',
+        '.aofengcloud.com',
+      ],
+      proxy: Object.assign({
+        // '/api/af-system/user': {
+        //   target: 'http://127.0.0.1:9002/',
+        //   rewrite: (path: string) => path.replace(/^\/api\/af-system\//, '/'),
+        //   ws: false,
+        //   changeOrigin: true,
+        // },
+        '/api/invoice': {
+          target: 'http://219.153.176.6:8400/',
+          rewrite: (path: string) => path.replace(/^\/api\//, '/'),
+          ws: false,
+          changeOrigin: true,
+        },
+        '/api/af-system/entity/t_files': {
+          target: v3Server,
+          ws: false,
+          changeOrigin: true,
+        },
+        '/resource': {
+          // pathRewrite: { '^/resource': '/' },
+          target: v4Server,
+          changeOrigin: true,
+        },
+        // '/api/af-auth/login': {
+        //   target: 'http://127.0.0.1:9200/',
+        //   rewrite: (path: string) => path.replace(/^\/api\/af-auth\//, '/'),
+        //   ws: false,
+        //   changeOrigin: true,
+        // },
+        // geoserver 转发
+        '/linepatrol/geoserver': {
+          target: geoserver,
+          changeOrigin: true,
+          rewrite: path => path.replace(/^\/linepatrol\/geoserver/, '/geoserver'),
+        },
+        '/api': {
+          // v3用
+          // rewrite: (path: string) => path.replace(/^\/api\/af-system\//, '/rs/'),
+          target: v4Server,
+          ws: false,
+          changeOrigin: true,
+        },
+        '/oss': {
+          target: OSSServerDev,
+          rewrite: (path: string) => path.replace(/^\/oss\//, '/'),
+          changeOrigin: true,
+        },
+      }, appProxys),
+    },
+
+    resolve: {
+      alias: {
+        '@': path.join(__dirname, './src'),
+        '~': path.join(__dirname, './src/assets'),
+        '~root': path.join(__dirname, '.'),
+        '@af-mobile-client-vue3': path.join(__dirname, './src'),
+      },
+    },
+
+    build: {
+      cssCodeSplit: false,
+      chunkSizeWarningLimit: 2048,
+      outDir: `./dist/${env.VITE_APP_OUT_DIR}`,
+      rollupOptions: {
+        output: {
+          // 打包时分割资源
+          chunkFileNames: 'static/js/[name]-[hash].js',
+          entryFileNames: 'static/js/[name]-[hash].js',
+          assetFileNames: 'static/[ext]/[name]-[hash].[ext]',
+          manualChunks(id) {
+            if (id.includes('node_modules'))
+              return 'third' // 代码分割为第三方包
+
+            if (id.includes('views'))
+              return 'views' // 代码分割为业务视图
+          },
+        },
+      },
+    },
+
+    optimizeDeps: { include, exclude },
+  }
+}