feat: 手动排版时接口超时显示进度，提示用户已下载成功了

src/server/entity/function.js

@@ -148,7 +148,7 @@ export default {
       fs.writeFileSync(p, JSON.stringify(data));
       fs.writeFileSync(p, JSON.stringify(data));
       res.json({ code: 200 });
       res.json({ code: 200 });
     } catch (e) {
     } catch (e) {
-      res.json({ code: 500, msg: e });
+      res.json({ code: 500, msg: e.message });
     }
     }
   },
   },
 
 
@@ -242,7 +242,7 @@ export default {
       res.setHeader("Act-Request-URL", `${env}/${url}`);
       res.setHeader("Act-Request-URL", `${env}/${url}`);
       res.json(data);
       res.json(data);
     } catch (err) {
     } catch (err) {
-      res.json({ code: 500, msg: err });
+      res.json({ code: 500, msg: err.message });
     }
     }
   },
   },
   getCompanyList: async (req, res) => {
   getCompanyList: async (req, res) => {
@@ -254,7 +254,7 @@ export default {
       res.send(data);
       res.send(data);
     } catch (err) {
     } catch (err) {
       console.log(err);
       console.log(err);
-      res.json({ code: 500, msg: err });
+      res.json({ code: 500, msg: err.message });
     }
     }
   },
   },
   commitApply: async () => {},
   commitApply: async () => {},
@@ -287,7 +287,7 @@ export default {
       res.send(data);
       res.send(data);
     } catch (err) {
     } catch (err) {
       console.log(err);
       console.log(err);
-      res.json({ code: 500, msg: err });
+      res.json({ code: 500, msg: err.message });
     }
     }
   },
   },
   downloadByDesignId: async (req, res) => {
   downloadByDesignId: async (req, res) => {
@@ -323,7 +323,7 @@ export default {
         });
         });
     } catch (err) {
     } catch (err) {
       console.log(err);
       console.log(err);
-      res.json({ code: 500, msg: err });
+      res.json({ code: 500, msg: err.message });
     }
     }
   },
   },
   uploadImage: async (req, res) => {
   uploadImage: async (req, res) => {
@@ -354,7 +354,7 @@ export default {
       });
       });
     } catch (err) {
     } catch (err) {
       console.log(err);
       console.log(err);
-      res.json({ code: 500, msg: err });
+      res.json({ code: 500, msg: err.message });
     }
     }
   },
   },
   getPngImg: async (req, res) => {
   getPngImg: async (req, res) => {
@@ -384,7 +384,7 @@ export default {
         });
         });
       }
       }
     } catch (err) {
     } catch (err) {
-      res.send({ code: 500, msg: err });
+      res.send({ code: 500, msg: err.message });
     }
     }
   },
   },
   login: async (req, res) => {
   login: async (req, res) => {
@@ -395,7 +395,7 @@ export default {
       res.send(data);
       res.send(data);
     } catch (err) {
     } catch (err) {
       console.log(err);
       console.log(err);
-      res.json({ code: 500, msg: err });
+      res.json({ code: 500, msg: err.message });
     }
     }
   },
   },
   toPrint: (req, res) => {
   toPrint: (req, res) => {
@@ -409,7 +409,7 @@ export default {
         res.send({ code: 200, msg: "操作成功" });
         res.send({ code: 200, msg: "操作成功" });
       })
       })
       .catch(err => {
       .catch(err => {
-        res.send({ code: 500, msg: err });
+        res.send({ code: 500, msg: err.message });
       });
       });
   },
   },
   checkUpdate: async (req, res) => {
   checkUpdate: async (req, res) => {
@@ -430,7 +430,7 @@ export default {
       }
       }
     } catch (err) {
     } catch (err) {
       console.log(err);
       console.log(err);
-      res.json({ code: 500, msg: err });
+      res.json({ code: 500, msg: err.message });
     }
     }
   },
   },
 
 
@@ -558,7 +558,7 @@ export default {
       });
       });
     } catch (err) {
     } catch (err) {
       console.log(err);
       console.log(err);
-      res.json({ code: 500, msg: err });
+      res.json({ code: 500, msg: err.message });
     }
     }
   },
   },
   //获取国家名称及代码
   //获取国家名称及代码
@@ -572,7 +572,7 @@ export default {
       res.send(data);
       res.send(data);
     } catch (error) {
     } catch (error) {
       console.log(error);
       console.log(error);
-      res.json({ code: 500, msg: error });
+      res.json({ code: 500, msg: error.message });
     }
     }
   },
   },
   //复制文件夹下文件
   //复制文件夹下文件
@@ -583,7 +583,7 @@ export default {
       res.json({ code: 200 });
       res.json({ code: 200 });
     } catch (error) {
     } catch (error) {
       console.log(error);
       console.log(error);
-      res.json({ code: 500, msg: error });
+      res.json({ code: 500, msg: error.message });
     }
     }
   },
   },
 
 
@@ -616,7 +616,7 @@ export default {
       res.json({ code: 200, data: result });
       res.json({ code: 200, data: result });
     } catch (err) {
     } catch (err) {
       console.log(err);
       console.log(err);
-      res.json({ code: 500, msg: err });
+      res.json({ code: 500, msg: err.message });
     }
     }
   },
   },
   scanProduce: async (req, res) => {
   scanProduce: async (req, res) => {
@@ -638,7 +638,7 @@ export default {
       res.send(data);
       res.send(data);
     } catch (error) {
     } catch (error) {
       console.log("scanProduce", error);
       console.log("scanProduce", error);
-      res.json({ code: 500, msg: error });
+      res.json({ code: 500, msg: error.message });
     }
     }
   },
   },
   checkInventory: async (req, res) => {
   checkInventory: async (req, res) => {
@@ -659,7 +659,7 @@ export default {
       res.send(data);
       res.send(data);
     } catch (error) {
     } catch (error) {
       console.log("checkInventory", error);
       console.log("checkInventory", error);
-      res.json({ code: 500, msg: error });
+      res.json({ code: 500, msg: error.message });
     }
     }
   },
   },
   createBatchFolder: async (req, res) => {
   createBatchFolder: async (req, res) => {
@@ -670,7 +670,7 @@ export default {
       res.send(data);
       res.send(data);
     } catch (error) {
     } catch (error) {
       console.log("createBatchFolder", error);
       console.log("createBatchFolder", error);
-      res.json({ code: 500, msg: error });
+      res.json({ code: 500, msg: error.message });
     }
     }
   },
   },
 
 
@@ -688,7 +688,7 @@ export default {
       res.send(data);
       res.send(data);
     } catch (error) {
     } catch (error) {
       console.log("productionConfig", error);
       console.log("productionConfig", error);
-      res.json({ code: 500, msg: error });
+      res.json({ code: 500, msg: error.message });
     }
     }
   },
   },
   //更新生产配置
   //更新生产配置
@@ -705,7 +705,7 @@ export default {
       res.send(data);
       res.send(data);
     } catch (error) {
     } catch (error) {
       console.log("productionConfigUpdate", error);
       console.log("productionConfigUpdate", error);
-      res.json({ code: 500, msg: error });
+      res.json({ code: 500, msg: error.message });
     }
     }
   },
   },
   //排版列表（分页）
   //排版列表（分页）
@@ -722,7 +722,7 @@ export default {
       res.send(data);
       res.send(data);
     } catch (error) {
     } catch (error) {
       console.log("productionSoftware", error);
       console.log("productionSoftware", error);
-      res.json({ code: 500, msg: error });
+      res.json({ code: 500, msg: error.message });
     }
     }
   },
   },
   //查询该批次下的所有素材
   //查询该批次下的所有素材
@@ -740,7 +740,7 @@ export default {
       res.send(data);
       res.send(data);
     } catch (error) {
     } catch (error) {
       console.log("listMaterialsByBatch", error);
       console.log("listMaterialsByBatch", error);
-      res.json({ code: 500, msg: error });
+      res.json({ code: 500, msg: error.message });
     }
     }
   },
   },
   //重新合成排版
   //重新合成排版
@@ -758,7 +758,7 @@ export default {
       res.send(data);
       res.send(data);
     } catch (error) {
     } catch (error) {
       console.log("psReComposingDesignImages", error);
       console.log("psReComposingDesignImages", error);
-      res.json({ code: 500, msg: error });
+      res.json({ code: 500, msg: error.message });
     }
     }
   },
   },
   //根据批次分页查询操作单
   //根据批次分页查询操作单
@@ -775,7 +775,7 @@ export default {
       res.send(data);
       res.send(data);
     } catch (error) {
     } catch (error) {
       console.log("listOperationByBatch", error);
       console.log("listOperationByBatch", error);
-      res.json({ code: 500, msg: error });
+      res.json({ code: 500, msg: error.message });
     }
     }
   },
   },
   replenishmentComposingDesignImages: async (req, res) => {
   replenishmentComposingDesignImages: async (req, res) => {
@@ -807,7 +807,7 @@ export default {
       res.json({ code: 200, data: result });
       res.json({ code: 200, data: result });
     } catch (error) {
     } catch (error) {
       console.log("replenishmentComposingDesignImages", error);
       console.log("replenishmentComposingDesignImages", error);
-      res.json({ code: 500, msg: error });
+      res.json({ code: 500, msg: error.message });
     }
     }
   },
   },
   podOrderBatchDownload: async (req, res) => {
   podOrderBatchDownload: async (req, res) => {
@@ -824,7 +824,7 @@ export default {
       res.json({ code: 200, data });
       res.json({ code: 200, data });
     } catch (error) {
     } catch (error) {
       console.log("podOrderBatchDownload", error);
       console.log("podOrderBatchDownload", error);
-      res.json({ code: 500, msg: error });
+      res.json({ code: 500, msg: error.message });
     }
     }
   },
   },
   getPodOrderLog: async (req, res) => {
   getPodOrderLog: async (req, res) => {
@@ -842,7 +842,7 @@ export default {
       res.json({ code: 200, data });
       res.json({ code: 200, data });
     } catch (error) {
     } catch (error) {
       console.log("getPodOrderLog", error);
       console.log("getPodOrderLog", error);
-      res.json({ code: 500, msg: error });
+      res.json({ code: 500, msg: error.message });
     }
     }
   }
   }
 };
 };

src/utils/axios.js

@@ -30,11 +30,11 @@ service.interceptors.request.use(
     if (user) {
     if (user) {
       config.headers["jwt-token"] = user.token;
       config.headers["jwt-token"] = user.token;
     }
     }
-    startLoading();
+    if (!config.skipLoading) startLoading();
     return config;
     return config;
   },
   },
   error => {
   error => {
-    endLoading();
+    if (!error.config?.skipLoading) endLoading();
     // do something with request error
     // do something with request error
     return Promise.reject(error);
     return Promise.reject(error);
   }
   }
@@ -45,7 +45,7 @@ service.interceptors.response.use(
   async response => {
   async response => {
     // do something with response data
     // do something with response data
     const res = response.data;
     const res = response.data;
-    endLoading();
+    if (!response.config.skipLoading) endLoading();
     if (res.code) {
     if (res.code) {
       if (res.code !== 200) {
       if (res.code !== 200) {
         if (res.code === 411 || res.code === 205 || res.code === 301) {
         if (res.code === 411 || res.code === 205 || res.code === 301) {
@@ -82,7 +82,7 @@ service.interceptors.response.use(
     return Promise.resolve(res);
     return Promise.resolve(res);
   },
   },
   error => {
   error => {
-    endLoading();
+    if (!error.config?.skipLoading) endLoading();
     let errMsg = "请求失败，请稍后重试";
     let errMsg = "请求失败，请稍后重试";
 
 
     // 1. 有服务端响应：提取后端返回的 msg
     // 1. 有服务端响应：提取后端返回的 msg