Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/user/Sitemap.vue

@@ -21,8 +21,8 @@
         <div style="width:47%;border:1px solid #ddd;padding: 5px;" id="print_mark_img" >
           <div id="point_mark_img_wrap1" class="print_main_content" style="width: 100%;padding: 0;border: 0;" ref="imageWrapper">
 
-            <img v-if="fileList.length==0" id="ossPointMarkImg" src="@/assets/evaluate/xgtl_default.png" alt="" srcset="">
-            <img v-if="fileList.length>0" id="ossPointMarkImg" :src="fileList[0].img_url" alt="" srcset="">
+            <img v-if="fileList[0].img_url==0" id="ossPointMarkImg" src="@/assets/evaluate/xgtl_default.png" alt="" srcset="">
+            <img v-if="fileList[0].img_url!=''" id="ossPointMarkImg" :src="fileList[0].img_url" alt="" srcset="">
 
             <!-- A端/V端 v-if="a_num==2" -->
             <!-- <div v-for="(item,index) in A_arr" :key="index">
@@ -387,6 +387,7 @@ export default{
   mounted(){
     console.log('asdfdfgfd',this.value);
     console.log('333333',this.date);
+    console.log('asfdazxsdfdfdsdfsadfs',this.fileList);
   },
   methods:{
     add(){
@@ -763,15 +764,12 @@ export default{
       }
     },
     printtup(){
-      // if(this.id==0){
-      //   this.$message('请先保存');
-      // }else{
+      console.log('先发给对方v不合格',this.fileList[0].img_url);
       this.dayinDialogVisible = true
-      // }
-      html2canvas(this.$refs.imageWrapper,{backgroundColor: null}).then(canvas => {
+      html2canvas(this.$refs.imageWrapper,{backgroundColor: null,allowTaint: true,useCORS: true,scrollY: 0,scrollX: 0,}).then(canvas => {
         // 转成图片，生成图片地址
         this.imgUrls = canvas.toDataURL("image/png");
-        // console.log('123424534',this.imgUrls)
+        console.log('123424534',this.imgUrls)
       });
 
 
@@ -896,6 +894,7 @@ export default{
     handleAvatarSuccess(res, file) {
       console.log("RESPOWOWOWOWO",res)
       console.log("wowowowow",file)
+      this.fileList.shift()
       this.fileList.push({
         img_url: this.qiniuDomain + res.url + '?imageView2/2/w/500/h/500/q/90',
         desc: '',
@@ -1153,7 +1152,7 @@ export default{
                 this.A_right.push(sitemap.DeviceValsualALeft[i])
              }
             }
-
+            console.log('阿斯顿发生v微软',this.A_right);
             this.V_right = []
             if(sitemap.DeviceValsualALeft!=null && sitemap.DeviceValsualALeft.length>0){
               for(let i=0;i<sitemap.DeviceValsualALeft.length;i++){
@@ -1224,8 +1223,13 @@ export default{
                this.Varr.push(sitemap.DeviceValusalMapVrr[i])
               }
              }
-
-            
+            //  this.fileList.push({
+            //     img_url: sitemap.img_url,
+            //     desc: '',
+            //     id: 0
+            //   })
+            //  this.fileList[0].img_url = sitemap.img_url
+             console.log('图片啊手动阀手动阀',this.fileList);
             }
 
          }