npm - af-mobile-client-vue3 - Versions diffs - 1.6.52 → 1.6.54 - Mend

af-mobile-client-vue3 1.6.52 → 1.6.54

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

package/package.json +1 -1
package/src/components/data/XReportGrid/XReportDemo.vue +33 -33
package/src/components/data/XReportGrid/print.js +184 -184
package/src/stores/modules/safecheckStore.ts +47 -47
package/src/stores/modules/step.ts +88 -88
package/src/utils/PhotoClean.ts +21 -21
package/src/utils/appBackManager.ts +23 -23
package/src/utils/safeBack.ts +38 -38
package/src/utils/timeUtil.ts +27 -27
package/src/views/SafeInspection/SecurityCertificate/index.vue +22 -11
package/src/views/SafeInspection/SecurityCertificate/userInfo/index.vue +1 -1
package/src/views/component/StepView/index.vue +1 -1
package/src/views/component/XFormView/index.vue +18 -5
package/src/views/user/my/index.vue +40 -15
package/vite.config.ts +1 -1

package/package.json CHANGED Viewed

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

package/src/components/data/XReportGrid/XReportDemo.vue CHANGED Viewed

@@ -1,33 +1,33 @@
-<script setup lang="ts">
-import { onMounted, ref } from 'vue'
-import XReport from './XReport.vue'
-const mainRef = ref()
-onMounted(() => {
-  // 初始化逻辑
-})
-</script>
-<template>
-  <div id="test">
-    <van-card :bordered="false">
-      <XReport
-        ref="mainRef"
-        :use-oss-for-img="false"
-        config-name="nurseWorkstationCover"
-        server-name="af-his"
-        :show-img-in-cell="true"
-        :display-only="true"
-        :edit-mode="false"
-        :show-save-button="false"
-        :no-padding="true"
-        :dont-format="true"
-      />
-    </van-card>
-  </div>
-</template>
-<style scoped>
-</style>
+<script setup lang="ts">
+import { onMounted, ref } from 'vue'
+import XReport from './XReport.vue'
+const mainRef = ref()
+onMounted(() => {
+  // 初始化逻辑
+})
+</script>
+<template>
+  <div id="test">
+    <van-card :bordered="false">
+      <XReport
+        ref="mainRef"
+        :use-oss-for-img="false"
+        config-name="nurseWorkstationCover"
+        server-name="af-his"
+        :show-img-in-cell="true"
+        :display-only="true"
+        :edit-mode="false"
+        :show-save-button="false"
+        :no-padding="true"
+        :dont-format="true"
+      />
+    </van-card>
+  </div>
+</template>
+<style scoped>
+</style>

package/src/components/data/XReportGrid/print.js CHANGED Viewed

@@ -1,184 +1,184 @@
-// print.js
-export function printElement(elementToPrint) {
-  // 创建一个新的浏览器窗口
-  const printWindow = window.open('', '_blank', 'height=1024,width=768')
-  // 设置新窗口的文档内容
-  printWindow.document.write(`
-    <html>
-      <head>
-        <title>Print</title>
-        <style>
-          @page {
-            size: auto;
-            margin: 0mm;
-          }
-          html, body {
-            margin: 0;
-            padding: 0;
-            width: 100%;
-            height: 100%;
-          }
-          #print-container {
-            display: none
-          }
-          .img{
-            width: 95%;
-            height: 180px;
-            object-fit: cover;
-          }
-          .reportMain {
-            text-align: center;
-            margin: 0 auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            border-radius: 8px;
-            .reportTitle {
-              font-weight: bold;
-            }
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-              margin-bottom: 1%;
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-            .inputsDiv {
-              display: flex;
-              justify-content: space-between;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-              text-align: center;
-            }
-          }
-          .reportMainForDisplay {
-            text-align: center;
-            margin: 10% auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            border-radius: 8px;
-            .reportTitle {
-              font-weight: bold;
-            }
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-            .inputsDiv {
-              display: flex;
-              justify-content: space-around;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-            }
-          }
-          .reportMainNoPadding {
-            text-align: center;
-            margin: 0 auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            border-radius: 8px;
-            .reportTitle {
-              font-weight: bold;
-            }
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-            .inputsDiv {
-              display: flex;
-              justify-content: space-between;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-            }
-          }
-          .tools{
-            position: fixed;
-            right: 2%;
-            text-align: right;
-            width: 60%;
-            cursor: pointer;
-            .toolsItem{
-              width: 15%;
-              margin-right: 3%;
-              display: inline-block;
-            }
-          }
-        </style>
-      </head>
-      <body>
-        <!-- 将需要打印的元素内容复制到新窗口中 -->
-        ${elementToPrint.innerHTML}
-      </body>
-    </html>
-  `)
-  // 延迟执行打印，以确保新窗口的内容已加载完成
-  printWindow.document.close() // 关闭文档流，确保内容完全加载
-  setTimeout(() => {
-    printWindow.print() // 调用打印方法
-    printWindow.close()
-  }, 500) // 延迟500毫秒后执行打印
-}
+// print.js
+export function printElement(elementToPrint) {
+  // 创建一个新的浏览器窗口
+  const printWindow = window.open('', '_blank', 'height=1024,width=768')
+  // 设置新窗口的文档内容
+  printWindow.document.write(`
+    <html>
+      <head>
+        <title>Print</title>
+        <style>
+          @page {
+            size: auto;
+            margin: 0mm;
+          }
+          html, body {
+            margin: 0;
+            padding: 0;
+            width: 100%;
+            height: 100%;
+          }
+          #print-container {
+            display: none
+          }
+          .img{
+            width: 95%;
+            height: 180px;
+            object-fit: cover;
+          }
+          .reportMain {
+            text-align: center;
+            margin: 0 auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            border-radius: 8px;
+            .reportTitle {
+              font-weight: bold;
+            }
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+              margin-bottom: 1%;
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+            .inputsDiv {
+              display: flex;
+              justify-content: space-between;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+              text-align: center;
+            }
+          }
+          .reportMainForDisplay {
+            text-align: center;
+            margin: 10% auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            border-radius: 8px;
+            .reportTitle {
+              font-weight: bold;
+            }
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+            .inputsDiv {
+              display: flex;
+              justify-content: space-around;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+            }
+          }
+          .reportMainNoPadding {
+            text-align: center;
+            margin: 0 auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            border-radius: 8px;
+            .reportTitle {
+              font-weight: bold;
+            }
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+            .inputsDiv {
+              display: flex;
+              justify-content: space-between;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+            }
+          }
+          .tools{
+            position: fixed;
+            right: 2%;
+            text-align: right;
+            width: 60%;
+            cursor: pointer;
+            .toolsItem{
+              width: 15%;
+              margin-right: 3%;
+              display: inline-block;
+            }
+          }
+        </style>
+      </head>
+      <body>
+        <!-- 将需要打印的元素内容复制到新窗口中 -->
+        ${elementToPrint.innerHTML}
+      </body>
+    </html>
+  `)
+  // 延迟执行打印，以确保新窗口的内容已加载完成
+  printWindow.document.close() // 关闭文档流，确保内容完全加载
+  setTimeout(() => {
+    printWindow.print() // 调用打印方法
+    printWindow.close()
+  }, 500) // 延迟500毫秒后执行打印
+}

package/src/stores/modules/safecheckStore.ts CHANGED Viewed

@@ -1,47 +1,47 @@
-import { defineStore } from 'pinia'
-import { ref } from 'vue'
-const useSafecheckStore = defineStore('safecheck', () => {
-  // 换表id
-  const changeTableId = ref(null)
-  const tenantName = ref(null)
-  // 设置换表id
-  function setChangeTableId(id) {
-    changeTableId.value = id
-  }
-  // 设置租户名称
-  function setTenantName(name) {
-    tenantName.value = name
-  }
-  // 获取换表id
-  function getChangeTableId() {
-    return changeTableId.value
-  }
-  // 获取租户名称
-  function getTenantName() {
-    return tenantName.value
-  }
-  // 清空换表id
-  function clearChangeTableId() {
-    changeTableId.value = null
-  }
-  return {
-    changeTableId,
-    tenantName,
-    setTenantName,
-    getTenantName,
-    setChangeTableId,
-    getChangeTableId,
-    clearChangeTableId,
-  }
-}, {
-  persist: true, // 如果需要持久化
-})
-export default useSafecheckStore
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+const useSafecheckStore = defineStore('safecheck', () => {
+  // 换表id
+  const changeTableId = ref(null)
+  const tenantName = ref(null)
+  // 设置换表id
+  function setChangeTableId(id) {
+    changeTableId.value = id
+  }
+  // 设置租户名称
+  function setTenantName(name) {
+    tenantName.value = name
+  }
+  // 获取换表id
+  function getChangeTableId() {
+    return changeTableId.value
+  }
+  // 获取租户名称
+  function getTenantName() {
+    return tenantName.value
+  }
+  // 清空换表id
+  function clearChangeTableId() {
+    changeTableId.value = null
+  }
+  return {
+    changeTableId,
+    tenantName,
+    setTenantName,
+    getTenantName,
+    setChangeTableId,
+    getChangeTableId,
+    clearChangeTableId,
+  }
+}, {
+  persist: true, // 如果需要持久化
+})
+export default useSafecheckStore

package/src/stores/modules/step.ts CHANGED Viewed

@@ -1,88 +1,88 @@
-import { defineStore } from 'pinia'
-import { ref } from 'vue'
-export interface StepToolsInfo {
-  workflowId: string
-  stepDefines: any
-  formData: any
-  currentStepData: any
-  readOnly: boolean
-  callbackFunction: Function
-  businessData: any
-}
-export const useStepStore = defineStore('apply-step', () => {
-  const stepState = ref<StepToolsInfo>({
-    workflowId: '0',
-    stepDefines: undefined,
-    formData: undefined,
-    currentStepData: undefined,
-    readOnly: false,
-    callbackFunction: () => {
-      return true
-    },
-    businessData: undefined,
-  })
-  const getWorkflowId = () => {
-    return stepState.value.workflowId || '0'
-  }
-  const getStepDefines = () => {
-    return stepState.value.stepDefines || {}
-  }
-  const getFormData = () => {
-    return stepState.value.formData || {}
-  }
-  const getReadOnly = () => {
-    return stepState.value.readOnly || false
-  }
-  const getCurrentStepData = () => {
-    return stepState.value.currentStepData || {}
-  }
-  const getCallbackFunction = () => {
-    return stepState.value.callbackFunction || undefined
-  }
-  const getBusinessData = () => {
-    return stepState.value.businessData || {}
-  }
-  const setWorkflowId = (workflowId: string) => {
-    stepState.value.workflowId = workflowId
-  }
-  const setStepDefines = (stepDefines: any) => {
-    stepState.value.stepDefines = stepDefines
-  }
-  const setFormData = (formData: any) => {
-    stepState.value.formData = formData
-  }
-  const setCurrentStepData = (currentStepData: any) => {
-    stepState.value.currentStepData = currentStepData
-  }
-  const setReadOnly = (readOnly: boolean) => {
-    stepState.value.readOnly = readOnly
-  }
-  const setCallbackFunction = (callbackFunction: Function) => {
-    stepState.value.callbackFunction = callbackFunction
-  }
-  const setBusinessData = (businessData: any) => {
-    stepState.value.businessData = businessData
-  }
-  return {
-    stepState,
-    getWorkflowId,
-    getStepDefines,
-    getFormData,
-    getCurrentStepData,
-    getReadOnly,
-    getCallbackFunction,
-    getBusinessData,
-    setWorkflowId,
-    setStepDefines,
-    setFormData,
-    setCurrentStepData,
-    setReadOnly,
-    setCallbackFunction,
-    setBusinessData,
-  }
-})
-export default useStepStore
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+export interface StepToolsInfo {
+  workflowId: string
+  stepDefines: any
+  formData: any
+  currentStepData: any
+  readOnly: boolean
+  callbackFunction: Function
+  businessData: any
+}
+export const useStepStore = defineStore('apply-step', () => {
+  const stepState = ref<StepToolsInfo>({
+    workflowId: '0',
+    stepDefines: undefined,
+    formData: undefined,
+    currentStepData: undefined,
+    readOnly: false,
+    callbackFunction: () => {
+      return true
+    },
+    businessData: undefined,
+  })
+  const getWorkflowId = () => {
+    return stepState.value.workflowId || '0'
+  }
+  const getStepDefines = () => {
+    return stepState.value.stepDefines || {}
+  }
+  const getFormData = () => {
+    return stepState.value.formData || {}
+  }
+  const getReadOnly = () => {
+    return stepState.value.readOnly || false
+  }
+  const getCurrentStepData = () => {
+    return stepState.value.currentStepData || {}
+  }
+  const getCallbackFunction = () => {
+    return stepState.value.callbackFunction || undefined
+  }
+  const getBusinessData = () => {
+    return stepState.value.businessData || {}
+  }
+  const setWorkflowId = (workflowId: string) => {
+    stepState.value.workflowId = workflowId
+  }
+  const setStepDefines = (stepDefines: any) => {
+    stepState.value.stepDefines = stepDefines
+  }
+  const setFormData = (formData: any) => {
+    stepState.value.formData = formData
+  }
+  const setCurrentStepData = (currentStepData: any) => {
+    stepState.value.currentStepData = currentStepData
+  }
+  const setReadOnly = (readOnly: boolean) => {
+    stepState.value.readOnly = readOnly
+  }
+  const setCallbackFunction = (callbackFunction: Function) => {
+    stepState.value.callbackFunction = callbackFunction
+  }
+  const setBusinessData = (businessData: any) => {
+    stepState.value.businessData = businessData
+  }
+  return {
+    stepState,
+    getWorkflowId,
+    getStepDefines,
+    getFormData,
+    getCurrentStepData,
+    getReadOnly,
+    getCallbackFunction,
+    getBusinessData,
+    setWorkflowId,
+    setStepDefines,
+    setFormData,
+    setCurrentStepData,
+    setReadOnly,
+    setCallbackFunction,
+    setBusinessData,
+  }
+})
+export default useStepStore

package/src/utils/PhotoClean.ts CHANGED Viewed

@@ -1,21 +1,21 @@
-// 提取对象中的图片/文件ID数组（兼容多种字段名）
-export function getPhotosFromAny(obj: any, type: string): string[] {
-  const candidates = [obj[type]]
-  for (const c of candidates) {
-    if (Array.isArray(c) && c.length > 0) {
-      // 检查是否为对象数组，如果是则提取photo_name字段
-      if (typeof c[0] === 'object' && c[0] !== null) {
-        const ids = c.map((item: any) => {
-          const id = item?.photo_name || item?.id || item?.uid || item?.fileId || item?.value
-            || item?.response?.id || item?.response?.fileId || item?.resourceId
-          return id != null && id !== '' ? String(id) : null
-        }).filter((id: string | null) => id !== null)
-        return ids as string[]
-      }
-      // 如果是字符串数组，直接返回
-      return c as string[]
-    }
-  }
-  return []
-}
+// 提取对象中的图片/文件ID数组（兼容多种字段名）
+export function getPhotosFromAny(obj: any, type: string): string[] {
+  const candidates = [obj[type]]
+  for (const c of candidates) {
+    if (Array.isArray(c) && c.length > 0) {
+      // 检查是否为对象数组，如果是则提取photo_name字段
+      if (typeof c[0] === 'object' && c[0] !== null) {
+        const ids = c.map((item: any) => {
+          const id = item?.photo_name || item?.id || item?.uid || item?.fileId || item?.value
+            || item?.response?.id || item?.response?.fileId || item?.resourceId
+          return id != null && id !== '' ? String(id) : null
+        }).filter((id: string | null) => id !== null)
+        return ids as string[]
+      }
+      // 如果是字符串数组，直接返回
+      return c as string[]
+    }
+  }
+  return []
+}

package/src/utils/appBackManager.ts CHANGED Viewed

@@ -1,23 +1,23 @@
-// 已移除类式 API，统一使用函数式 API
-// 模块级简化 API：按需绑定 window.__appBack，并更新接管状态
-let __moduleIntercept = false
-export function setAppBackIntercept(shouldIntercept: boolean): boolean {
-  __moduleIntercept = !!shouldIntercept
-  try {
-    const w: any = window.__MICRO_APP_ENVIRONMENT__ ? (window as any).rawWindow as any : window as any
-    // 若未绑定，则按需绑定；并打个标记，避免覆盖业务自定义实现
-    if (!w.__appBack || typeof w.__appBack !== 'function' || !w.__appBack.__managedByAppBack) {
-      const fn = () => __moduleIntercept
-      ;(fn as any).__managedByAppBack = true
-      w.__appBack = fn
-    }
-  }
-  catch {}
-  return __moduleIntercept
-}
-export function getAppBackIntercept(): boolean {
-  return __moduleIntercept
-}
+// 已移除类式 API，统一使用函数式 API
+// 模块级简化 API：按需绑定 window.__appBack，并更新接管状态
+let __moduleIntercept = false
+export function setAppBackIntercept(shouldIntercept: boolean): boolean {
+  __moduleIntercept = !!shouldIntercept
+  try {
+    const w: any = window.__MICRO_APP_ENVIRONMENT__ ? (window as any).rawWindow as any : window as any
+    // 若未绑定，则按需绑定；并打个标记，避免覆盖业务自定义实现
+    if (!w.__appBack || typeof w.__appBack !== 'function' || !w.__appBack.__managedByAppBack) {
+      const fn = () => __moduleIntercept
+      ;(fn as any).__managedByAppBack = true
+      w.__appBack = fn
+    }
+  }
+  catch {}
+  return __moduleIntercept
+}
+export function getAppBackIntercept(): boolean {
+  return __moduleIntercept
+}

package/src/utils/safeBack.ts CHANGED Viewed

@@ -1,38 +1,38 @@
-/**
- * 统一的返回函数 - 解决 micro-app 栈不同步导致 404 的问题
- *
- * 问题背景：
- * 1. 在 micro-app 环境中，Vue Router 的 router.back() 和浏览器的 history.back() 是独立的
- * 2. micro-app 维护了一个虚拟栈来跟踪子应用的路由历史
- * 3. 直接使用 router.back() 可能导致虚拟栈和浏览器 History 栈不同步
- * 4. 栈不同步会导致返回后 URL 跳转到不存在的页面（404）
- *
- * 解决方案：
- * - 在 micro-app 环境中使用 microApp.router.back()（由框架维护栈一致性）
- * - 在独立运行环境中使用 Vue Router 的 router.back()
- */
-import router from '@af-mobile-client-vue3/router'
-/**
- * 统一的返回函数
- * - micro-app 环境使用 microApp.router.back()
- * - 独立环境使用 router.back()
- * - 无浏览器历史时跳转到首页
- */
-export function goBack(): void {
-  if (window.history.length <= 1) {
-    console.log('[goBack] 无浏览器历史，跳转首页')
-    router.push('/')
-    return
-  }
-  if ((window as any).__MICRO_APP_ENVIRONMENT__) {
-    console.log('[goBack] micro-app 环境，使用 microApp.router.back()')
-    ;(window as any).microApp?.router?.back()
-  }
-  else {
-    console.log('[goBack] 独立环境，使用 router.back()')
-    router.back()
-  }
-}
+/**
+ * 统一的返回函数 - 解决 micro-app 栈不同步导致 404 的问题
+ *
+ * 问题背景：
+ * 1. 在 micro-app 环境中，Vue Router 的 router.back() 和浏览器的 history.back() 是独立的
+ * 2. micro-app 维护了一个虚拟栈来跟踪子应用的路由历史
+ * 3. 直接使用 router.back() 可能导致虚拟栈和浏览器 History 栈不同步
+ * 4. 栈不同步会导致返回后 URL 跳转到不存在的页面（404）
+ *
+ * 解决方案：
+ * - 在 micro-app 环境中使用 microApp.router.back()（由框架维护栈一致性）
+ * - 在独立运行环境中使用 Vue Router 的 router.back()
+ */
+import router from '@af-mobile-client-vue3/router'
+/**
+ * 统一的返回函数
+ * - micro-app 环境使用 microApp.router.back()
+ * - 独立环境使用 router.back()
+ * - 无浏览器历史时跳转到首页
+ */
+export function goBack(): void {
+  if (window.history.length <= 1) {
+    console.log('[goBack] 无浏览器历史，跳转首页')
+    router.push('/')
+    return
+  }
+  if ((window as any).__MICRO_APP_ENVIRONMENT__) {
+    console.log('[goBack] micro-app 环境，使用 microApp.router.back()')
+    ;(window as any).microApp?.router?.back()
+  }
+  else {
+    console.log('[goBack] 独立环境，使用 router.back()')
+    router.back()
+  }
+}

package/src/utils/timeUtil.ts CHANGED Viewed

@@ -1,27 +1,27 @@
-// 时间工具：提供简单的日期时间格式化
-export function pad2(num: number): string {
-  return num < 10 ? `0${num}` : `${num}`
-}
-/**
- * 按照简单占位符格式化当前时间
- * 支持占位：YYYY MM DD HH mm ss
- * @param format 默认 'YYYY-MM-DD HH:mm:ss'
- */
-export function formatNow(format: string = 'YYYY-MM-DD HH:mm:ss'): string {
-  const d = new Date()
-  const map: Record<string, string> = {
-    YYYY: `${d.getFullYear()}`,
-    MM: pad2(d.getMonth() + 1),
-    DD: pad2(d.getDate()),
-    HH: pad2(d.getHours()),
-    mm: pad2(d.getMinutes()),
-    ss: pad2(d.getSeconds()),
-  }
-  let out = format
-  Object.keys(map).forEach((k) => {
-    out = out.replace(new RegExp(k, 'g'), map[k])
-  })
-  return out
-}
+// 时间工具：提供简单的日期时间格式化
+export function pad2(num: number): string {
+  return num < 10 ? `0${num}` : `${num}`
+}
+/**
+ * 按照简单占位符格式化当前时间
+ * 支持占位：YYYY MM DD HH mm ss
+ * @param format 默认 'YYYY-MM-DD HH:mm:ss'
+ */
+export function formatNow(format: string = 'YYYY-MM-DD HH:mm:ss'): string {
+  const d = new Date()
+  const map: Record<string, string> = {
+    YYYY: `${d.getFullYear()}`,
+    MM: pad2(d.getMonth() + 1),
+    DD: pad2(d.getDate()),
+    HH: pad2(d.getHours()),
+    mm: pad2(d.getMinutes()),
+    ss: pad2(d.getSeconds()),
+  }
+  let out = format
+  Object.keys(map).forEach((k) => {
+    out = out.replace(new RegExp(k, 'g'), map[k])
+  })
+  return out
+}

package/src/views/SafeInspection/SecurityCertificate/index.vue CHANGED Viewed

@@ -1538,14 +1538,24 @@ function mergeSafeContentByTabAndType(templateJson: any[], safeContent: any[]):
 // 保存临时数据的函数
 async function saveDraftData() {
-  // 增加安检时间限制检查
+  // 自定义校验
+  let customRes: any
+  if (safeConfig.value?.customLogic) {
+    customRes = await runLogic(safeConfig.value?.customLogic, { serverStartTime: onSiteDate.value }, 'af-safecheck')
+    if (customRes && customRes?.code !== 200 && customRes?.msg) {
+      showToast(customRes?.msg || '自定义校验失败')
+      return
+    }
+  }
   if (safeConfig.value?.isTimer && !isReadOnly.value) {
     const limitTime = safeConfig.value?.limitTime || 10
-    if (elapsedSeconds.value < (limitTime * 60)) {
+    if (customRes?.timeLimitCheck === 'fail' && elapsedSeconds.value < (limitTime * 60)) {
       showToast(`安检时间必须大于${limitTime}分钟`)
       return
     }
   }
   showConfirmDialog({
     title: '确认保存',
     message: '是否保存当前未提交数据？',
@@ -1614,27 +1624,28 @@ async function onSubmit() {
       return
     }
-    if (safeConfig.value?.isTimer && !isReadOnly.value) {
-      const limitTime = safeConfig.value?.limitTime || 10
-      if (elapsedSeconds.value < (limitTime * 60)) {
-        showToast(`安检时间必须大于${limitTime}分钟`)
-        return
-      }
-    }
     // 用户确认提交，组织提交数据
     const submitData = await organizeSubmitData()
     console.log('提交数据:', submitData)
     // 自定义校验
+    let customRes: any
     if (safeConfig.value?.customLogic) {
-      const customRes: any = await runLogic(safeConfig.value?.customLogic, { paperData: submitData, changeTableData: safecheckStore.getChangeTableId() }, 'af-safecheck')
+      customRes = await runLogic(safeConfig.value?.customLogic, { paperData: submitData, changeTableData: safecheckStore.getChangeTableId(), serverStartTime: onSiteDate.value }, 'af-safecheck')
       if (customRes && customRes?.code !== 200 && customRes?.msg) {
         showToast(customRes?.msg || '自定义校验失败')
         return
       }
     }
+    if (safeConfig.value?.isTimer && !isReadOnly.value) {
+      const limitTime = safeConfig.value?.limitTime || 10
+      if (customRes?.timeLimitCheck === 'fail' && elapsedSeconds.value < (limitTime * 60)) {
+        showToast(`安检时间必须大于${limitTime}分钟`)
+        return
+      }
+    }
     // 如果所有表单校验通过，则弹出确认框
     showConfirmDialog({
       title: '安检单填写',

package/src/views/SafeInspection/SecurityCertificate/userInfo/index.vue CHANGED Viewed

@@ -7,7 +7,7 @@ import upaddress from './upaddress.vue'
 const props = withDefaults(defineProps<{
   id?: string
-  userDetail?: object | any
+  userDetail?: Record<string, any>
   isReadOnly?: boolean
 }>(), {
   id: '',

package/src/views/component/StepView/index.vue CHANGED Viewed

@@ -11,7 +11,7 @@ const workflowId: string = '6149'
 const stepId: string = '5'
 // 基础组件引用
-const stepDetailBaseRef = ref<InstanceType<typeof StepDetailBase>>()
+const stepDetailBaseRef = ref<InstanceType<typeof StepDetailBase>>()
 </script>
 <template>

package/src/views/component/XFormView/index.vue CHANGED Viewed

@@ -1,12 +1,15 @@
 <script setup lang="ts">
 import XForm from '@af-mobile-client-vue3/components/data/XForm/index.vue'
 import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
 import router from '@af-mobile-client-vue3/router'
+import { mobileUtil } from '@af-mobile-client-vue3/utils/mobileUtil'
+import {
+  Button as VanButton,
+} from 'vant'
 import { ref } from 'vue'
-const configName = ref('AddConstructionForm')
-const serviceName = ref('af-linepatrol')
+const configName = ref('SecurityPhotoForm')
+const serviceName = ref('af-safecheck')
 const formGroupAddConstruction = ref<any>(null)
 function sleep(ms) {
@@ -32,12 +35,21 @@ function onAddressChange(data: any) {
 function onRegionChange(data: any) {
   console.warn('表单新增数据变化', data)
 }
+function cli(data: any) {
+  mobileUtil.execute({
+    funcName: 'exportDatabase',
+    param: { a: 1 },
+    callbackFunc: (result) => {
+      console.log('回调了test111', result)
+    },
+  })
+}
 </script>
 <template>
   <NormalDataLayout id="XFormGroupView" title="纯表单">
     <template #layout_content>
-      <XForm
+<!--      <XForm
         ref="formGroupAddConstruction"
         mode="新增"
         :config-name="configName"
@@ -46,7 +58,8 @@ function onRegionChange(data: any) {
         @address-change="onAddressChange"
         @region-change="onRegionChange"
         @on-submit="onSubmit"
-      />
+      />-->
+      <VanButton type="default" plain icon="arrow-left" size="small" @click="cli" />
     </template>
   </NormalDataLayout>
 </template>

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

@@ -174,14 +174,15 @@ function deleteCacheImages() {
     param: {},
     funcName: 'checkUploadQueue',
     callbackFunc: (res?: any) => {
-      console.log('检查是否符合清除条件', res)
-      if (res?.data?.codeFlag === 200) {
-        showToast('清除成功!')
-      }
-      else if (res?.data?.codeFlag === 700) {
+      if (res?.data?.codeFlag === 700) {
         confirmDelete()
       }
-      else { /* empty */ }
+      else if (res?.status === 'success' || res?.data?.codeFlag === 200) {
+        showToast('清理图片缓存成功!')
+      }
+      else {
+        showToast('清理图片缓存失败!')
+      }
     },
   })
 }
@@ -199,10 +200,12 @@ function confirmDelete() {
         funcName: 'clearLocalImages',
         callbackFunc: (res?: any) => {
           console.log('清除本地缓存返回', res)
-          if (res?.data?.codeFlag === 200) {
-            showToast('清除成功!')
+          if (res?.status === 'success' || res?.data?.codeFlag === 200) {
+            showToast('清理图片缓存成功!')
+          }
+          else {
+            showToast('清理图片缓存失败!')
           }
-          else { /* empty */ }
         },
       })
     })
@@ -210,6 +213,21 @@ function confirmDelete() {
       // on cancel
     })
 }
+function exportDatabase() {
+  mobileUtil.execute({
+    param: {},
+    funcName: 'exportDatabase',
+    callbackFunc: (res?: any) => {
+      if (res?.status === 'success' || res?.data?.codeFlag === 200) {
+        showToast('反馈成功!')
+      }
+      else {
+        showToast('反馈异常，请联系管理人员！')
+      }
+    },
+  })
+}
 </script>
 <template>
@@ -311,17 +329,24 @@ function confirmDelete() {
                 @update:model-value="handleSystemSoundSwitchChange"
               />
             </div>
-            <div class="menu-item" @click="exit_login">
+            <div class="menu-item" @click="deleteCacheImages">
               <div class="menu-item-content">
-                <VanIcon name="sign" class="menu-icon logout-icon" />
-                <span class="menu-text">退出登录</span>
+                <VanIcon name="delete" class="menu-icon logout-icon" />
+                <span class="menu-text">清理图片缓存</span>
               </div>
               <VanIcon name="arrow" class="menu-arrow" />
             </div>
-            <div v-if="setting.getSetting()?.showDeleteCacheImages" class="menu-item" @click="deleteCacheImages">
+            <div class="menu-item" @click="exportDatabase">
               <div class="menu-item-content">
-                <VanIcon name="delete" class="menu-icon logout-icon" />
-                <span class="menu-text">清除本地缓存图片</span>
+                <VanIcon name="records" class="menu-icon" />
+                <span class="menu-text">反馈本地数据</span>
+              </div>
+              <VanIcon name="arrow" class="menu-arrow" />
+            </div>
+            <div class="menu-item" @click="exit_login">
+              <div class="menu-item-content">
+                <VanIcon name="sign" class="menu-icon logout-icon" />
+                <span class="menu-text">退出登录</span>
               </div>
               <VanIcon name="arrow" class="menu-arrow" />
             </div>

package/vite.config.ts CHANGED Viewed

@@ -11,7 +11,7 @@ export default ({ mode }: ConfigEnv): UserConfig => {
   const appProxys = {}
-  const v4Server = 'http://192.168.50.67:31567'
+  const v4Server = 'http://aote-office.8866.org:31577'
   const v3Server = 'http://192.168.50.67:31567'
   const OSSServerDev = 'http://192.168.50.67:30351'
   const geoserver = 'http://192.168.50.67:31567'