diff --git a/src/views/selectFile.vue b/src/views/selectFile.vue
index d10a761..18a2f55 100644
--- a/src/views/selectFile.vue
+++ b/src/views/selectFile.vue
@@ -6,22 +6,21 @@
     <div class="box flex-center" v-show="name == 'U盘打印'">
       <div class="tip">
         <div class="title">温馨提示</div>
-        <div class="content">
-          请在右侧文件浏览区，找到文件存放的目录/文件夹，然后点选您要打印的文件，之后按下“确认资料”按钮。
-        </div>
+        <div class="content">请在右侧文件浏览区，找到文件存放的目录/文件夹，然后点选您要打印的文件，之后按下“确认资料”按钮。</div>
       </div>
       <div class="file tip2">
         <div class="main">
-          <div v-for="(item,index) in UpFile" v-bind:key="index" class="flex-between li">
-            <div class="name">{{item.name}}</div>
-            <span @click="onCancel(index,'UpFile')">删除</span>
+          <div v-for="(item, index) in UpFile" v-bind:key="index" class="flex-between li">
+            <div class="name">{{ item.name }}</div>
+            <span @click="onCancel(index, 'UpFile')">删除</span>
           </div>
         </div>
         <div class="flex-between but">
-          <div class="btn flex-center" @click="paiz()">选择文件
+          <div class="btn flex-center" @click="paiz()">
+            选择文件
             <input type="file" @change="handleFileChange" />
           </div>
-          <div class="btn flex-center" @click="skip('transcoding',name)">确认资料</div>
+          <div class="btn flex-center" @click="skip('transcoding', name)">确认资料</div>
         </div>
       </div>
     </div>
@@ -31,21 +30,12 @@
         <div class="title">已完成扫描的版面</div>
         <div class="main flex-between">
           <div class="smfyData">
-            <div
-              v-for="(item, index) in imgList"
-              v-bind:key="index"
-              :class="['flex-center', { act: smfyIndex == index }]"
-              @click="onChange(index, 'smfyIndex')"
-            >
+            <div v-for="(item, index) in imgList" v-bind:key="index" :class="['flex-center', { act: smfyIndex == index }]" @click="onChange(index, 'smfyIndex')">
               <div class="name">{{ index + 1 }}</div>
               <span @click="onCancel(index, 'imgList')">删除</span>
             </div>
           </div>
-          <img
-            :src="imgList[smfyIndex]"
-            alt=""
-            style="width: 25rem; height: 100%"
-          />
+          <img :src="imgList[smfyIndex]" alt="" style="width: 25rem; height: 100%" />
         </div>
       </div>
       <div class="tip tip2">
@@ -56,9 +46,7 @@
         </div>
         <div class="flex-between but">
           <div class="btn flex-center" @click="paiz()">继续扫描</div>
-          <div class="btn flex-center" @click="skip('transcoding', name)">
-            完成扫描
-          </div>
+          <div class="btn flex-center" @click="skip('transcoding', name)">完成扫描</div>
         </div>
       </div>
     </div>
@@ -71,12 +59,13 @@
             <img src="../assets/card2.png" alt="身份证反面" />
             <div class="card-name">{{ cardInfo.name }}</div>
             <div class="card-gender">
-              {{ cardInfo.sex }}<span>{{ cardInfo.nation }}</span>
+              {{ cardInfo.sex }}
+              <span>{{ cardInfo.nation }}</span>
             </div>
             <div class="card-birth">
               {{ cardInfo.birthday | joinYear }}
-              <span class="month">{{ cardInfo.birthday | joinMonth }}</span
-              ><span class="day">{{ cardInfo.birthday | joinDay }}</span>
+              <span class="month">{{ cardInfo.birthday | joinMonth }}</span>
+              <span class="day">{{ cardInfo.birthday | joinDay }}</span>
             </div>
             <div class="card-addr">
               {{ cardInfo.address }}
@@ -89,105 +78,106 @@
           <div class="card-box">
             <img src="../assets/card1.png" alt="身份证正面" />
             <div class="card-sign">珠海市公安局</div>
-            <div class="card-date">
-              {{ cardInfo.issuedData }} - {{ cardInfo.validDate }}
-            </div>
+            <div class="card-date">{{ cardInfo.issuedData }} - {{ cardInfo.validDate }}</div>
           </div>
         </div>
       </div>
       <div class="tip">
         <div class="title">温馨提示</div>
-        <div class="content">
-          身份证件信息读取成功，请您核对个人信息无误后，按“信息无误，继续”按钮进行后续操作。此时您可以收回您的身份证卡片并妥善报讯。
-        </div>
-        <div class="btn flex-center" @click="skip('transcoding', name)">
-          信息无误，继续
-        </div>
+        <div class="content">身份证件信息读取成功，请您核对个人信息无误后，按“信息无误，继续”按钮进行后续操作。此时您可以收回您的身份证卡片并妥善报讯。</div>
+        <div class="btn flex-center" @click="skip('transcoding', name)">信息无误，继续</div>
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import navbar from "@/components/nav";
-import html2canvas from "html2canvas";
+import navbar from '@/components/nav'
+import html2canvas from 'html2canvas'
+import { upload2Pdf } from '@/api/resultApi'
 export default {
-  name: "selectFile",
+  name: 'selectFile',
   components: {
-    navbar,
+    navbar
   },
   provide() {
     return {
       title: this.tit,
-      type: this.name,
-    };
+      type: this.name
+    }
   },
   filters: {
     joinYear(val) {
-      return val.substring(0, 4);
+      return val.substring(0, 4)
     },
     joinMonth(val) {
-      return val.substring(4, 6);
+      return val.substring(4, 6)
     },
     joinDay(val) {
-      return val.substring(6, 8);
-    },
+      return val.substring(6, 8)
+    }
   },
   data() {
     return {
-      tit:
-        this.$route.params.name == "U盘打印" ? "资料选取提交" : "资料扫描提交",
+      tit: this.$route.params.name == 'U盘打印' ? '资料选取提交' : '资料扫描提交',
       name: this.$route.params.name,
       path: this.cite.inWebURL,
-      socket: "",
+      socket: '',
       imgList: [],
       smfyIndex: 0,
 
       UpFile: [],
 
       cardInfo: {
-        name: "鲲怎么叫",
-        sex: "男",
-        nation: "汉",
-        nationCode: "1",
-        birthday: "19940411",
-        address: "广东省珠海市香洲区唐家湾镇东岸村小龙组10086号",
-        idNumber: "430421198907280306",
-        idIssued: "珠海市公安局",
-        issuedData: "20110310",
-        validDate: "20210310",
-        photoName: "",
-        base64Photo: "",
+        name: '鲲怎么叫',
+        sex: '男',
+        nation: '汉',
+        nationCode: '1',
+        birthday: '19940411',
+        address: '广东省珠海市香洲区唐家湾镇东岸村小龙组10086号',
+        idNumber: '430421198907280306',
+        idIssued: '珠海市公安局',
+        issuedData: '20110310',
+        validDate: '20210310',
+        photoName: '',
+        base64Photo: '',
         imageName:
-          "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fsafe-img.xhscdn.com%2Fbw1%2F41a98c47-1e62-4ea4-be0c-2640b773a8a7%3FimageView2%2F2%2Fw%2F1080%2Fformat%2Fjpg&refer=http%3A%2F%2Fsafe-img.xhscdn.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1706170275&t=0104b9da7239685b89d893516103dc4e",
-        base64Image: "(nul1)",
-        cardType: "1",
-        enName: "",
-        cnName: "",
-        passNum: "",
-        visaTimes: "",
-      },
-    };
+          'https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fsafe-img.xhscdn.com%2Fbw1%2F41a98c47-1e62-4ea4-be0c-2640b773a8a7%3FimageView2%2F2%2Fw%2F1080%2Fformat%2Fjpg&refer=http%3A%2F%2Fsafe-img.xhscdn.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1706170275&t=0104b9da7239685b89d893516103dc4e',
+        base64Image: '(nul1)',
+        cardType: '1',
+        enName: '',
+        cnName: '',
+        passNum: '',
+        visaTimes: ''
+      }
+    }
   },
   methods: {
     skip(href, name) {
-      this.captureAndDownload();
+      let formData = new FormData()
+      for (let i = 0; i < this.UpFile.length; i++) {
+        formData.append('file', this.UpFile[i]) // 使用数组语法添加多个文件
+      }
+      upload2Pdf(formData).then(res => {
+        console.log(res)
+      })
+      this.captureAndDownload()
       this.$router.push({
         name: href,
         params: {
-          name: name,
-        },
-      });
+          name: name
+        }
+      })
     },
     async captureAndDownload() {
-      const captureArea = this.$refs.captureArea;
+      const captureArea = this.$refs.captureArea
 
       // 使用 html2canvas 将区域内容生成为图片
-      const canvas = await html2canvas(captureArea);
+      const canvas = await html2canvas(captureArea)
 
       // 将 canvas 转为图片 URL
-      const imageUrl = canvas.toDataURL("image/png");
-      console.log(imageUrl);
+      const imageUrl = canvas.toDataURL('image/png')
+      console.log(imageUrl)
       // 调用接口上传图片
 
       // 创建一个下载链接
@@ -199,139 +189,139 @@
       // downloadLink.click();
     },
     onChange(index, name) {
-      this[name] = index;
+      this[name] = index
     },
     onCancel(index, name) {
-      this[name].splice(index, 1);
+      this[name].splice(index, 1)
     },
     paiz() {
-      this.socket.send("Capture@2");
+      this.socket.send('Capture@2')
     },
     init: function () {
-      if (typeof WebSocket === "undefined") {
-        alert("您的浏览器不支持socket");
+      if (typeof WebSocket === 'undefined') {
+        alert('您的浏览器不支持socket')
       } else {
         // 实例化socket
-        this.socket = new WebSocket(this.path);
+        this.socket = new WebSocket(this.path)
         // 监听socket连接
-        this.socket.onopen = this.open;
+        this.socket.onopen = this.open
         // 监听socket错误信息
-        this.socket.onerror = this.error;
+        this.socket.onerror = this.error
         // 监听socket消息
-        this.socket.onmessage = this.getMessage;
+        this.socket.onmessage = this.getMessage
       }
     },
     open: function () {
       // console.log("socket连接成功")
-      this.socket.send("OpenIdCardEx@0");
-      this.socket.send("OpenDevice@1");
-      this.socket.send("SetResolution@2@2592@1944");
-      this.socket.send("OpenVideo");
-      this.socket.send("RotateRight");
-      this.socket.send("Deskew");
+      this.socket.send('OpenIdCardEx@0')
+      this.socket.send('OpenDevice@1')
+      this.socket.send('SetResolution@2@2592@1944')
+      this.socket.send('OpenVideo')
+      this.socket.send('RotateRight')
+      this.socket.send('Deskew')
     },
     error: function () {
-      console.log("连接错误");
+      console.log('连接错误')
     },
     getMessage: function (msg) {
-      if (typeof msg.data == "string") {
-        if (msg.data.indexOf("GetDevCount") == 0) {
-          let s = msg.data.substring(12);
-          if ("1" == s || "2" == s) {
+      if (typeof msg.data == 'string') {
+        if (msg.data.indexOf('GetDevCount') == 0) {
+          let s = msg.data.substring(12)
+          if ('1' == s || '2' == s) {
             //如果是双摄像头 那就需要判断 s = 2;表示当前是连接了2个设备
-            alert("检测到已经连接上摄像头");
+            alert('检测到已经连接上摄像头')
           }
-        } else if (msg.data.indexOf("Capture") == 0) {
-          let s = msg.data.substring(8);
+        } else if (msg.data.indexOf('Capture') == 0) {
+          let s = msg.data.substring(8)
           if (s) {
-            this.imgList.push("data:image/jpeg;base64," + s);
+            this.imgList.push('data:image/jpeg;base64,' + s)
           }
-        } else if (msg.data.indexOf("MoveDetectEvent") == 0) {
-          this.socket.send("Capture@2");
-        } else if (msg.data.indexOf("IdCardEvent") == 0) {
-          this.socket.send("UnFaceDetect");
-        } else if (msg.data.indexOf("ReadIdCard") == 0) {
-          let s = msg.data.substring(11);
-          if ("1" == s) {
-            this.socket.send("GetIdCardResult@||");
-            this.socket.send("GetIdCardImage@2");
+        } else if (msg.data.indexOf('MoveDetectEvent') == 0) {
+          this.socket.send('Capture@2')
+        } else if (msg.data.indexOf('IdCardEvent') == 0) {
+          this.socket.send('UnFaceDetect')
+        } else if (msg.data.indexOf('ReadIdCard') == 0) {
+          let s = msg.data.substring(11)
+          if ('1' == s) {
+            this.socket.send('GetIdCardResult@||')
+            this.socket.send('GetIdCardImage@2')
           }
-        } else if (msg.data.indexOf("GetIdCardResult") == 0) {
-          let s = msg.data.substring(16);
+        } else if (msg.data.indexOf('GetIdCardResult') == 0) {
+          let s = msg.data.substring(16)
 
-          let info = document.getElementById("info");
-          info.value = s;
-        } else if (msg.data.indexOf("GetBarcode") == 0) {
+          let info = document.getElementById('info')
+          info.value = s
+        } else if (msg.data.indexOf('GetBarcode') == 0) {
           // alert(msg.data);
-          let s = msg.data.substring(11);
+          let s = msg.data.substring(11)
 
-          let info = document.getElementById("info");
-          info.value = s;
-        } else if (msg.data.indexOf("GetIdCardImage") == 0) {
-          let s = msg.data.substring(15);
-          let arr = s.split("#");
-          let faceImg = arr[0];
+          let info = document.getElementById('info')
+          info.value = s
+        } else if (msg.data.indexOf('GetIdCardImage') == 0) {
+          let s = msg.data.substring(15)
+          let arr = s.split('#')
+          let faceImg = arr[0]
 
-          let myimg = document.getElementById("myCanvas3");
-          myimg.src = "data:image/jpeg;base64," + faceImg;
-        } else if (msg.data.indexOf("GetBase64") == 0) {
-          let s = msg.data.substring(10);
+          let myimg = document.getElementById('myCanvas3')
+          myimg.src = 'data:image/jpeg;base64,' + faceImg
+        } else if (msg.data.indexOf('GetBase64') == 0) {
+          let s = msg.data.substring(10)
 
-          let myimg = document.getElementById("myCanvas2");
-          myimg.src = "data:image/jpeg;base64," + s;
-          alert(s);
-        } else if (msg.data.indexOf("GetRecognitionFromFileName") == 0) {
-          let s = msg.data.substring(27);
+          let myimg = document.getElementById('myCanvas2')
+          myimg.src = 'data:image/jpeg;base64,' + s
+          alert(s)
+        } else if (msg.data.indexOf('GetRecognitionFromFileName') == 0) {
+          let s = msg.data.substring(27)
 
-          let info = document.getElementById("info");
-          info.value = s;
-        } else if (msg.data.indexOf("GetOcrFromFileName") == 0) {
-          let s = msg.data.substring(19);
+          let info = document.getElementById('info')
+          info.value = s
+        } else if (msg.data.indexOf('GetOcrFromFileName') == 0) {
+          let s = msg.data.substring(19)
 
-          let info = document.getElementById("info");
-          info.value = s;
-        } else if (msg.data.indexOf("GetDogSN") == 0) {
-          let s = msg.data.substring(11);
+          let info = document.getElementById('info')
+          info.value = s
+        } else if (msg.data.indexOf('GetDogSN') == 0) {
+          let s = msg.data.substring(11)
 
-          let info = document.getElementById("info");
-          info.value = s;
+          let info = document.getElementById('info')
+          info.value = s
         }
       } else {
-        let reader = new FileReader();
+        let reader = new FileReader()
 
         reader.onload = function (msg) {
           if (msg.target.readyState == FileReader.DONE) {
             // let url = msg.target.result;
             // document.getElementById('myCanvas').src = url;
           }
-        };
+        }
 
-        reader.readAsDataURL(msg.data);
+        reader.readAsDataURL(msg.data)
       }
     },
     close: function () {
       // console.log("socket已经关闭")
-      this.socket.close();
-      this.socket = "";
+      this.socket.close()
+      this.socket = ''
     },
 
     handleFileChange(event) {
-      let file = event.target.files[0];
+      let file = event.target.files[0]
       if (file) {
-        this.UpFile.push(file);
+        this.UpFile.push(file)
       }
-    },
+    }
   },
   destroyed() {
     // 销毁监听
-    this.close();
+    this.close()
   },
   mounted() {
-    if (this.$route.params.name == "扫描打印") {
-      this.init();
+    if (this.$route.params.name == '扫描打印') {
+      this.init()
     }
-  },
-};
+  }
+}
 </script>
 
 <style scoped lang="less">
@@ -366,7 +356,7 @@
       .main {
         width: 31.63rem;
         height: 26.56rem;
-        background: #FFFFFF;
+        background: #ffffff;
         border: 0.06rem solid #707070;
         margin: 0 auto 2.81rem;
         padding: 2rem 0;
@@ -511,12 +501,7 @@
     .btn {
       width: 100%;
       height: 5.5rem;
-      background: linear-gradient(
-        132deg,
-        #52a39d 0%,
-        #a1c553 50%,
-        #81d012 100%
-      );
+      background: linear-gradient(132deg, #52a39d 0%, #a1c553 50%, #81d012 100%);
       border-radius: 1.25rem;
       font-size: 1.88rem;
       font-weight: 400;