af-mobile-client-vue3 1.3.18 → 1.3.20

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

@@ -1,20 +1,145 @@
 <script setup lang="ts">
+import type { PhoneLocationStatus } from '~root/src/components/data/XOlMap/types'
 import useSettingStore from '@af-mobile-client-vue3/stores/modules/setting'
 import useUserStore from '@af-mobile-client-vue3/stores/modules/user'
 import { Dialog as vanDialog, Icon as vanIcon } from 'vant'
-import { ref } from 'vue'
+import { computed, onMounted, onUnmounted, ref } from 'vue'
 import { useRouter } from 'vue-router'
+import { mobileUtil } from '~root/src/utils/mobileUtil'
 import ModifyPassword from './comm/ModifyPassword.vue'
 
 const router = useRouter()
 const username = useUserStore().getUserInfo().name
 const fullnames = useUserStore().getLogin().f.resources.fullnames
+const roleName = useUserStore().getLogin().f.resources.f_role_name
 
 // 修改密码弹窗显示状态
 const showModifyPassword = ref(false)
 // 退出登录确认弹窗显示状态
 const showLogoutConfirm = ref(false)
+// 在setup函数中
+let intervalId = null
+
+// 定义一个变量来存储上一次的上传结果
+const lastUploadResult = ref(null)
+
+/**
+ * 上次上传结果类型定义
+ */
+interface LocationInfo {
+  uploadTime: string
+  f_realtime: string
+  f_latitude: number
+  f_longitude: number
+  f_address?: string
+  f_speed?: number
+  f_bearing?: number
+  f_altitude?: number
+  isError: boolean
+  errorCode?: string
+  // ... 其他字段
+}
+
+interface UploadResult {
+  uploadTime: string
+  location: LocationInfo
+  response: {
+    code: number
+    msg?: string
+    [key: string]: any
+  }
+}
+
+// 兼容 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
+})
+
+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 }
+  }
+
+  // location.errorCode 存在且 isError 为 true
+  if (result.location && result.location.isError && result.location.errorCode) {
+    return { error: result.location.errorCode, info: null }
+  }
+
+  // 正常展示
+  if (result.location) {
+    return {
+      error: null,
+      info: {
+        uploadTime: result.uploadTime,
+        latitude: result.location.f_latitude,
+        longitude: result.location.f_longitude,
+      },
+    }
+  }
+
+  return { error: null, info: null }
+})
 
+const uploadStatusTag = computed(() => {
+  const result = uploadDisplayInfo.value
+  if (result.error) {
+    return { text: '上传定位失败', color: 'red' }
+  }
+  if (result.info) {
+    return { text: '正在上传定位', color: 'green' }
+  }
+  return null
+})
+
+onMounted(() => {
+  if (roleName.includes('需要定位人员')) {
+    // 立即执行一次
+    mobileUtil.execute({
+      param: {},
+      funcName: 'getLastRealtimeUploadResult',
+      callbackFunc: (result: PhoneLocationStatus) => {
+        if (result.status === 'success') {
+          lastUploadResult.value = result.data
+        }
+      },
+    })
+
+    // 设置每5秒执行一次的定时器
+    intervalId = setInterval(() => {
+      mobileUtil.execute({
+        param: {},
+        funcName: 'getLastRealtimeUploadResult',
+        callbackFunc: (result: PhoneLocationStatus) => {
+          if (result.status === 'success') {
+            lastUploadResult.value = result.data
+          }
+        },
+      })
+    }, 5000) // 5000毫秒 = 5秒
+  }
+})
+
+onUnmounted(() => {
+  // 组件卸载时清除定时器
+  if (intervalId) {
+    clearInterval(intervalId)
+    intervalId = null
+  }
+})
 function exit_login() {
   showLogoutConfirm.value = true
 }
@@ -65,6 +190,12 @@ const webMobileConfig = useSettingStore().getSetting()
           <div class="user-detail">
             <h2 class="username">
               {{ username }}
+              <span
+                v-if="uploadStatusTag"
+                class="upload-status-tag" :class="[uploadStatusTag.color]"
+              >
+                {{ uploadStatusTag.text }}
+              </span>
             </h2>
             <p class="user-role">
               {{ fullnames }}
@@ -237,6 +368,25 @@ const webMobileConfig = useSettingStore().getSetting()
             color: #333;
             margin: 0 0 4px 0;
           }
+          .upload-status-tag {
+            display: inline-block;
+            margin-left: 8px;
+            padding: 2px 8px;
+            border-radius: 8px;
+            font-size: 12px;
+            font-weight: 400;
+            background: #f0f0f0;
+            &.green {
+              color: #10b981;
+              background: #e6f9f0;
+              border: 1px solid #10b981;
+            }
+            &.red {
+              color: #ef4444;
+              background: #fdeaea;
+              border: 1px solid #ef4444;
+            }
+          }
 
           .user-role {
             font-size: 14px;

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

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { openApiLogic } from '@af-mobile-client-vue3/services/api/common'
+import { getConfigByName, openApiLogic } from '@af-mobile-client-vue3/services/api/common'
 import { useSettingStore } from '@af-mobile-client-vue3/stores/modules/setting'
 import {
   showFailToast,
@@ -24,6 +24,7 @@ interface FormData {
   name: string
   phone: string
   gender: string
+  code: string
   email: string
   username: string
   password: string
@@ -62,6 +63,7 @@ const formData = ref<FormData>({
   name: '',
   phone: '',
   gender: '',
+  code: '',
   email: '',
   username: '',
   password: '',
@@ -79,6 +81,8 @@ const openId = ref('')
 // 错误信息
 const errors = ref<Errors>({})
 
+const registerConfig = ref({})
+
 // 状态管理
 const isSubmitting = ref<boolean>(false)
 const showSuccess = ref<boolean>(false)
@@ -106,6 +110,14 @@ function validateName(): boolean {
   delete errors.value.name
   return true
 }
+function validateCode(): boolean {
+  if (!formData.value.code.trim()) {
+    errors.value.code = '员工编号不能为空'
+    return false
+  }
+  delete errors.value.code
+  return true
+}
 
 function validatePhone(): boolean {
   const phoneRegex = /^1[3-9]\d{9}$/
@@ -205,6 +217,7 @@ function validateGender(): boolean {
 function validateAll(): boolean {
   const validations = [
     validateName(),
+    validateCode(),
     validatePhone(),
     validateEmail(),
     validateUsername(),
@@ -268,6 +281,18 @@ async function fetchOrganizationInfo(strategyId: any): Promise<void> {
   }
 }
 
+async function initConfig(): Promise<void> {
+  try {
+    getConfigByName('registerConfig', (res: any) => {
+      console.log('res', res)
+    }, 'af-system')
+  }
+  catch (error) {
+    console.error('获取组织信息失败:', error)
+    showToast('获取组织信息失败')
+  }
+}
+
 // 提交注册
 async function submitRegistration(): Promise<void> {
   if (usernameStatus.value === 'checking') {
@@ -302,6 +327,7 @@ function resetForm(): void {
     name: '',
     phone: '',
     gender: '',
+    code: '',
     email: '',
     username: '',
     password: '',
@@ -357,6 +383,8 @@ function goBack() {
 
 // 组件挂载时获取组织信息
 onMounted(async () => {
+  console.log('route.query', route.query)
+  console.log('route.params', route.params)
   const strategyId = route.query.strategyId || route.params.strategyId
   openId.value = route.query.openId as string || route.params.openId as string
   formData.value.openId = openId.value
@@ -450,16 +478,30 @@ onMounted(async () => {
               </template>
               <template #input>
                 <VanRadioGroup v-model="formData.gender" @change="validateGender">
-                  <VanRadio name="male">
+                  <VanRadio name="男">
                     男
                   </VanRadio>
-                  <VanRadio name="female">
+                  <VanRadio name="女">
                     女
                   </VanRadio>
                 </VanRadioGroup>
               </template>
             </VanField>
-
+            <!-- 员工编号 -->
+            <VanField
+              v-model="formData.code"
+              label="员工编号"
+              placeholder="请输入员工编号"
+              :error="!!errors.code"
+              :error-message="errors.code"
+              label-align="top"
+              @blur="validateCode"
+            >
+              <template #label>
+                <i class="i-solar-user-id-bold text-purple-500" />
+                员工编号 <span class="required">*</span>
+              </template>
+            </VanField>
             <!-- 邮箱 -->
             <VanField
               v-model="formData.email"

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

@@ -1,97 +0,0 @@
-<script setup lang="ts">
-import XFormGroup from '@af-mobile-client-vue3/components/data/XFormGroup/index.vue'
-import { runLogic } from '@af-mobile-client-vue3/services/api/common'
-import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
-import dayjs from 'dayjs/esm/index'
-import { showToast } from 'vant'
-import { onMounted, ref } from 'vue'
-import { useRoute } from 'vue-router'
-
-const configName = ref('appapplyuserinfoFormGroup')
-const serviceName = ref('af-apply')
-const route = useRoute()
-const userInfo = useUserStore().getUserInfo()
-const workflowId = ref('3045')
-const userinfoid = ref('93116')
-const model = ref('编辑')
-const groupFormData = ref({})
-
-function submit(res) {
-  if (model.value === '新增') {
-    res.t_userinfo.f_operate_date = dayjs().format('YYYY-MM-DD HH:mm:ss')
-    res.t_userinfo.f_orgid = userInfo.f_orgid
-    res.t_userinfo.f_orgname = userInfo.f_orgname
-    res.t_userinfo.f_depid = userInfo.f_depid
-    res.t_userinfo.f_depname = userInfo.f_depname
-    res.t_userinfo.f_operatorid = userInfo.f_operatorid
-    res.t_userinfo.f_operator = userInfo.f_operator
-    res.t_userinfo.f_workflow_id = this.f_workflow_id
-    res.t_userinfo.f_user_state = '预备'
-
-    res.t_userfiles.f_operate_date = dayjs().format('YYYY-MM-DD HH:mm:ss')
-    res.t_userfiles.f_orgid = userInfo.f_orgid
-    res.t_userfiles.f_orgname = userInfo.f_orgname
-    res.t_userfiles.f_depid = userInfo.f_depid
-    res.t_userfiles.f_depname = userInfo.f_depname
-    res.t_userfiles.f_operatorid = userInfo.f_operatorid
-    res.t_userfiles.f_operator = userInfo.f_operator
-    res.t_userfiles.f_workflow_id = this.f_workflow_id
-    res.t_userfiles.f_table_state = '待开通'
-  }
-  let saveData = res
-  if (saveData.t_userfiles.f_gasbrand_id.length > 0) {
-    saveData.t_userfiles.f_gasbrand_id = saveData.t_userfiles.f_gasbrand_id[0]
-  }
-  if (saveData.t_userfiles.f_price_id.length > 0) {
-    saveData.t_userfiles.f_price_id = saveData.t_userfiles.f_price_id[0]
-  }
-  if (model.value === '编辑') {
-    saveData = Object.assign(saveData, {
-      f_operator_record: userInfo.f_operator,
-      f_operatorid_record: userInfo.f_operatorid,
-      f_orgid_record: userInfo.f_orgid,
-      f_orgname_record: userInfo.f_orgname,
-      f_depid_record: userInfo.f_depid,
-      f_depname_record: userInfo.f_depname,
-    })
-  }
-  runLogic('userFIleSaveLogic', saveData, 'af-revenue').then((res) => {
-    showToast('操作成功！')
-    history.back()
-  })
-}
-const isInit = ref(false)
-function init() {
-  if (model.value === '编辑') {
-    runLogic('getFileDetailForEdit', { f_userinfo_id: userinfoid.value }, 'af-revenue').then((res) => {
-      // if (res.t_userfiles.f_gasmodel_id) {
-      //   res.t_userfiles.f_gasmodel_id = 76
-      // }
-      // if (res.t_userfiles.f_price_id) {
-      //   res.t_userfiles.f_price_id = [res.t_userfiles.f_price_id]
-      // }
-      console.log('1111111----,', res)
-      groupFormData.value = res
-      isInit.value = true
-    })
-  }
-}
-onMounted(() => {
-  init()
-})
-</script>
-
-<template>
-  <XFormGroup
-    v-if="isInit"
-    mode="修改"
-    :config-name="configName"
-    :service-name="serviceName"
-    :group-form-data="groupFormData"
-    @submit="submit"
-  />
-</template>
-
-<style scoped lang="less">
-
-</style>