From 0ab037a9db386c8a178734df1df621426a677c13 Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Fri, 22 Aug 2025 16:58:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/dateUpdate/index.vue        | 1286 ++++++++++++++++++++-----
 src/pages/devicesSearch/ocrSearch.vue |   14 +-
 src/services/wsMaInfo/wsMaInfo.js     |    4 +-
 3 files changed, 1045 insertions(+), 259 deletions(-)

diff --git a/src/pages/dateUpdate/index.vue b/src/pages/dateUpdate/index.vue
index 6340494..53f1b95 100644
--- a/src/pages/dateUpdate/index.vue
+++ b/src/pages/dateUpdate/index.vue
@@ -1,89 +1,161 @@
 <template>
-    <uni-nav-bar fixed :border="false" background-color="#dcf4ff" color="black" status-bar title="日期更新">
-        <template
-            v-slot:left>
-            <view style="display: flex; align-items: center" @click="back">
-                <!-- 图标 -->
-                <uni-icons type="left" size="20" color="black"></uni-icons>
-            </view>
-        </template>
-    </uni-nav-bar>
-    <view class="accept">
-        <div class="card">
-            <div style="display: flex; justify-content: space-between; align-items: center">
+  <uni-nav-bar fixed :border="false" background-color="#dcf4ff" color="black" status-bar title="日期更新">
+    <template
+        v-slot:left>
+      <view style="display: flex; align-items: center" @click="back">
+        <!-- 图标 -->
+        <uni-icons type="left" size="20" color="black"></uni-icons>
+      </view>
+    </template>
+  </uni-nav-bar>
+  <view class="accept">
+    <div class="card">
+      <div style="display: flex; justify-content: space-between; align-items: center">
 
-                <uni-easyinput v-model="keyWord" placeholder="请输入设备编码"></uni-easyinput>
-                <button type="primary" size="mini" class="btn-cont" @click="handleSearch"
-                        style="margin-left: 10px;background: linear-gradient(135deg, #4b8eff 0%, #3784fb 100%);
+        <uni-easyinput v-model="keyWord" placeholder="请输入设备编码"></uni-easyinput>
+        <button type="primary" size="mini" class="btn-cont" @click="handleSearch"
+                style="margin-left: 8px;background: linear-gradient(135deg, #4b8eff 0%, #3784fb 100%);
 ">
-                    查询
-                </button>
+          查询
+        </button>
 
-                <button type="primary" size="mini" class="btn-cont" @click="onQrCode"
-                        style="margin-left: 10px;background: linear-gradient(135deg, #4b8eff 0%, #3784fb 100%);
+        <button type="primary" size="mini" class="btn-cont" @click="onQrCode"
+                style="margin-left: 8px;background: linear-gradient(135deg, #4b8eff 0%, #3784fb 100%);
 ">
-                    二维码
-                </button>
-            </div>
-        </div>
+          二维码
+        </button>
+        <button type="primary" size="mini" class="btn-cont" @click="openCamera"
+                style="margin-left: 8px;background: linear-gradient(135deg, #4b8eff 0%, #3784fb 100%);
+">
+          OCR
+        </button>
+      </div>
+    </div>
 
 
-        <div v-if="typeList.length > 1" class="card">
-            <select-one style="width: 100%; height: 90rpx" :options="typeList" placeholder="请选择对应机具"
-                        :key="typeList" @change="handleCheck" />
+    <div v-if="typeList.length > 1" class="card">
+      <select-one style="width: 100%; height: 90rpx" :options="typeList" placeholder="请选择对应机具"
+                  :key="typeList" @change="handleCheck" />
 
-        </div>
+    </div>
 
-        <div class="card" v-if="typeList.length > 0">
-            <div style="margin-bottom: 5px">设备类型：{{ formData.maType }}</div>
-            <div style="margin-bottom: 5px">规格型号：{{ formData.typeName }}</div>
-            <div style="margin-bottom: 5px">设备编码：{{ formData.code }}</div>
-            <div style="margin-bottom: 5px">本次检修人员：{{ formData.repairer }}</div>
-            <div style="margin-bottom: 5px">本次检修时间：{{ formData.repairTime }}</div>
-            <div style="margin-bottom: 5px">下次检修时间：{{ formData.nextRepairTime }}</div>
-        </div>
+    <div class="card" v-if="typeList.length > 0">
+      <div style="margin-bottom: 5px">设备类型：{{ formData.maType }}</div>
+      <div style="margin-bottom: 5px">规格型号：{{ formData.typeName }}</div>
+      <div style="margin-bottom: 5px">设备编码：{{ formData.code }}</div>
+      <div style="margin-bottom: 5px">本次检修人员：{{ formData.repairer }}</div>
+      <div style="margin-bottom: 5px; white-space: nowrap;">
+        本次检修时间：{{ formData.repairTime }}
+        <uni-datetime-picker
+            v-model="formData.thisCheckTimeNew"
+            :start="minDate"
+            :end="maxDate"
+            @change="handleDateChange"
+            :disabled="false"
+            :placeholder="currentDate"
+            :hide-second="true"
+            :border="false"
+            type="date"
+            :clear-icon="false"
+            style="display: inline-block; margin-left: 20px; width: 150px; height: 60rpx; line-height: 60rpx; vertical-align: middle;"
+        />
+      </div>
 
-        <div class="btn">
-            <button class="btn-cont" v-if="typeList.length > 0" type="primary" @click="handleSubmit"
-            >
-                确认修改
-            </button>
-        </div>
+      <div style="margin-bottom: 5px; white-space: nowrap;">
+        下次检修时间：{{ formData.nextRepairTime }}
+        <uni-datetime-picker
+            v-model="formData.nextCheckTimeNew"
+            :disabled="true"
+        :hide-second="true"
+        :border="false"
+        type="date"
+        style="display: inline-block; margin-left: 20px; width: 150px; height: 60rpx; line-height: 60rpx; vertical-align: middle;"
+        />
+      </div>
+    </div>
+
+    <div class="btn">
+      <button class="btn-cont" v-if="typeList.length > 0" type="primary" @click="handleSubmit"
+      >
+        确认修改
+      </button>
+    </div>
+  </view>
+
+  <uni-popup ref="popup" class="card">
+    <div class="card" v-for="(item, index) in typeList" :key="index" @click.stop="handleCheck(item)">
+      <div style="display: flex; justify-content: space-between; align-items: center">
+        <uni-data-checkbox v-model="item.isChecked" :localdata="range"
+                           @change="handleCheck(item, $event)"></uni-data-checkbox>
+        <div class="card">{{ item.name }}</div>
+
+      </div>
+
+    </div>
+  </uni-popup>
+  <ScanQrCode ref="scanQrCodeRef" @scanSuccess="handleScanSuccess" @scanError="handleScanError" />
+
+  <!-- 相机预览页面 -->
+  <view v-if="showCamera" class="camera-container">
+    <!-- 顶部提示 -->
+    <view class="top-tip" style="color: red; text-align: center;margin-top: 30px;">
+      <text class="tip-text">请将识别编码置于取景框内，完成扫描</text>
+    </view>
+    <!-- 取景框 -->
+    <view class="viewfinder-container">
     </view>
 
-    <uni-popup ref="popup" class="card">
-        <div class="card" v-for="(item, index) in typeList" :key="index" @click.stop="handleCheck(item)">
-            <div style="display: flex; justify-content: space-between; align-items: center">
-                <uni-data-checkbox v-model="item.isChecked" :localdata="range"
-                                   @change="handleCheck(item, $event)"></uni-data-checkbox>
-                <div class="card">{{ item.name }}</div>
+    <!-- 底部控制区 -->
+    <view class="bottom-controls">
+      <view class="control-btn" @click="closeCamera">
+        <text class="control-icon">✕</text>
+      </view>
+      <view class="photo-btn" @click="takePicture" :class="{ 'taking': isTaking, 'disabled': isFocusing }">
+        <view class="photo-btn-inner"></view>
+      </view>
+      <view class="control-btn" @click="openGallery">
+        <text class="control-icon">📷</text>
+      </view>
+    </view>
 
-            </div>
-
-        </div>
-    </uni-popup>
-    <ScanQrCode ref="scanQrCodeRef" @scanSuccess="handleScanSuccess" @scanError="handleScanError" />
+    <!-- 加载提示 -->
+    <view v-if="isProcessing" class="loading-overlay">
+      <view class="loading-content">
+        <view class="loading-spinner"></view>
+        <text class="loading-text">正在识别中...</text>
+      </view>
+    </view>
+  </view>
+  <view class="custom-toast"
+        :class="{'show': isShow, 'top': position === 'top', 'bottom': position === 'bottom'}"
+        ref="toast">
+    {{ message }}
+  </view>
 </template>
 
 <script setup>
 import {
-    getWsMaInfoList,
-    updateCheckTime,
+  getWsMaInfoList,
+  updateCheckTime,
 } from '@/services/wsMaInfo/wsMaInfo.js'
-import { onLoad } from '@dcloudio/uni-app'
-import { reactive, ref } from 'vue'
+import { onLoad, onBackPress, onHide, onShow } from '@dcloudio/uni-app'
+import { reactive, ref, computed} from 'vue'
 import ScanQrCode from '@/pages/devicesSearch/ScanQrCode'
 import SelectOne from '../repair/tree-select/select-one.vue'
+import {decryptWithSM4} from "../../utils/sm";
 
 const keyWord = ref('')
 const formData = reactive({
-    id: '',
-    maType: '', // 设备类型
-    typeName: '', // 规格型号
-    code: '', // 设备编码
-    repairer: '', // 维修人
-    repairTime: '', // 维修时间
-    nextRepairTime: '', // 下次维修时间
+  id: '',
+  maType: '', // 设备类型
+  typeName: '', // 规格型号
+  code: '', // 设备编码
+  repairer: '', // 维修人
+  repairTime: '', // 维修时间
+  nextRepairTime: '', // 下次维修时间
+
+  thisCheckTimeNew:'',
+  nextCheckTimeNew: '',
 })
 const scanQrCodeRef = ref()
 const popup = ref()
@@ -91,244 +163,956 @@ const typeName = ref('')
 const typeList = ref([])
 const range = ref([{ value: 0, text: '' }])
 
-onLoad(() => {
-    console.log('onLoad')
-})
+// 相机相关状态
+const showCamera = ref(false)
+const isTaking = ref(false)
+const isProcessing = ref(false)
+const cameraStarted = ref(false)
+const isFocusing = ref(false)
+const cameraReady = ref(false)
+const isShow = ref(false)
+const message = ref('')
+const position = ref('bottom')
+const deviceReadyTimeout = ref(null)
+const pluginCheckRetries = ref(0)
+const maxRetries = ref(5)
+const focusTimeout = ref(null)
+const systemInfo = ref(null)
 
-const back = () => {
-    uni.navigateBack({
-        delta: 1,
-    })
+const currentDate = ref('')
+const minDate = ref('')
+const maxDate = computed(() => {
+  return new Date().toISOString().split('T')[0]
+})
+const today = new Date()
+
+
+// 初始化日期
+const initDate = () => {
+  const now = new Date()
+  formData.thisCheckTimeNew = formatDate(now)
+  updateNextDate(now)
 }
 
+
+// 格式化 yyyy-MM-dd
+const formatDate = (date) => {
+  const y = date.getFullYear();
+  const m = String(date.getMonth() + 1).padStart(2, "0");
+  const d = String(date.getDate()).padStart(2, "0");
+  return `${y}-${m}-${d}`;
+};
+
+// 更新下次检修时间逻辑
+const updateNextDate = (selectedDate) => {
+  const nextDate = new Date(selectedDate);
+  nextDate.setFullYear(nextDate.getFullYear() + 1);
+  nextDate.setDate(nextDate.getDate() - 1);
+  formData.nextCheckTimeNew = formatDate(nextDate);
+};
+
+// 选中本次检修时间后触发
+const handleDateChange = (e) => {
+  const selectedDate = new Date(e);
+  formData.thisCheckTimeNew = formatDate(selectedDate);
+  updateNextDate(selectedDate);
+};
+
+onLoad(() => {
+  console.log('onLoad')
+  initializeCordova()
+  getDeviceInfo()
+})
+
+// 添加页面生命周期钩子
+onShow(() => {
+  initializeCordova();
+  getDeviceInfo();
+});
+
+onHide(() => {
+  cleanup();
+});
+
+// 返回按钮处理
+onBackPress((options) => {
+  if (showCamera.value){
+    console.log('关闭相机...');
+    try {
+      closeCamera();
+    } catch (error) {
+      console.error('关闭相机出错:', error);
+    } finally {
+      showCamera.value = false;
+      cameraStarted.value = false;
+    }
+    return true;
+  }
+  return false;
+});
+
+const back = () => {
+  uni.navigateBack({
+    delta: 1,
+  })
+}
+
+// 获取设备信息
+const getDeviceInfo = () => {
+  try {
+    const systemInfoData = uni.getSystemInfoSync();
+    console.log('设备信息:', systemInfoData);
+    systemInfo.value = systemInfoData;
+  } catch (error) {
+    console.error('获取设备信息失败:', error);
+  }
+}
+
+// 清理资源
+const cleanup = () => {
+  console.log('清理资源...');
+  if (cameraStarted.value) {
+    const CameraPreview = getCameraPlugin();
+    if (CameraPreview) {
+      CameraPreview.stopCamera();
+    }
+    cameraStarted.value = false;
+  }
+
+  // 清除超时
+  if (deviceReadyTimeout.value) {
+    clearTimeout(deviceReadyTimeout.value);
+    deviceReadyTimeout.value = null;
+  }
+  if (focusTimeout.value) {
+    clearTimeout(focusTimeout.value);
+    focusTimeout.value = null;
+  }
+  // 移除事件监听
+  document.removeEventListener('deviceready', onDeviceReady);
+  // 停止相机
+  if (cameraStarted.value) {
+    stopCamera().catch(console.error);
+  }
+}
+
+// 初始化相机 - 关键方法
+const initCamera = async () => {
+  return new Promise((resolve, reject) => {
+    const CameraPreview = getCameraPlugin();
+    if (!CameraPreview) {
+      reject(new Error('相机插件不可用'));
+      return;
+    }
+
+    // 获取整个相机包装器的尺寸
+    const cameraWrapper = document.querySelector('.viewfinder-container');
+    if (!cameraWrapper) {
+      reject(new Error('找不到相机容器'));
+      return;
+    }
+
+    const rect = cameraWrapper.getBoundingClientRect();
+    const options = {
+      x: rect.left,
+      y: rect.top,
+      width: rect.width,
+      height: rect.height,
+      camera: CameraPreview.CAMERA_DIRECTION?.BACK || 'back',
+      tapPhoto: false,
+      previewDrag: false,
+      toBack: false,  // 确保相机在WebView上层
+      alpha: 1,
+      tapFocus: true,
+      disableExifHeaderStripping: false
+    };
+    console.log('相机配置:', options);
+    CameraPreview.startCamera(
+        options,
+        (result) => {
+          console.log('相机启动成功:', result);
+          cameraStarted.value = true;
+          resolve();
+        },
+        (error) => {
+          console.error('相机启动失败:', error);
+          cameraStarted.value = false;
+          reject(new Error(`相机启动失败: ${error}`));
+        }
+    );
+  });
+}
+
+
 const onQrCode = () => {
-    console.log('🚀 ~ onQrCode ~ 二维码:')
-    if (scanQrCodeRef.value) scanQrCodeRef.value.scanQrCode()
+  console.log('🚀 ~ onQrCode ~ 二维码:')
+  if (scanQrCodeRef.value) scanQrCodeRef.value.scanQrCode()
 }
 
 const handleSearch = () => {
-    console.log('🚀 ~ handleSearch ~ 查询:', keyWord.value)
-    reset()
-    getWsMaInfoList({ maCode: keyWord.value }).then(res => {
-        if (res.code === 200 && res.data && res.data.length > 0) {
-            typeList.value = res.data.map(option => {
-                return {
-                    id: option.id,
-                    label: option.maName + '-' + option.maModel + '-' + option.maCode,
-                    item: option,
-                }
-            })
-            if (res.data.length === 1) {
-                let item ={
-                    item:res.data[0]
-                }
-                handleCheck(item)
-            }
+  console.log('🚀 ~ handleSearch ~ 查询:', keyWord.value)
+  reset()
+  getWsMaInfoList({ maCode: keyWord.value }).then(res => {
+    if (res.code === 200 && res.data && res.data.length > 0) {
+      typeList.value = res.data.map(option => {
+        return {
+          id: option.id,
+          label: option.maName + '-' + option.maModel + '-' + option.maCode,
+          item: option,
         }
-    }).catch(error => {
-        console.log(error)
-    })
+      })
+      if (res.data.length === 1) {
+        let item ={
+          item:res.data[0]
+        }
+        handleCheck(item)
+      }
+    }
+  }).catch(error => {
+    console.log(error)
+  })
 }
 
+
 const handlePopup = () => {
-    console.log('🚀 ~ handlePopup ~ 弹窗:')
-    popup.value.open()
+  console.log('🚀 ~ handlePopup ~ 弹窗:')
+  popup.value.open()
 }
 
 const handleCheck = (item) => {
-    console.log('🚀 ~ handleCheck ~ 单选:', item)
-    // 循环 typeList 将当前点击的 item.isChecked 设置为 0 其他设置 1
-    typeList.value.forEach((i) => {
-        i.isChecked = i.id === item.id ? 0 : 1
-    })
+  console.log('🚀 ~ handleCheck ~ 单选:', item)
+  // 循环 typeList 将当前点击的 item.isChecked 设置为 0 其他设置 1
+  typeList.value.forEach((i) => {
+    i.isChecked = i.id === item.id ? 0 : 1
+  })
 
-    formData.id = item.item.id
-    formData.code = item.item.maCode
-    formData.maType = item.item.maName
-    formData.nextRepairTime = item.item.nextCheckTime
-    formData.repairTime = item.item.thisCheckTime
-    formData.typeName = item.item.maModel
-    formData.repairer = item.item.repairMan
-    typeName.value = item.name
+  formData.id = item.item.id
+  formData.code = item.item.maCode
+  formData.maType = item.item.maName
+  formData.nextRepairTime = item.item.nextCheckTime
+  formData.repairTime = item.item.thisCheckTime
+  formData.typeName = item.item.maModel
+  formData.repairer = item.item.repairMan
+  typeName.value = item.name
 
-    popup.value.close()
+  initDate()
+
+  popup.value.close()
 }
 
 // 处理扫描成功事件
 const handleScanSuccess = (result) => {
-    keyWord.value = result?.data?.split('?qrcode=')[1] || result?.data
-    if (keyWord.value === '') {
-        uni.showToast({ title: '扫码识别失败', icon: 'none' })
-    } else {
-        handleSearch()
-    }
+  keyWord.value = result?.data?.split('?qrcode=')[1] || result?.data
+  if (keyWord.value === '') {
+    uni.showToast({ title: '扫码识别失败', icon: 'none' })
+  } else {
+    handleSearch()
+  }
 }
 
 // 处理扫描失败事件
 const handleScanError = (error) => {
-    console.error('扫描出错:', error.message)
-    uni.showToast({ title: error.message, icon: 'none' })
+  console.error('扫描出错:', error.message)
+  uni.showToast({ title: error.message, icon: 'none' })
 }
 // 清空表单
 const reset = () => {
-    Object.keys(formData).forEach(key => {
-        formData[key] = ''
-    })
-    typeName.value = ''
-    typeList.value = []
+  Object.keys(formData).forEach(key => {
+    formData[key] = ''
+  })
+  typeName.value = ''
+  typeList.value = []
 }
 
 // 提交
 const handleSubmit = () => {
-    updateCheckTime(formData.code).then(res => {
-        if (res.code === 200) {
-            uni.showToast({
-                title: res.msg,
-                icon: 'none',
-            })
+  if (formData.code==='' || formData.code===null){
+    uni.showToast({ title: '请先检索设备', icon: 'none' })
+    return;
+  }
+  if (formData.thisCheckTimeNew===''|| formData.thisCheckTimeNew===null){
+    uni.showToast({ title: '请先选择本次检修时间', icon: 'none' })
+    return;
+  }
+  const data = {
+    maCode: formData.code,
+    thisCheckTime: formData.thisCheckTimeNew,
+    nextCheckTime: formData.nextCheckTimeNew,
+  }
+  updateCheckTime(data).then(res => {
+    if (res.code === 200) {
+      uni.showToast({
+        title: res.msg,
+        icon: 'none',
+      })
 
-            handleSearch()
+      handleSearch()
+    }
+  }).catch(error => {
+    console.log(error)
+  })
+}
+
+// 相机相关方法
+const showToast = (message, position = 'top', duration = 2000) => {
+  message.value = message
+  position.value = position
+  isShow.value = true
+  setTimeout(() => {
+    isShow.value = false
+  }, duration)
+}
+
+// 初始化Cordova - 改进版本
+const initializeCordova = () => {
+  console.log('开始初始化Cordova...');
+  pluginCheckRetries.value = 0;
+  // 清除之前的超时
+  if (deviceReadyTimeout.value) {
+    clearTimeout(deviceReadyTimeout.value);
+  }
+  // 如果Cordova已经准备好，直接检查插件
+  if (isCordovaReady()) {
+    onDeviceReady();
+    return;
+  }
+  // 监听deviceready事件
+  document.addEventListener('deviceready', onDeviceReady, false);
+  // 设置超时，防止无限等待
+  deviceReadyTimeout.value = setTimeout(() => {
+    console.warn('Cordova初始化超时，尝试直接检查插件');
+    checkCameraPlugin();
+  }, 5000);
+}
+
+// 检查Cordova是否准备好
+const isCordovaReady = () => {
+  return !!(window.cordova && (
+      document.readyState === 'complete' ||
+      window.cordova.platformId
+  ));
+}
+
+// 设备准备就绪
+const onDeviceReady = () => {
+  console.log('Cordova设备准备就绪');
+  document.removeEventListener('deviceready', onDeviceReady);
+  checkCameraPlugin();
+}
+
+// 检查相机插件 - 改进版本
+const checkCameraPlugin = () => {
+  console.log(`检查相机插件... (尝试 ${pluginCheckRetries.value + 1}/${maxRetries.value})`);
+  // 按优先级检查插件可用性
+  const pluginAvailable = getCameraPlugin();
+  if (pluginAvailable) {
+    console.log('相机插件可用:', pluginAvailable);
+    cameraReady.value = true;
+    return;
+  }
+  pluginCheckRetries.value++;
+  if (pluginCheckRetries.value < maxRetries.value) {
+    // 递增延迟重试
+    const delay = Math.min(1000 * pluginCheckRetries.value, 5000);
+    console.log(`插件未就绪，${delay}ms后重试...`);
+    setTimeout(() => {
+      checkCameraPlugin();
+    }, delay);
+  } else {
+    console.error('相机插件检查失败，已达到最大重试次数');
+    cameraReady.value = false;
+    uni.showToast({
+      title: '相机插件初始化失败',
+      icon: 'none',
+      duration: 3000
+    });
+  }
+}
+
+// 获取相机插件引用
+const getCameraPlugin = () => {
+  const possiblePaths = [
+    () => window.CameraPreview
+  ];
+  for (let getPlugin of possiblePaths) {
+    try {
+      const plugin = getPlugin();
+      if (plugin && typeof plugin.startCamera === 'function') {
+        console.log('找到相机插件:', plugin);
+        return plugin;
+      }
+    } catch (e) {
+      // 忽略访问错误
+    }
+  }
+  return null;
+}
+
+// 打开相机 - 修改版本
+const openCamera = async () => {
+  console.log('尝试打开相机...');
+  if (!cameraReady.value) {
+    checkCameraPlugin();
+    if (!cameraReady.value) {
+      uni.showModal({
+        title: '提示',
+        content: '相机插件未准备好，请确保应用已正确安装相机插件，或尝试重启应用',
+        showCancel: false
+      });
+      return;
+    }
+  }
+  try {
+    // 显示相机界面
+    showCamera.value = true;
+    // 等待UI更新
+    await new Promise(resolve => setTimeout(resolve, 100));
+    // 初始化相机
+    await initCamera();
+  } catch (error) {
+    console.error('打开相机失败:', error);
+    showCamera.value = false;
+    uni.showToast({
+      title: error.message || '打开相机失败',
+      icon: 'none',
+      duration: 2000
+    });
+  }
+}
+
+// 关闭相机
+const closeCamera = async () => {
+  console.log('关闭相机...');
+  try {
+    await stopCamera();
+  } catch (error) {
+    console.error('关闭相机出错:', error);
+  } finally {
+    showCamera.value = false;
+    cameraStarted.value = false;
+  }
+}
+
+// 停止相机
+const stopCamera = async () => {
+  if (!cameraStarted.value) {
+    return Promise.resolve();
+  }
+  const CameraPreview = getCameraPlugin();
+  if (!CameraPreview) {
+    return Promise.resolve();
+  }
+  return new Promise((resolve) => {
+    CameraPreview.stopCamera(
+        () => {
+          console.log('相机已停止');
+          cameraStarted.value = false;
+          resolve();
+        },
+        (error) => {
+          console.error('停止相机失败:', error);
+          cameraStarted.value = false;
+          resolve();
         }
-    }).catch(error => {
-        console.log(error)
-    })
+    );
+  });
+}
 
+// 拍照
+const takePicture = async () => {
+  if (!cameraStarted.value || isTaking.value || isFocusing.value) {
+    if (isFocusing.value) {
+      uni.showToast({
+        title: '正在聚焦，请稍候...',
+        icon: 'none',
+        duration: 1000
+      });
+    }
+    return;
+  }
+
+  console.log('开始拍照流程...');
+  isTaking.value = true;
+
+  try {
+    const CameraPreview = getCameraPlugin();
+    if (!CameraPreview) {
+      throw new Error('相机插件不可用');
+    }
+    CameraPreview.takePicture({width:640, height:540, quality: 50}, async (base64PictureData) => {
+      console.log('拍照返回数据',base64PictureData);
+      await processImage(base64PictureData);
+    });
+  } catch (error) {
+    console.error('拍照过程出错:', error);
+    uni.showToast({
+      title: error.message || '拍照失败',
+      icon: 'none'
+    });
+  } finally {
+    isTaking.value = false;
+  }
+}
+
+// 处理图片
+const processImage = async (imageData) => {
+  isProcessing.value = true;
+  try {
+    const cleanBase64 = await removeExifData(imageData);
+    console.log('清理后的纯base64:', cleanBase64);
+    console.log('开始OCR识别...');
+
+    uni.request({
+      url: '/material/app/ocr/getOcrCodeTwo',
+      method: 'POST',
+      data: {
+        image: cleanBase64,
+        jiju_type: '',
+        auth_lic: 'xIWDlaDVdijcBB4mjhGCPYk5Kvk8tHZJbUn+vW+ih15+MYx98e/PXyBmKL5gFcWMPznLgDA15QuSAnZQSLddwdy9HkZgtuQDEEZZ351Eyb1eiDUccUnyoSGIrNimbx5TooBNNPYqU4qJeFrPJXAqjBHzRrxoBxuR2CEGKQPgHC4='
+      },
+      header: {
+        "Content-Type": "application/json;charset=UTF-8"
+      },
+      success: async (res) => {
+        if (!res.data.code){
+          res=JSON.parse(decryptWithSM4(res.data))
+        } else {
+          res =res.data
+        }
+        const {data: resData} = res
+        if (resData.code===0){
+          if (resData.data.result) {
+            // 识别成功，将结果填入输入框并自动查询
+            keyWord.value = resData.data.result;
+            await closeCamera();
+            // 自动触发查询
+            handleSearch();
+            uni.showToast({
+              title: '识别成功',
+              icon: 'success'
+            });
+          } else {
+            console.log('识别失败！' + resData.data.msg)
+            showToast('识别失败！', 'bottom')
+          }
+        } else {
+          showToast('识别失败！', 'bottom')
+        }
+      },
+      fail: (err) => {
+        showToast('请求失败！', 'bottom')
+      },
+    })
+  } catch (error) {
+    console.error('图片处理或OCR识别失败:', error);
+    uni.showToast({
+      title: '识别失败，请重试',
+      icon: 'none'
+    });
+  } finally {
+    isProcessing.value = false;
+  }
+}
+
+// 移除EXIF数据
+const removeExifData = (pureBase64) => {
+  return new Promise((resolve, reject) => {
+    const img = new Image();
+    img.onload = () => {
+      const canvas = document.createElement('canvas');
+      const ctx = canvas.getContext('2d');
+
+      canvas.width = img.width;
+      canvas.height = img.height;
+      ctx.drawImage(img, 0, 0);
+
+      const dataUrl = canvas.toDataURL('image/jpeg', 0.8);
+      const cleanPureBase64 = dataUrl.split(',')[1];
+      resolve(cleanPureBase64);
+    };
+
+    img.onerror = () => reject(new Error('图像加载失败'));
+    img.src = `data:image/jpeg;base64,${pureBase64}`;
+  });
+}
+
+// 打开相册
+const openGallery = () => {
+  uni.chooseImage({
+    count: 1,
+    sourceType: ['album'],
+    success: (res) => {
+      if (res.tempFilePaths && res.tempFilePaths.length > 0) {
+        const filePath = res.tempFilePaths[0];
+        const xhr = new XMLHttpRequest();
+        xhr.open('GET', filePath, true);
+        xhr.responseType = 'blob';
+        xhr.onload = () => {
+          if (xhr.status === 200) {
+            const blob = xhr.response;
+            const reader = new FileReader();
+            reader.onload = (e) => {
+              const base64 = e.target.result.split(',')[1];
+              convertImageToBase64(base64);
+            };
+            reader.readAsDataURL(blob);
+          }
+        };
+        xhr.send();
+      }
+    },
+    fail: (error) => {
+      console.error('选择图片失败:', error);
+      uni.showToast({
+        title: '选择图片失败',
+        icon: 'none'
+      });
+    }
+  });
+}
+
+// 将图片转换为base64
+const convertImageToBase64 = async (processedBase64) => {
+  isProcessing.value = true;
+  try {
+    console.log('相册base64数据', processedBase64);
+    console.log('开始OCR识别...');
+
+    uni.request({
+      url: '/material/app/ocr/getOcrCodeTwo',
+      method: 'POST',
+      data: {
+        image: processedBase64,
+        jiju_type: '',
+        auth_lic: 'xIWDlaDVdijcBB4mjhGCPYk5Kvk8tHZJbUn+vW+ih15+MYx98e/PXyBmKL5gFcWMPznLgDA15QuSAnZQSLddwdy9HkZgtuQDEEZZ351Eyb1eiDUccUnyoSGIrNimbx5TooBNNPYqU4qJeFrPJXAqjBHzRrxoBxuR2CEGKQPgHC4='
+      },
+      header: {
+        "Content-Type": "application/json;charset=UTF-8"
+      },
+      success: async (res) => {
+        if (!res.data.code){
+          res=JSON.parse(decryptWithSM4(res.data))
+        } else {
+          res =res.data
+        }
+        const {data: resData} = res
+        if (resData.code===0){
+          if (resData.data.result) {
+            // 识别成功，将结果填入输入框并自动查询
+            keyWord.value = resData.data.result;
+            await closeCamera();
+            // 自动触发查询
+            handleSearch();
+            uni.showToast({
+              title: '识别成功',
+              icon: 'success'
+            });
+          } else {
+            showToast('识别失败！', 'bottom')
+          }
+        } else {
+          showToast('识别失败！', 'bottom')
+        }
+      },
+      fail: (err) => {
+        uni.showToast({
+          title: '请求失败：' + err.errMsg,
+          icon: 'none',
+        })
+      },
+    });
+  } catch (error) {
+    console.error('相册图片处理或OCR识别失败:', error);
+    showToast('识别失败！', 'bottom')
+  } finally {
+    isProcessing.value = false;
+  }
 }
 </script>
 
 <style scoped lang="scss">
+
 .accept {
-    padding: 24rpx;
-    height: 90vh;
-    word-break: break-all;
-    background-color: #f7f8fa;
-    display: flex;
-    flex-direction: column;
+  padding: 24rpx;
+  height: 90vh;
+  word-break: break-all;
+  background-color: #f7f8fa;
+  display: flex;
+  flex-direction: column;
 
-    // 卡片样式
-    .card {
-        padding: 32rpx;
-        background-color: #fff;
-        border-radius: 20rpx;
-        box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.06);
-        margin-bottom: 24rpx;
-        height: auto;
+  // 卡片样式
+  .card {
+    padding: 32rpx;
+    background-color: #fff;
+    border-radius: 20rpx;
+    box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.06);
+    margin-bottom: 24rpx;
+    height: auto;
 
-        // 表单样式
-        :deep(.uni-forms) {
-            .uni-forms-item {
-                padding: 24rpx 0;
-                margin-bottom: 0;
-                border-bottom: 2rpx solid #f5f5f5;
+    // 表单样式
+    :deep(.uni-forms) {
+      .uni-forms-item {
+        padding: 24rpx 0;
+        margin-bottom: 0;
+        border-bottom: 2rpx solid #f5f5f5;
 
-                &:last-child {
-                    border-bottom: none;
-                }
-
-                .uni-forms-item__label {
-                    height: 2.75rem;
-                    color: #8c8c8c;
-                }
-
-                // 下拉选择框样式
-                .uni-data-select {
-                    .uni-select {
-                        border: 2rpx solid #e8e8e8;
-                        border-radius: 12rpx;
-                        height: 88rpx;
-                        padding: 0 24rpx;
-                        transition: all 0.3s ease;
-
-                        &:focus-within {
-                            border-color: #3784fb;
-                            box-shadow: 0 0 0 2rpx rgba(55, 132, 251, 0.1);
-                        }
-
-                        .uni-select__input-box {
-                            height: 88rpx;
-                            line-height: 88rpx;
-                        }
-
-                        .uni-select__input-text {
-                            font-size: 28rpx;
-                            color: #262626;
-                        }
-                    }
-                }
-
-                // 输入框样式
-                .uni-easyinput {
-                    .uni-easyinput__content {
-                        background-color: #f7f8fa;
-                        border: 2rpx solid #e8e8e8;
-                        border-radius: 12rpx;
-                        height: 88rpx;
-                        padding: 0 24rpx;
-                        transition: all 0.3s ease;
-
-                        &:focus-within {
-                            border-color: #3784fb;
-                            box-shadow: 0 0 0 2rpx rgba(55, 132, 251, 0.1);
-                        }
-
-                        .uni-easyinput__content-input {
-                            font-size: 28rpx;
-                            height: 88rpx;
-                            line-height: 88rpx;
-                            color: #262626;
-                        }
-                    }
-                }
-            }
+        &:last-child {
+          border-bottom: none;
         }
-    }
 
-    // 底部按钮
-    .btn {
-        position: fixed;
-        bottom: 0;
-        left: 0;
-        width: calc(100% - 20px);
-        background-color: #fff; /* 可根据需要设定背景色 */
-        padding: 10px;
-        box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.1); /* 可选：添加顶部阴影 */
-        display: flex;
-        justify-content: center; /* 水平居中 */
-        gap: 10px; /* 按钮间距 */
-        z-index: 999; /* 保证显示在最上层 */
+        .uni-forms-item__label {
+          height: 2.75rem;
+          color: #8c8c8c;
+        }
 
-        .btn-cont {
-            flex: 1;
+        // 下拉选择框样式
+        .uni-data-select {
+          .uni-select {
+            border: 2rpx solid #e8e8e8;
+            border-radius: 12rpx;
             height: 88rpx;
-            line-height: 88rpx;
-            text-align: center;
-            background: linear-gradient(135deg, #4b8eff 0%, #3784fb 100%);
-            color: #fff;
-            border-radius: 44rpx;
-            font-size: 32rpx;
-            font-weight: 600;
-            box-shadow: 0 6rpx 20rpx rgba(55, 132, 251, 0.2);
+            padding: 0 24rpx;
             transition: all 0.3s ease;
 
-            &:active {
-                transform: scale(0.98);
-                opacity: 0.9;
-                box-shadow: 0 2rpx 8rpx rgba(55, 132, 251, 0.2);
+            &:focus-within {
+              border-color: #3784fb;
+              box-shadow: 0 0 0 2rpx rgba(55, 132, 251, 0.1);
             }
 
-            // 清空按钮样式
-            &:first-child {
-                background: #fff;
-                color: #3784fb;
-                border: 2rpx solid #3784fb;
-                box-shadow: none;
-
-                &:active {
-                    background: #f7f8fa;
-                }
+            .uni-select__input-box {
+              height: 88rpx;
+              line-height: 88rpx;
             }
+
+            .uni-select__input-text {
+              font-size: 28rpx;
+              color: #262626;
+            }
+          }
         }
-    }
-}
-</style>
 
+        // 输入框样式
+        .uni-easyinput {
+          .uni-easyinput__content {
+            background-color: #f7f8fa;
+            border: 2rpx solid #e8e8e8;
+            border-radius: 12rpx;
+            height: 88rpx;
+            padding: 0 24rpx;
+            transition: all 0.3s ease;
+
+            &:focus-within {
+              border-color: #3784fb;
+              box-shadow: 0 0 0 2rpx rgba(55, 132, 251, 0.1);
+            }
+
+            .uni-easyinput__content-input {
+              font-size: 28rpx;
+              height: 88rpx;
+              line-height: 88rpx;
+              color: #262626;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  // 底部按钮
+  .btn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: calc(100% - 20px);
+    background-color: #fff; /* 可根据需要设定背景色 */
+    padding: 10px;
+    box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.1); /* 可选：添加顶部阴影 */
+    display: flex;
+    justify-content: center; /* 水平居中 */
+    gap: 10px; /* 按钮间距 */
+
+    .btn-cont {
+      flex: 1;
+      height: 88rpx;
+      line-height: 88rpx;
+      text-align: center;
+      background: linear-gradient(135deg, #4b8eff 0%, #3784fb 100%);
+      color: #fff;
+      border-radius: 44rpx;
+      font-size: 32rpx;
+      font-weight: 600;
+      box-shadow: 0 6rpx 20rpx rgba(55, 132, 251, 0.2);
+      transition: all 0.3s ease;
+
+      &:active {
+        transform: scale(0.98);
+        opacity: 0.9;
+        box-shadow: 0 2rpx 8rpx rgba(55, 132, 251, 0.2);
+      }
+
+      // 清空按钮样式
+      &:first-child {
+        background: #fff;
+        color: #3784fb;
+        border: 2rpx solid #3784fb;
+        box-shadow: none;
+
+        &:active {
+          background: #f7f8fa;
+        }
+      }
+    }
+  }
+}
+
+/* 相机相关样式 */
+.camera-container {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: #000;
+  z-index: 9999;
+  display: flex;
+  flex-direction: column;
+}
+
+.viewfinder-container {
+  position: absolute;
+  width: 100%;
+  height: 40%;
+  margin-top: 150px;
+  z-index: 10001;
+}
+
+.bottom-controls {
+  position: absolute;
+  bottom: 100rpx;
+  left: 0;
+  right: 0;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  width: 100%;
+  padding: 0 60rpx;
+  z-index: 3;
+}
+
+.control-btn {
+  width: 100rpx;
+  height: 100rpx;
+  background-color: rgba(0, 0, 0, 0.3);
+  border-radius: 50%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border: 2rpx solid rgba(255, 255, 255, 0.3);
+  margin: 0 20rpx;
+}
+
+.control-icon {
+  color: #fff;
+  font-size: 40rpx;
+  font-weight: bold;
+}
+
+.photo-btn {
+  width: 140rpx;
+  height: 140rpx;
+  background-color: rgba(0, 0, 0, 0.3);
+  border-radius: 50%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border: 6rpx solid rgba(255, 255, 255, 0.5);
+  transition: all 0.2s ease;
+  margin: 0 20rpx;
+}
+
+.photo-btn.taking {
+  transform: scale(0.9);
+  background-color: rgba(75, 142, 255, 0.8);
+}
+
+.photo-btn.disabled {
+  opacity: 0.5;
+  background-color: rgba(255, 255, 255, 0.1);
+}
+
+.photo-btn-inner {
+  width: 100rpx;
+  height: 100rpx;
+  background-color: rgba(255, 255, 255, 0.9);
+  border-radius: 50%;
+  transition: all 0.2s ease;
+}
+
+.photo-btn.taking .photo-btn-inner {
+  background-color: #4b8eff;
+}
+
+.photo-btn.disabled .photo-btn-inner {
+  background-color: #ccc;
+}
+
+.loading-overlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 100;
+  pointer-events: auto;
+}
+
+.loading-content {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  background-color: rgba(255, 255, 255, 0.9);
+  padding: 60rpx;
+  border-radius: 20rpx;
+}
+
+.loading-spinner {
+  width: 60rpx;
+  height: 60rpx;
+  border: 6rpx solid #f3f3f3;
+  border-top: 6rpx solid #4b8eff;
+  border-radius: 50%;
+  animation: spin 1s linear infinite;
+  margin-bottom: 30rpx;
+}
+
+@keyframes spin {
+  0% {
+    transform: rotate(0deg);
+  }
+  100% {
+    transform: rotate(360deg);
+  }
+}
+
+.loading-text {
+  color: #333;
+  font-size: 32rpx;
+  font-weight: bold;
+}
+
+.custom-toast {
+  position: fixed;
+  left: 0;
+  right: 0;
+  padding: 12px;
+  background: rgba(0, 0, 0, 0.7);
+  color: white;
+  text-align: center;
+  z-index: 9999;
+  opacity: 0;
+  transition: opacity 0.3s;
+}
+.custom-toast.top { top: 0; }
+.custom-toast.bottom { bottom: 0; }
+.custom-toast.show { opacity: 1; }
+</style>
\ No newline at end of file
diff --git a/src/pages/devicesSearch/ocrSearch.vue b/src/pages/devicesSearch/ocrSearch.vue
index 15c61d8..e29a35d 100644
--- a/src/pages/devicesSearch/ocrSearch.vue
+++ b/src/pages/devicesSearch/ocrSearch.vue
@@ -143,7 +143,9 @@
       </view>
     </view>
   </view>
-  <view class="custom-toast" :class="{'show': isShow, 'top': position === 'top', 'bottom': position === 'bottom'}">
+  <view class="custom-toast"
+        :class="{'show': isShow, 'top': position === 'top', 'bottom': position === 'bottom'}"
+        ref="toast">
     {{ message }}
   </view>
 </template>
@@ -588,10 +590,10 @@ export default {
                 });
               } else {
                 console.log('识别失败！' + resData.data.msg)
-                this.$refs.toast.show('识别失败！', 'bottom')
+                this.show('识别失败！', 'bottom')
               }
             } else {
-              this.$refs.toast.show('识别失败！', 'bottom')
+              this.show('识别失败！', 'bottom')
             }
           },
           fail: (err) => {
@@ -686,10 +688,10 @@ export default {
                   icon: 'success'
                 });
               } else {
-                this.$refs.toast.show('识别失败！', 'bottom')
+                this.show('识别失败！', 'bottom')
               }
             } else {
-              this.$refs.toast.show('识别失败！', 'bottom')
+              this.show('识别失败！', 'bottom')
             }
           },
           fail: (err) => {
@@ -701,7 +703,7 @@ export default {
         });
       } catch (error) {
         console.error('相册图片处理或OCR识别失败:', error);
-        this.$refs.toast.show('识别失败！', 'bottom')
+        this.show('识别失败！', 'bottom')
       } finally {
         this.isProcessing = false;
       }
diff --git a/src/services/wsMaInfo/wsMaInfo.js b/src/services/wsMaInfo/wsMaInfo.js
index 40d4c17..b26ad5d 100644
--- a/src/services/wsMaInfo/wsMaInfo.js
+++ b/src/services/wsMaInfo/wsMaInfo.js
@@ -64,11 +64,11 @@ export const getMaModeData = (parentId) => {
 }
 
 
-export const updateCheckTime = (maCode) => {
+export const updateCheckTime = (data) => {
 	return http({
 		method: 'POST',
 		url: '/material/wsMaInfo/updateCheckTime',
-		data: {maCode}
+		data: data
 	})
 }