|
@@ -187,12 +187,14 @@ export default {
|
|
console.error(error);
|
|
console.error(error);
|
|
});
|
|
});
|
|
this.scanStatus = "PAUSE";
|
|
this.scanStatus = "PAUSE";
|
|
|
|
+ this.realScanCount = getPreUploadFileCount(this.GLOBAL.input);
|
|
|
|
|
|
// 缓存已扫描的数据
|
|
// 缓存已扫描的数据
|
|
const res = getPreUploadFiles(this.GLOBAL.input);
|
|
const res = getPreUploadFiles(this.GLOBAL.input);
|
|
if (!res.succeed) {
|
|
if (!res.succeed) {
|
|
logger.error(`03扫描仪停止,故障:${res.errorMsg}`);
|
|
logger.error(`03扫描仪停止,故障:${res.errorMsg}`);
|
|
this.$message.error(res.errorMsg);
|
|
this.$message.error(res.errorMsg);
|
|
|
|
+ renamePreUploadJsonFile(this.GLOBAL.input);
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
logger.info(`03扫描仪停止,扫描数:${res.data.length}`);
|
|
logger.info(`03扫描仪停止,扫描数:${res.data.length}`);
|
|
@@ -216,6 +218,7 @@ export default {
|
|
const confirm = await this.$confirm(`是否继续扫描?`, "提示", {
|
|
const confirm = await this.$confirm(`是否继续扫描?`, "提示", {
|
|
type: "warning"
|
|
type: "warning"
|
|
}).catch(() => {});
|
|
}).catch(() => {});
|
|
|
|
+ this.clearScanList();
|
|
|
|
|
|
if (confirm !== "confirm") {
|
|
if (confirm !== "confirm") {
|
|
this.close();
|
|
this.close();
|