Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/user/Sitemap.vue

@@ -1024,17 +1024,17 @@ export default{
          v_num:this.v_num?this.v_num:0,
          text_num:this.text_num?this.text_num:0,
          fangxiang_a:this.fangxiangA,
-         fangxiang_a_num:this.fangxiangA_num,
-         fangxiang_v_num:this.fangxiangV_num,
+         fangxiang_a_num:this.fangxiangA_num?this.fangxiangA_num:0,
+         fangxiang_v_num:this.fangxiangV_num?this.fangxiangV_num:0,
          fangxiang_a_left:this.fangxiangA_left,
          fangxiang_a_top:this.fangxiangA_top,
          fangxiang_v:this.fangxiangV,
          fangxiang_v_left:this.fangxiangV_left,
          fangxiang_v_top:this.fangxiangV_top,
-         fuzhu_a_num:this.fuzhuA_num,
-         fuzhu_v_num:this.fuzhuV_num,
-         xuanzhuan_a:this.xuanzhuan_a,
-         xuanzhuan_v:this.xuanzhuan_v,
+         fuzhu_a_num:this.fuzhuA_num?this.fuzhuA_num:0,
+         fuzhu_v_num:this.fuzhuV_num?this.fuzhuV_num:0,
+         xuanzhuan_a:this.xuanzhuan_a?this.xuanzhuan_a:0,
+         xuanzhuan_v:this.xuanzhuan_v?this.xuanzhuan_v:0,
          fuzhu_a:this.fuzhuA,
          fuzhu_a_top:this.fuzhuA_top,
          fuzhu_a_left:this.fuzhuA_left,
@@ -1042,19 +1042,19 @@ export default{
          fuzhu_v_top:this.fuzhuV_top,
          fuzhu_v_left:this.fuzhuV_left,
          a_left:this.A_right,
-         a_top:this.A_top,
+         a_top:this.A_top?this.A_top:0,
          v_left:this.V_right,
          v_top:this.V_top,
          text_arr:this.text_arr,
          text_left:this.text_left,
          text_top:this.text_top,
-         av_bkx:this.av_bkx,
-         av_bky:this.av_bky,
-         scalev_num:this.scalev_num,
-         scalea_num:this.scalea_num,
+         av_bkx:this.av_bkx?this.av_bkx:0,
+         av_bky:this.av_bky?this.av_bky:0,
+         scalev_num:this.scalev_num?this.scalev_num:0,
+         scalea_num:this.scalea_num?this.scalea_num:0,
          patient_id:this.patientID,
-         left_a:this.A_left,
-         left_v:this.V_left,
+         left_a:this.A_left?this.A_left:0,
+         left_v:this.V_left?this.V_left:0,
          aarr:this.Aarr,
          varr:this.Varr,
        }
@@ -1096,19 +1096,19 @@ export default{
 
             this.id = sitemap.id
 
-            this.A_top = sitemap.a_top
-            this.av_bkx = sitemap.av_bkx
-            this.av_bky = sitemap.av_bky
-            this.fangxiangA_top = sitemap.fangxiang_a_left
-            this.fangxiangA_num = sitemap.fangxiang_a_num
-            this.fangxiangA_num = sitemap.fangxiang_a_top
-            this.fangxiangV_left = sitemap.fangxiang_v_left
-            this.fangxiangV_num =sitemap.fangxiang_v_num
-            this.fangxiangV_top = sitemap.fangxiang_v_top
-            this.fuzhuA_left= sitemap.fuzhu_a_left
-            this.fuzhuA_num = sitemap.fuzhu_a_num
-            this.fuzhuA_top =sitemap.fuzhu_a_top
-            this.fuzhuV_left =sitemap.fuzhu_v_left
+            this.A_top = sitemap.a_top?sitemap.a_top:0
+            this.av_bkx = sitemap.av_bkx?sitemap.av_bkx:0
+            this.av_bky = sitemap.av_bky?sitemap.av_bky:0
+            this.fangxiangA_top = sitemap.fangxiang_a_left?sitemap.fangxiang_a_left:0
+            this.fangxiangA_num = sitemap.fangxiang_a_num?sitemap.fangxiang_a_num:0
+            this.fangxiangA_num = sitemap.fangxiang_a_top?sitemap.fangxiang_a_top:0
+            this.fangxiangV_left = sitemap.fangxiang_v_left?sitemap.fangxiang_v_left:0
+            this.fangxiangV_num =sitemap.fangxiang_v_num?sitemap.fangxiang_v_num:0
+            this.fangxiangV_top = sitemap.fangxiang_v_top?sitemap.fangxiang_v_top:0
+            this.fuzhuA_left= sitemap.fuzhu_a_left?sitemap.fuzhu_a_left:0
+            this.fuzhuA_num = sitemap.fuzhu_a_num?sitemap.fuzhu_a_num:0
+            this.fuzhuA_top =sitemap.fuzhu_a_top?sitemap.fuzhu_a_top:0
+            this.fuzhuV_left =sitemap.fuzhu_v_left?sitemap.fuzhu_v_left:0
             this.fuzhuV_num = sitemap.fuzhu_v_num
             this.fuzhuV_top =sitemap.fuzhu_v_top
             this.patientID = sitemap.patient_id