af-mobile-client-vue3 1.3.26 → 1.3.28

package/package.json

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

package/src/components/data/XForm/index.vue

@@ -208,7 +208,7 @@ async function initWithGroupFormItems() {
 function setupFormConfig(config: GroupFormItems) {
   loadParamLogicNameData(config.paramLogicName)
   formConfig.value = config
-  myServiceName.value = props.serviceName || ''
+  myServiceName.value = props.serviceName
   formGroupName.value = config.groupName || 'default'
   form.value = props.formData || {}
   // 清理并重新设置验证规则

package/src/utils/queryFormDefaultRangePicker.ts

@@ -1,57 +1,57 @@
-/**
- * 根据类型获取日期区间字符串
- * @param type '当年' | 'curMonth' | '当日'
- * @param show 区分实际值还是显示值, true为实际值, false为显示值
- * @returns [start, end] 例：['2024-01-01 00:00:00', '2024-12-31 23:59:59']
- */
-export function getRangeByType(type: string, show: boolean): [string, string] {
-  const now = new Date()
-  const year = now.getFullYear()
-  const month = (now.getMonth() + 1).toString().padStart(2, '0')
-  const day = now.getDate().toString().padStart(2, '0')
-
-  if (!show) {
-    if (type === 'curYear') {
-      return [
-        `${year}-01-01 00:00:00`,
-        `${year}-12-31 23:59:59`,
-      ]
-    }
-    if (type === 'curMonth') {
-      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
-      return [
-        `${year}-${month}-01 00:00:00`,
-        `${year}-${month}-${lastDay.toString().padStart(2, '0')} 23:59:59`,
-      ]
-    }
-    if (type === 'curDay') {
-      return [
-        `${year}-${month}-${day} 00:00:00`,
-        `${year}-${month}-${day} 23:59:59`,
-      ]
-    }
-  }
-  if (show) {
-    if (type === 'curYear') {
-      return [
-        `${year}-01-01`,
-        `${year}-12-31`,
-      ]
-    }
-    if (type === 'curMonth') {
-      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
-      return [
-        `${year}-${month}-01`,
-        `${year}-${month}-${lastDay.toString().padStart(2, '0')}`,
-      ]
-    }
-    if (type === 'curDay') {
-      return [
-        `${year}-${month}-${day}`,
-        `${year}-${month}-${day}`,
-      ]
-    }
-  }
-  // 兜底返回空字符串数组
-  return ['', '']
-}
+/**
+ * 根据类型获取日期区间字符串
+ * @param type '当年' | 'curMonth' | '当日'
+ * @param show 区分实际值还是显示值, true为实际值, false为显示值
+ * @returns [start, end] 例：['2024-01-01 00:00:00', '2024-12-31 23:59:59']
+ */
+export function getRangeByType(type: string, show: boolean): [string, string] {
+  const now = new Date()
+  const year = now.getFullYear()
+  const month = (now.getMonth() + 1).toString().padStart(2, '0')
+  const day = now.getDate().toString().padStart(2, '0')
+
+  if (!show) {
+    if (type === 'curYear') {
+      return [
+        `${year}-01-01 00:00:00`,
+        `${year}-12-31 23:59:59`,
+      ]
+    }
+    if (type === 'curMonth') {
+      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
+      return [
+        `${year}-${month}-01 00:00:00`,
+        `${year}-${month}-${lastDay.toString().padStart(2, '0')} 23:59:59`,
+      ]
+    }
+    if (type === 'curDay') {
+      return [
+        `${year}-${month}-${day} 00:00:00`,
+        `${year}-${month}-${day} 23:59:59`,
+      ]
+    }
+  }
+  if (show) {
+    if (type === 'curYear') {
+      return [
+        `${year}-01-01`,
+        `${year}-12-31`,
+      ]
+    }
+    if (type === 'curMonth') {
+      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
+      return [
+        `${year}-${month}-01`,
+        `${year}-${month}-${lastDay.toString().padStart(2, '0')}`,
+      ]
+    }
+    if (type === 'curDay') {
+      return [
+        `${year}-${month}-${day}`,
+        `${year}-${month}-${day}`,
+      ]
+    }
+  }
+  // 兜底返回空字符串数组
+  return ['', '']
+}

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

@@ -1,27 +1,19 @@
 <script setup lang="ts">
 import XCellList from '@af-mobile-client-vue3/components/data/XCellList/index.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'
 
 // 定义事件
 const emit = defineEmits(['deleteRow'])
-
-// 多选操作配置
-const multiSelectActions = ref([
-  { name: '批量审核', key: 'batchAudit', color: '#000000', icon: 'passed' },
-])
-
-const userInfo = useUserStore().getUserInfo()
 // 访问路由
 const router = useRouter()
 // 获取默认值
 const idKey = ref('o_id')
 
 // 简易crud表单测试
-const configName = ref('lngChargeAuditMobileCRUD')
-const serviceName = ref('af-gaslink')
+const configName = ref('mobile_meterInfoManageCRUD')
+const serviceName = ref('af-revenue')
 
 // 资源权限测试
 // const configName = ref('crud_sources_test')
@@ -95,31 +87,18 @@ function toDetail(item) {
 function deleteRow(result) {
   emit('deleteRow', result.o_id)
 }
-
-// 多选操作处理
-function handleMultiSelectAction(action: string, selectedItems: any[], selectedItemsArray: any[]) {
-  console.log('多选操作:', action, selectedItems, selectedItemsArray)
-}
-
-// 选择变化处理
-function handleSelectionChange(selectedItems: any[]) {
-  console.log('选择变化，当前选中:', selectedItems.length, '个项目')
-  // 可以在这里更新UI状态，比如显示选中数量等
-}
 </script>
 
 <template>
   <NormalDataLayout id="XCellListView" title="工作计划">
     <template #layout_content>
       <XCellList
-        config-name="lngChargeAuditMobileCRUD"
-        service-name="af-gaslink"
-        :enable-multi-select="true"
-        id-key="rr_id"
-        :multi-select-actions="multiSelectActions"
+        :config-name="configName"
+        :service-name="serviceName"
+        :fix-query-form="{ o_f_oper_name: 'edu_test' }"
+        :id-key="idKey"
         @to-detail="toDetail"
-        @multi-select-action="handleMultiSelectAction"
-        @selection-change="handleSelectionChange"
+        @delete-row="deleteRow"
       />
     </template>
   </NormalDataLayout>

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

@@ -5,19 +5,16 @@ 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('form_check_test')
-// const serviceName = ref('af-system')
+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 configName = ref('lngChargeAuditMobileFormGroup')
+// const serviceName = ref('af-gaslink')
 
 const formData = ref({})
 const formGroup = ref(null)
@@ -25,8 +22,7 @@ const route = useRoute()
 const isInit = ref(false)
 function submit(_result) {
   showDialog({ message: '提交成功' }).then(() => {
-    console.log('12121')
-    // history.back()
+    history.back()
   })
 }
 
@@ -67,8 +63,8 @@ function submit(_result) {
       <!--      v-if="isInit" -->
       <XFormGroup
         ref="formGroup"
-        config-name="ApplyAddContractFormGroup"
-        service-name="af-apply"
+        :config-name="configName"
+        :service-name="serviceName"
         :group-form-data="formData"
         mode="新增"
         @submit="submit"

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

@@ -107,29 +107,46 @@ const uploadStatusTag = computed(() => {
 
 onMounted(() => {
   if (roleName.includes('需要定位人员')) {
-    // 立即执行一次
-    mobileUtil.execute({
-      param: {},
-      funcName: 'getLastRealtimeUploadResult',
-      callbackFunc: (result: PhoneLocationStatus) => {
-        if (result.status === 'success') {
-          lastUploadResult.value = result.data
-        }
-      },
-    })
-
-    // 设置每5秒执行一次的定时器
-    intervalId = setInterval(() => {
+    try {
       mobileUtil.execute({
         param: {},
         funcName: 'getLastRealtimeUploadResult',
         callbackFunc: (result: PhoneLocationStatus) => {
-          if (result.status === 'success') {
-            lastUploadResult.value = result.data
+          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)
           }
         },
       })
-    }, 5000) // 5000毫秒 = 5秒
+    }
+    catch (err) {
+      console.error('首次获取定位信息异常:', err)
+    }
   }
 })
 

package/vite.config.ts

@@ -68,6 +68,13 @@ export default ({ mode }: ConfigEnv): UserConfig => {
           changeOrigin: true,
           rewrite: path => path.replace(/^\/linepatrol\/geoserver/, '/geoserver'),
         },
+        '/api/af-revenue': {
+          // target: v4Server,
+          rewrite: (path: string) => path.replace(/^\/api\/af-revenue\//, '/'),
+          target: 'http://127.0.0.1:9026',
+          ws: false,
+          changeOrigin: true,
+        },
         '/api': {
           // v3用
           // rewrite: (path: string) => path.replace(/^\/api\/af-system\//, '/rs/'),