Merge branch 'iteration-20240612' into jenkins-test

src/views/tempo-practice/index.module.less

@@ -571,7 +571,7 @@
   }
 
   .containerRight {
-    width: 281px;
+    width: 245px;
     transition: all 0.03s ease;
 
     &.rightHide {

src/views/tempo-practice/index.tsx

@@ -219,27 +219,29 @@ export default defineComponent({
         if (route.query.dataJson) {
           dataJson = JSON.parse(route.query.dataJson as any);
         }
-        // console.log(dataJson, 'dataJson', props.dataJson);
 
-        setting.element = dataJson.element;
-        setting.beat = dataJson.beat;
-        setting.barLine = dataJson.barLine;
-        setting.tempo = dataJson.tempo;
-        setting.scorePart = dataJson.scorePart;
-        setting.playType = dataJson.playType;
-        setting.speed = dataJson.speed;
+        if (dataJson) {
+          setting.element = dataJson.element;
+          setting.beat = dataJson.beat;
+          setting.barLine = dataJson.barLine;
+          setting.tempo = dataJson.tempo;
+          setting.scorePart = dataJson.scorePart;
+          setting.playType = dataJson.playType;
+          setting.speed = dataJson.speed;
 
-        setting_modal.element = dataJson.element;
-        setting_modal.beat = dataJson.beat;
-        setting_modal.barLine = dataJson.barLine;
-        setting_modal.tempo = dataJson.tempo;
-        setting_modal.scorePart = dataJson.scorePart;
-        setting_modal.playType = dataJson.playType;
-        setting_modal.speed = dataJson.speed;
+          setting_modal.element = dataJson.element;
+          setting_modal.beat = dataJson.beat;
+          setting_modal.barLine = dataJson.barLine;
+          setting_modal.tempo = dataJson.tempo;
+          setting_modal.scorePart = dataJson.scorePart;
+          setting_modal.playType = dataJson.playType;
+          setting_modal.speed = dataJson.speed;
 
-        state.dataJson = dataJson;
-      } catch {
+          state.dataJson = dataJson;
+        }
+      } catch (e) {
         //
+        console.log(e, '1');
       }
     };
     // watch(