|
@@ -58,9 +58,9 @@ export const checkInfo = defineStore('checkInfo', () => {
|
|
|
// 计算完成进度
|
|
// 计算完成进度
|
|
|
const getProgress = computed(() => {
|
|
const getProgress = computed(() => {
|
|
|
let completed = 0;
|
|
let completed = 0;
|
|
|
- const total = Object.keys(devices).length;
|
|
|
|
|
|
|
+ const total = Object.keys(devices).length -1; //去掉蓝牙
|
|
|
for (const device of Object.values(devices)) {
|
|
for (const device of Object.values(devices)) {
|
|
|
- if (device.status === 2) completed++;
|
|
|
|
|
|
|
+ if (device.status === 2 && device.msg_type !== 'connect_bluetooth') completed++;
|
|
|
}
|
|
}
|
|
|
let value = parseFloat((completed / total * 100).toFixed(2));
|
|
let value = parseFloat((completed / total * 100).toFixed(2));
|
|
|
return value
|
|
return value
|
|
@@ -209,10 +209,10 @@ export const checkInfo = defineStore('checkInfo', () => {
|
|
|
|
|
|
|
|
|
|
|
|
|
if(checkTime.value >= 60){
|
|
if(checkTime.value >= 60){
|
|
|
- if( devices.blue_tooth && devices.blue_tooth.status === 0){
|
|
|
|
|
|
|
+ /* if( devices.blue_tooth && devices.blue_tooth.status === 0){
|
|
|
devices.blue_tooth.status = -1;
|
|
devices.blue_tooth.status = -1;
|
|
|
devices.blue_tooth.msg = '遥控器未连接。';
|
|
devices.blue_tooth.msg = '遥控器未连接。';
|
|
|
- }
|
|
|
|
|
|
|
+ }*/
|
|
|
if( devices.mcu.status !== 2 || mcu.status !== 2 ){
|
|
if( devices.mcu.status !== 2 || mcu.status !== 2 ){
|
|
|
devices.mcu.status = -1;
|
|
devices.mcu.status = -1;
|
|
|
mcu.status = -1;
|
|
mcu.status = -1;
|