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

electron/config/config.default.js

@@ -65,7 +65,7 @@ module.exports = (appInfo) => {
    */
   config.remoteUrl = {
     enable: false,
-    url: 'http://localhost:3000'
+    url: 'http://localhost:3000/#/home'
   };
 
   /**

electron/config/config.prod.js

@@ -9,7 +9,7 @@ module.exports = (appInfo) => {
   /**
    * 开发者工具
    */
-  config.openDevTools = true;
+  config.openDevTools = false;
 
   /**
    * 应用程序顶部菜单
@@ -22,6 +22,13 @@ module.exports = (appInfo) => {
   config.jobs = {
     messageLog: false
   };
+  /**
+   * 远程模式-web地址
+   */
+  config.remoteUrl = {
+    enable: false,
+    url: 'http://localhost:3000/#/home'
+  };
 
   return {
     ...config

electron/controller/utils.js

@@ -62,7 +62,7 @@ class UtilsController extends Controller {
     win.loadURL(config.url); // 设置窗口的 URL
     // 监听窗口关闭事件
 
-    win.webContents.openDevTools(config.openDevTools);
+   // win.webContents.openDevTools(config.openDevTools);
     win.on('close', () => {
       delete this.app.electron[config.id]; // 删除窗口引用
     });

frontend/src/views/Photography/detail.vue

@@ -341,6 +341,10 @@ const onSizeChange = (data) => {
 
 // 开始生成操作
 const generate = async function () {
+  if ( form.dataType == '1'  && !form.excel_path) {
+    ElMessage.error('请上传商品基础资料')
+    return
+  }
   const tokenInfoStore = tokenInfo();
   const token = tokenInfoStore.getToken; // 使用 getToken() 获取 token
   let temp_list = []
@@ -360,16 +364,17 @@ const generate = async function () {
     token,
   }
   // 开启进度弹窗
-  progress.value = 0
-  openLoadingDialog(20)
-  requesting.value =  true
+  requesting.value =  false
   console.log("params", "color:#3f7cff", params);
+  partErrList.value = []
+  message.value = '正在为您处理，请稍后'
+  progress.value = 0
+  openLoadingDialog(goods_art_nos.value.length * 10)
   clientStore.ipc.removeAllListeners(icpList.generate.generatePhotoDetail);
   clientStore.ipc.send(icpList.generate.generatePhotoDetail, params);
   clientStore.ipc.on(icpList.generate.generatePhotoDetail, (event, result) => {
     console.log('result', result)
-    requesting.value =  false
-    partErrList.value = []
+    requesting.value =  true
     clientStore.ipc.removeAllListeners(icpList.generate.generatePhotoDetail);
     clearInterval(INTERVAL.value)
     if (result.code === 0) {