Browse Source

Merge branch 'master' of http://gitlab.pubdata.cn/liangyibo/CameraMachine

rambo 6 months ago
parent
commit
f29cba18f0

+ 1 - 1
frontend/src/stores/modules/check.ts

@@ -88,7 +88,7 @@ export const checkInfo = defineStore('checkInfo', () => {
             clearInterval(CKTimerInterval)
             checkTime.value = 0
             mcu.isInitSend = false
-            return '拍照机初始化失败,请重新监测!';
+            return '拍照机连接失败,请重新检查,可以尝试重新启动拍照机,插拔USB口,强制初始化等!';
         }
         for (const device of Object.values(devices)) {
             if (device.status === -1  && device.msg_type !== 'connect_bluetooth') {

+ 2 - 1
frontend/src/views/Photography/seniorDetail.vue

@@ -151,7 +151,8 @@ const startProcess = () => {
   // 模拟进度更新
   const interval = setInterval(() => {
     if (progress.value < 100) {
-      progress.value += 10
+    //  progress.value += 10
+      progress.value = Math.min(progress.value + 10, 100)
     } else {
       clearInterval(interval)
       message.value = '全部处理完毕'