Merge branch 'release/3.4.2-20230616'

.vscode/settings.json

@@ -142,5 +142,6 @@
   ],
   "[dotenv]": {
     "editor.defaultFormatter": "foxundermoon.shell-format"
-  }
+  },
+  "vue-i18n.i18nPaths": "src\\locales,src\\locales\\lang,dist\\resource\\tinymce\\langs,public\\resource\\tinymce\\langs"
 }

src/views/scenes/list.vue

@@ -62,12 +62,12 @@
                     ifShow: getCheckRole('super') && record.companyId != 1058,
                     onClick: handleMove.bind(null, record),
                   },
-                  // {
-                  //   color: 'warning',
-                  //   label: '虚实同步',
-                  //   ifShow: true,
-                  //   onClick: syncReality.bind(null, record),
-                  // },
+                  {
+                    color: 'warning',
+                    label: '虚实同步',
+                    ifShow: true,
+                    onClick: syncReality.bind(null, record),
+                  },
                   {
                     color: 'error',
                     label: '分享',
@@ -353,10 +353,14 @@
           content: t('routes.scenes.copyInfi.content'),
           onOk: async () => {
             setLoading(true);
-            sceneCopy({ num: record.num }).then(() => {
-              createMessage.success(t('routes.scenes.copyInfi.ok'));
-              reload();
-            });
+            sceneCopy({ num: record.num })
+              .then(() => {
+                createMessage.success(t('routes.scenes.copyInfi.ok'));
+                reload();
+              })
+              .catch(() => {
+                setLoading(false);
+              });
           },
         });
       }