Browse Source

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

28169 1 year ago
parent
commit
97f20a9ca5
1 changed files with 15 additions and 11 deletions
  1. 15 11
      src/xt_pages/user/Sitemap.vue

+ 15 - 11
src/xt_pages/user/Sitemap.vue View File

21
         <div style="width:47%;border:1px solid #ddd;padding: 5px;" id="print_mark_img" >
21
         <div style="width:47%;border:1px solid #ddd;padding: 5px;" id="print_mark_img" >
22
           <div id="point_mark_img_wrap1" class="print_main_content" style="width: 100%;padding: 0;border: 0;" ref="imageWrapper">
22
           <div id="point_mark_img_wrap1" class="print_main_content" style="width: 100%;padding: 0;border: 0;" ref="imageWrapper">
23
 
23
 
24
-            <img v-if="fileList.length==0" id="ossPointMarkImg" src="@/assets/evaluate/xgtl_default.png" alt="" srcset="">
25
-            <img v-if="fileList.length>0" id="ossPointMarkImg" :src="fileList[0].img_url" alt="" srcset="">
24
+            <img v-if="fileList[0].img_url==0" id="ossPointMarkImg" src="@/assets/evaluate/xgtl_default.png" alt="" srcset="">
25
+            <img v-if="fileList[0].img_url!=''" id="ossPointMarkImg" :src="fileList[0].img_url" alt="" srcset="">
26
 
26
 
27
             <!-- A端/V端 v-if="a_num==2" -->
27
             <!-- A端/V端 v-if="a_num==2" -->
28
             <!-- <div v-for="(item,index) in A_arr" :key="index">
28
             <!-- <div v-for="(item,index) in A_arr" :key="index">
387
   mounted(){
387
   mounted(){
388
     console.log('asdfdfgfd',this.value);
388
     console.log('asdfdfgfd',this.value);
389
     console.log('333333',this.date);
389
     console.log('333333',this.date);
390
+    console.log('asfdazxsdfdfdsdfsadfs',this.fileList);
390
   },
391
   },
391
   methods:{
392
   methods:{
392
     add(){
393
     add(){
763
       }
764
       }
764
     },
765
     },
765
     printtup(){
766
     printtup(){
766
-      // if(this.id==0){
767
-      //   this.$message('请先保存');
768
-      // }else{
767
+      console.log('先发给对方v不合格',this.fileList[0].img_url);
769
       this.dayinDialogVisible = true
768
       this.dayinDialogVisible = true
770
-      // }
771
-      html2canvas(this.$refs.imageWrapper,{backgroundColor: null}).then(canvas => {
769
+      html2canvas(this.$refs.imageWrapper,{backgroundColor: null,allowTaint: true,useCORS: true,scrollY: 0,scrollX: 0,}).then(canvas => {
772
         // 转成图片,生成图片地址
770
         // 转成图片,生成图片地址
773
         this.imgUrls = canvas.toDataURL("image/png");
771
         this.imgUrls = canvas.toDataURL("image/png");
774
-        // console.log('123424534',this.imgUrls)
772
+        console.log('123424534',this.imgUrls)
775
       });
773
       });
776
 
774
 
777
 
775
 
896
     handleAvatarSuccess(res, file) {
894
     handleAvatarSuccess(res, file) {
897
       console.log("RESPOWOWOWOWO",res)
895
       console.log("RESPOWOWOWOWO",res)
898
       console.log("wowowowow",file)
896
       console.log("wowowowow",file)
897
+      this.fileList.shift()
899
       this.fileList.push({
898
       this.fileList.push({
900
         img_url: this.qiniuDomain + res.url + '?imageView2/2/w/500/h/500/q/90',
899
         img_url: this.qiniuDomain + res.url + '?imageView2/2/w/500/h/500/q/90',
901
         desc: '',
900
         desc: '',
1153
                 this.A_right.push(sitemap.DeviceValsualALeft[i])
1152
                 this.A_right.push(sitemap.DeviceValsualALeft[i])
1154
              }
1153
              }
1155
             }
1154
             }
1156
-
1155
+            console.log('阿斯顿发生v微软',this.A_right);
1157
             this.V_right = []
1156
             this.V_right = []
1158
             if(sitemap.DeviceValsualALeft!=null && sitemap.DeviceValsualALeft.length>0){
1157
             if(sitemap.DeviceValsualALeft!=null && sitemap.DeviceValsualALeft.length>0){
1159
               for(let i=0;i<sitemap.DeviceValsualALeft.length;i++){
1158
               for(let i=0;i<sitemap.DeviceValsualALeft.length;i++){
1224
                this.Varr.push(sitemap.DeviceValusalMapVrr[i])
1223
                this.Varr.push(sitemap.DeviceValusalMapVrr[i])
1225
               }
1224
               }
1226
              }
1225
              }
1227
-
1228
-            
1226
+            //  this.fileList.push({
1227
+            //     img_url: sitemap.img_url,
1228
+            //     desc: '',
1229
+            //     id: 0
1230
+            //   })
1231
+            //  this.fileList[0].img_url = sitemap.img_url
1232
+             console.log('图片啊手动阀手动阀',this.fileList);
1229
             }
1233
             }
1230
 
1234
 
1231
          }
1235
          }