af-mobile-client-vue3 1.5.84 → 1.5.86

package/.env.development

@@ -1,2 +1 @@
 NODE_ENV=development
-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,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.5.84",
+  "version": "1.5.86",
   "packageManager": "pnpm@10.13.1",
   "description": "Vue + Vite component lib",
   "engines": {

package/src/components/core/MessageNotification/MessageNotification.vue

@@ -1,326 +1,325 @@
-<script setup lang="ts">
-import { post } from '@af-mobile-client-vue3/services/restTools'
-import useUserStore from '@af-mobile-client-vue3/stores/modules/user'
-import { mobileUtil } from '@af-mobile-client-vue3/utils/mobileUtil'
-import { Badge as VanBadge, Icon as VanIcon } from 'vant'
-import { onMounted, onUnmounted, ref } from 'vue'
-import { closeWebSocket, initWebSocket } from './webSocket'
-import 'vant/es/badge/style'
-import 'vant/es/icon/style'
-
-interface Props {
-  iconColor?: string
-}
-
-const props = withDefaults(defineProps<Props>(), {
-  iconColor: '#666',
-})
-
-const userInfo = useUserStore().getUserInfo()
-
-// 未读消息数量
-const unreadCount = ref(0)
-
-// 打开消息下拉菜单
-const isShowMessageDropdown = ref(false)
-
-// 消息列表数据
-const messages = ref<any[]>([])
-
-// 组件根元素的引用
-const messageNotificationRef = ref<HTMLElement | null>(null)
-
-// 获取消息数据
-async function fetchMessages() {
-  const param = {
-    userId: `${userInfo.id}:phone`, // |phone
-    typeList: '\'phone\'', // phone
-    pageNo: 1,
-    pageSize: 100,
-  }
-  const res = await post('/af-system/logic/getNotificationListByType', param)
-  messages.value = (res || []).map((item: any) => {
-    const event: any = JSON.parse(item.f_event || '{}')
-    return {
-      id: item.id,
-      type: event.type,
-      time: item.f_input_date,
-      title: event.title || '',
-      status: item.f_state,
-      content: event.description || '',
-    }
-  })
-}
-
-// 获取未读消息数量
-async function fetchMessagesCount() {
-  const param = {
-    userId: `${userInfo.id}:phone`, // |phone
-    typeList: '\'phone\'', // phone
-  }
-  const count = await post('/af-system/logic/getNotificationCount', param)
-  unreadCount.value = count.count
-}
-
-// 处理 WebSocket 消息
-function createMessageCallback(message: any) {
-  fetchMessagesCount()
-  fetchMessages()
-}
-// 处理 不同的业务
-function sendMessageCallback(message: any) {
-  console.log('>>>> 处理业务', JSON.stringify(message))
-  if (message.businessType === 'audio') {
-    // 播放响铃, 响铃文件为 message.audioName
-    mobileUtil.execute({
-      funcName: 'playAudio',
-      param: {
-        fileName: message.audioName,
-      },
-      callbackFunc: (result: any) => {
-        // {"status":"success","data":{"message":"音频播放成功","fileName":"anjian.mp3","path":"assets/audio/anjian.mp3"}}
-      },
-    })
-  }
-}
-
-// 全部标记为已读（清空消息列表）
-function markAllAsRead() {
-  if (messages.value.length === 0)
-    return
-
-  const messageIds = messages.value.map(msg => msg.id).join(',')
-  markAsRead(messageIds)
-}
-
-// 单条消息标记为已读
-function markAsRead(id: string | number) {
-  post('/af-system/logic/confirmMessage', {
-    id,
-    f_state: 2,
-  }).then(() => {
-    fetchMessages()
-    fetchMessagesCount()
-  })
-}
-
-function handleIconClick(message: any) {
-  // 乐观更新为已读状态，使图标立刻变绿
-  message.status = 2
-  setTimeout(() => {
-    markAsRead(message.id)
-  }, 200)
-}
-
-function showMessageDropdown() {
-  isShowMessageDropdown.value = !isShowMessageDropdown.value
-  if (isShowMessageDropdown.value) {
-    fetchMessages()
-  }
-}
-
-// 处理全局点击事件
-function handleDocumentClick(event: MouseEvent) {
-  if (messageNotificationRef.value && !messageNotificationRef.value.contains(event.target as Node)) {
-    isShowMessageDropdown.value = false
-  }
-}
-
-onMounted(() => {
-  fetchMessages()
-  fetchMessagesCount()
-  // 初始化 WebSocket 连接
-  initWebSocket(userInfo.id, sendMessageCallback, createMessageCallback)
-  // 添加全局点击事件监听器
-  document.addEventListener('click', handleDocumentClick)
-})
-
-onUnmounted(() => {
-  closeWebSocket()
-  // 移除全局点击事件监听器
-  document.removeEventListener('click', handleDocumentClick)
-})
-</script>
-
-<template>
-  <div ref="messageNotificationRef" class="message_icon" @click="showMessageDropdown">
-    <VanBadge v-if="unreadCount > 0" :content="unreadCount" max="99">
-      <VanIcon name="bell" :color="props.iconColor" />
-    </VanBadge>
-    <VanIcon v-else name="bell" :color="props.iconColor" />
-  </div>
-
-  <div v-if="isShowMessageDropdown" class="message_overlay" @click="isShowMessageDropdown = false" />
-
-  <div v-show="isShowMessageDropdown" class="message_dropdown" @click.stop>
-    <div class="message_header">
-      <span class="label">消息通知</span>
-      <span class="action" @click="markAllAsRead">全部已读</span>
-    </div>
-    <div class="message_list">
-      <template v-if="messages.length > 0">
-        <div
-          v-for="message in messages"
-          :key="message.id"
-          class="message_item"
-          :class="{ info: message.type === 'info', warning: message.type === 'warning' }"
-        >
-          <!-- 第一行：div1 + div2 -->
-          <div class="message_row">
-            <!-- div1：标题+时间 -->
-            <div class="message_left">
-              <p class="message_title">
-                {{ message.title }}
-              </p>
-              <p class="message_time">
-                {{ message.time }}
-              </p>
-            </div>
-            <!-- div2：图标 -->
-            <div class="message_right">
-              <VanIcon
-                name="checked"
-                :color="message.status === 2 ? '#52c41a' : '#999'"
-                size="28"
-                @click.stop="handleIconClick(message)"
-              />
-            </div>
-          </div>
-          <!-- 第二行：div3 内容 -->
-          <div class="message_content">
-            <p class="message_text">
-              {{ message.content }}
-            </p>
-          </div>
-        </div>
-      </template>
-      <div v-else class="empty_message">
-        暂无未读消息
-      </div>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="less">
-.message_dropdown {
-  position: absolute;
-  top: 56px;
-  left: 0;
-  right: 0;
-  background-color: #fff;
-  box-shadow: 0 12px 24px rgba(0, 0, 0, 0.2);
-  z-index: 10001;
-  max-height: 400px;
-  overflow-y: auto;
-
-  .message_header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 12px 16px;
-    border-bottom: 1px solid #eee;
-
-    .label {
-      font-size: 14px;
-      color: #999;
-    }
-    .action {
-      font-size: 14px;
-      color: #1989fa;
-      cursor: pointer;
-    }
-  }
-
-  .message_list {
-    .message_item {
-      padding: 12px 16px;
-      border-bottom: 1px solid #f5f5f5;
-
-      &.info {
-        background-color: #eff6ff;
-      }
-      &.warning {
-        background-color: #fff7ed;
-      }
-
-      .message_row {
-        display: flex;
-        justify-content: space-between;
-        align-items: flex-start;
-      }
-
-      .message_left {
-        flex: 1;
-        min-width: 0;
-
-        .message_title {
-          font-size: 14px;
-          font-weight: 500;
-          color: #333;
-          margin: 0;
-          white-space: nowrap;
-          overflow: hidden;
-          text-overflow: ellipsis;
-        }
-
-        .message_time {
-          font-size: 12px;
-          color: #999;
-          margin: 4px 0 0 0;
-        }
-      }
-
-      .message_right {
-        flex: 0 0 auto;
-        display: flex;
-        align-items: center;
-        padding-left: 8px;
-
-        .van-icon {
-          font-size: 18px;
-          color: #999;
-        }
-      }
-
-      .message_content {
-        margin-top: 8px;
-
-        .message_text {
-          border-radius: 4px;
-          font-size: 13px;
-          color: #666;
-          background-color: #fafafc;
-          margin: 0;
-          padding: 8px 12px;
-          line-height: 1.4;
-        }
-      }
-    }
-
-    .empty_message {
-      padding: 60px 0;
-      text-align: center;
-      color: #999;
-      font-size: 14px;
-    }
-  }
-}
-
-.message_overlay {
-  position: fixed;
-  inset: 0;
-  background: rgba(0, 0, 0, 0.45);
-  z-index: 10001;
-  margin-top: 56px;
-  margin-bottom: 50px;
-}
-.message_icon {
-  padding: 8px;
-  position: relative;
-  cursor: pointer;
-
-  .van-icon {
-    font-size: 20px;
-  }
-}
-</style>
+<script setup lang="ts">
+import { post } from '@af-mobile-client-vue3/services/restTools'
+import useUserStore from '@af-mobile-client-vue3/stores/modules/user'
+import { mobileUtil } from '@af-mobile-client-vue3/utils/mobileUtil'
+import { Badge as VanBadge, Icon as VanIcon } from 'vant'
+import { onMounted, onUnmounted, ref } from 'vue'
+import { closeWebSocket, initWebSocket } from './webSocket'
+import 'vant/es/badge/style'
+import 'vant/es/icon/style'
+
+interface Props {
+  iconColor?: string
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  iconColor: '#666',
+})
+
+const userInfo = useUserStore().getUserInfo()
+
+// 未读消息数量
+const unreadCount = ref(0)
+
+// 打开消息下拉菜单
+const isShowMessageDropdown = ref(false)
+
+// 消息列表数据
+const messages = ref<any[]>([])
+
+// 组件根元素的引用
+const messageNotificationRef = ref<HTMLElement | null>(null)
+
+// 获取消息数据
+async function fetchMessages() {
+  const param = {
+    userId: `${userInfo.id}:phone`, // |phone
+    typeList: '\'phone\'', // phone
+    pageNo: 1,
+    pageSize: 100,
+  }
+  const res = await post('/af-system/logic/getNotificationListByType', param)
+  messages.value = (res || []).map((item: any) => {
+    const event: any = JSON.parse(item.f_event || '{}')
+    return {
+      id: item.id,
+      type: event.type,
+      time: item.f_input_date,
+      title: event.title || '',
+      status: item.f_state,
+      content: event.description || '',
+    }
+  })
+}
+
+// 获取未读消息数量
+async function fetchMessagesCount() {
+  const param = {
+    userId: `${userInfo.id}:phone`, // |phone
+    typeList: '\'phone\'', // phone
+  }
+  const count = await post('/af-system/logic/getNotificationCount', param)
+  unreadCount.value = count.count
+}
+
+// 处理 WebSocket 消息
+function createMessageCallback(message: any) {
+  fetchMessagesCount()
+  fetchMessages()
+}
+// 处理 不同的业务
+function sendMessageCallback(message: any) {
+  console.log('>>>> 处理业务', JSON.stringify(message))
+  if (message.businessType === 'audio') {
+    // 播放响铃, 响铃文件为 message.audioName
+    mobileUtil.execute({
+      funcName: 'playAudio',
+      param: {
+        fileName: message.audioName,
+      },
+      callbackFunc: (result: any) => {
+        // {"status":"success","data":{"message":"音频播放成功","fileName":"anjian.mp3","path":"assets/audio/anjian.mp3"}}
+      },
+    })
+  }
+}
+
+// 全部标记为已读（清空消息列表）
+function markAllAsRead() {
+  if (messages.value.length === 0)
+    return
+
+  const messageIds = messages.value.map(msg => msg.id).join(',')
+  markAsRead(messageIds)
+}
+
+// 单条消息标记为已读
+function markAsRead(id: string | number) {
+  post('/af-system/logic/confirmMessage', {
+    id,
+    f_state: 2,
+  }).then(() => {
+    fetchMessages()
+    fetchMessagesCount()
+  })
+}
+
+function handleIconClick(message: any) {
+  // 乐观更新为已读状态，使图标立刻变绿
+  message.status = 2
+  setTimeout(() => {
+    markAsRead(message.id)
+  }, 200)
+}
+
+function showMessageDropdown() {
+  isShowMessageDropdown.value = !isShowMessageDropdown.value
+  if (isShowMessageDropdown.value) {
+    fetchMessages()
+  }
+}
+
+// 处理全局点击事件
+function handleDocumentClick(event: MouseEvent) {
+  if (messageNotificationRef.value && !messageNotificationRef.value.contains(event.target as Node)) {
+    isShowMessageDropdown.value = false
+  }
+}
+
+onMounted(() => {
+  fetchMessagesCount()
+  // 初始化 WebSocket 连接
+  initWebSocket(userInfo.id, sendMessageCallback, createMessageCallback)
+  // 添加全局点击事件监听器
+  document.addEventListener('click', handleDocumentClick)
+})
+
+onUnmounted(() => {
+  closeWebSocket()
+  // 移除全局点击事件监听器
+  document.removeEventListener('click', handleDocumentClick)
+})
+</script>
+
+<template>
+  <div ref="messageNotificationRef" class="message_icon" @click="showMessageDropdown">
+    <VanBadge v-if="unreadCount > 0" :content="unreadCount" max="99">
+      <VanIcon name="bell" :color="props.iconColor" />
+    </VanBadge>
+    <VanIcon v-else name="bell" :color="props.iconColor" />
+  </div>
+
+  <div v-if="isShowMessageDropdown" class="message_overlay" @click="isShowMessageDropdown = false" />
+
+  <div v-show="isShowMessageDropdown" class="message_dropdown" @click.stop>
+    <div class="message_header">
+      <span class="label">消息通知</span>
+      <span class="action" @click="markAllAsRead">全部已读</span>
+    </div>
+    <div class="message_list">
+      <template v-if="messages.length > 0">
+        <div
+          v-for="message in messages"
+          :key="message.id"
+          class="message_item"
+          :class="{ info: message.type === 'info', warning: message.type === 'warning' }"
+        >
+          <!-- 第一行：div1 + div2 -->
+          <div class="message_row">
+            <!-- div1：标题+时间 -->
+            <div class="message_left">
+              <p class="message_title">
+                {{ message.title }}
+              </p>
+              <p class="message_time">
+                {{ message.time }}
+              </p>
+            </div>
+            <!-- div2：图标 -->
+            <div class="message_right">
+              <VanIcon
+                name="checked"
+                :color="message.status === 2 ? '#52c41a' : '#999'"
+                size="28"
+                @click.stop="handleIconClick(message)"
+              />
+            </div>
+          </div>
+          <!-- 第二行：div3 内容 -->
+          <div class="message_content">
+            <p class="message_text">
+              {{ message.content }}
+            </p>
+          </div>
+        </div>
+      </template>
+      <div v-else class="empty_message">
+        暂无未读消息
+      </div>
+    </div>
+  </div>
+</template>
+
+<style scoped lang="less">
+.message_dropdown {
+  position: absolute;
+  top: 56px;
+  left: 0;
+  right: 0;
+  background-color: #fff;
+  box-shadow: 0 12px 24px rgba(0, 0, 0, 0.2);
+  z-index: 10001;
+  max-height: 400px;
+  overflow-y: auto;
+
+  .message_header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 12px 16px;
+    border-bottom: 1px solid #eee;
+
+    .label {
+      font-size: 14px;
+      color: #999;
+    }
+    .action {
+      font-size: 14px;
+      color: #1989fa;
+      cursor: pointer;
+    }
+  }
+
+  .message_list {
+    .message_item {
+      padding: 12px 16px;
+      border-bottom: 1px solid #f5f5f5;
+
+      &.info {
+        background-color: #eff6ff;
+      }
+      &.warning {
+        background-color: #fff7ed;
+      }
+
+      .message_row {
+        display: flex;
+        justify-content: space-between;
+        align-items: flex-start;
+      }
+
+      .message_left {
+        flex: 1;
+        min-width: 0;
+
+        .message_title {
+          font-size: 14px;
+          font-weight: 500;
+          color: #333;
+          margin: 0;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+
+        .message_time {
+          font-size: 12px;
+          color: #999;
+          margin: 4px 0 0 0;
+        }
+      }
+
+      .message_right {
+        flex: 0 0 auto;
+        display: flex;
+        align-items: center;
+        padding-left: 8px;
+
+        .van-icon {
+          font-size: 18px;
+          color: #999;
+        }
+      }
+
+      .message_content {
+        margin-top: 8px;
+
+        .message_text {
+          border-radius: 4px;
+          font-size: 13px;
+          color: #666;
+          background-color: #fafafc;
+          margin: 0;
+          padding: 8px 12px;
+          line-height: 1.4;
+        }
+      }
+    }
+
+    .empty_message {
+      padding: 60px 0;
+      text-align: center;
+      color: #999;
+      font-size: 14px;
+    }
+  }
+}
+
+.message_overlay {
+  position: fixed;
+  inset: 0;
+  background: rgba(0, 0, 0, 0.45);
+  z-index: 10001;
+  margin-top: 56px;
+  margin-bottom: 50px;
+}
+.message_icon {
+  padding: 8px;
+  position: relative;
+  cursor: pointer;
+
+  .van-icon {
+    font-size: 20px;
+  }
+}
+</style>

package/src/components/core/MessageNotification/webSocket.tsx

@@ -28,7 +28,8 @@ export function initWebSocket(notify: string | null = null, sendCallback: (messa
   }
 
   // 初始化 WebSocket
-  websocket = new WebSocket(`ws:${window.location.host}/socket/af-system/sendMessage?userId=${notifyId}:phone`)
+  const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:'
+  websocket = new WebSocket(`${protocol}${window.location.host}/socket/af-system/sendMessage?userId=${notifyId}:phone`)
 
   // WebSocket 打开连接时触发
   websocket.onopen = () => {

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

@@ -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

@@ -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/setting.ts

@@ -26,8 +26,8 @@ export interface WebConfig {
   hiddenTraditionalLogin: boolean
   isFaceRecognition: boolean // 登录是否需要人脸识别
   intervalFaceRecognition: boolean // 登录是否需要开启定时人脸识别
-  faceIntervalMinutes: number // 定时时间
-  faceRetryCount: number // 重试次数
+  faceIntervalMinutes: number // 定时时间 单位分钟
+  faceRetryCount: number // 定时验证 重试次数
   getPlatformUser: boolean // 获取外部用户信息
   navigationStyle: any // app顶部导航区域样式控制
 }

package/src/stores/modules/user.ts

@@ -247,6 +247,13 @@ export const useUserStore = defineStore('app-user', () => {
       }
       // save token
       setToken(data.access_token)
+      const LoginTicket = crypto.AESEncrypt(JSON.stringify(params), '3KMKqvgwR8ULbR8Z')
+      if (data.session && useSettingStore().getSetting().requestEncrypt) {
+        const k = encryptUtil.RSADecrypt(data.session as string)
+        localStorage.setItem('v4-session-key', k)
+        secureStorageWrite('v4-session-key', k)
+      }
+      Storage.set('LoginTicket', LoginTicket)
       return Promise.resolve(data)
     }
     catch (error) {

package/src/utils/timeUtil.ts

@@ -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/user/my/index.vue

@@ -5,7 +5,7 @@ import useSettingStore from '@af-mobile-client-vue3/stores/modules/setting'
 import useUserStore from '@af-mobile-client-vue3/stores/modules/user'
 import { openDrivingConfigPopup } from '@af-mobile-client-vue3/utils/driving/drivingUtils'
 import { mobileUtil } from '@af-mobile-client-vue3/utils/mobileUtil'
-import { Dialog as vanDialog, Icon as vanIcon, Sticky as VanSticky, Switch as VanSwitch,
+import { Dialog as vanDialog, Icon as vanIcon, Switch as VanSwitch,
 } from 'vant'
 import { onMounted, onUnmounted, ref } from 'vue'
 import { useRouter } from 'vue-router'