diff --git a/src/components/global.vue b/src/components/global.vue
index c6da17c..9474b83 100644
--- a/src/components/global.vue
+++ b/src/components/global.vue
@@ -1,13 +1,12 @@
 <template>
   <div>
     <!--    打印中提示-->
-    <div class="dyzTip" v-show="DYZshow">
+    <div class="dyzTip" v-if="DYZshow&&DYZlist">
       <div class="curtain"></div>
       <div class="content">
         <img src="../assets/printing.png" alt="">
-        <div class="name">正在进行{{ listData.printFileType=='PDF'?'文档':'照片' }}打印...</div>
-<!--        <div class="flex-center">{{ listData.printFileName }}</div>-->
-        <div class="flex-center">{{ cite.selectedFile.length||1 }}/{{ cite.fileNum||1 }}</div>
+        <div class="name">正在进行{{ DYZlist[0].printFileType=='PDF'?'文档':'照片' }}打印...</div>
+        <div class="flex-center">{{ DYZlist.length }}/{{ DYZlistNum }}</div>
       </div>
     </div>
 
@@ -34,7 +33,7 @@
 import mqtt from "mqtt/dist/mqtt"
 import {getAdvertisement, getDeviceByCode} from "@/api/resultApi";
 import VueQr from 'vue-qr'
-import {apiPrint, getDeviceCode, readDownload} from "@/api/bdResultApi";
+import { getDeviceCode } from "@/api/bdResultApi";
 
 export default {
   name: "global",
@@ -45,7 +44,6 @@
     return {
       client: null,
       code: '',
-      listData: '',
 
       DYZshow: false, // 是否显示打印中
       downloadPath: 'D:\\TZDYSHARE\\TEMPFILES\\',
@@ -54,6 +52,9 @@
 
       src: '',
       zfShow: false,
+
+      DYZlist: [],
+      DYZlistNum: 1,
     };
   },
   created() {
@@ -74,19 +75,10 @@
       })
     },
     load() {
-      // 获取名为code的查询参数值
-      // if (this.cite.code === "") {
-      //   this.code = this.$route.query.code;
-      //   this.cite.code = this.code;
-      // }else{
-      //   this.code = this.cite.code;
-      // }
-
       if (this.cite.facility === "") {
         this.getDeviceByCode();
       }
       // 判断是否是广告屏
-      // console.log(this.cite)
       if(this.cite.name != 'advertising') {
         this.initMqtt()
         setInterval(()=>{
@@ -147,21 +139,24 @@
           this.cite.memberLoginVo = ''
         }else if(data.cmd=='PRINT'){
           //打印任务
-          this.listData = data
-          this.dayin()
+          this.DYZshow = true
+          this.zfShow = false
+          this.DYZlist.push(data)
+          this.DYZlistNum = this.DYZlist.length
         }else if(data.cmd=='PRINT_STATUS'){
           //打印任务完成
-          console.log(this.cite.selectedFile.length,this.cite.selectedFile)
+          console.log(this.DYZlist)
           if(data.taskStatus=='COMPLETE') {
-            if(this.cite.selectedFile.length>1) {
-              this.cite.selectedFile.splice(0, 1)
-              // this.cite.selectedFile.forEach((item,index)=>{
-              //   if(item.code == data.taskCode) {
-              //     this.cite.selectedFile.splice(index, 1)
-              //   }
-              // })
+            if(this.DYZlist.length>1) {
+              this.DYZlist.forEach((item,index)=>{
+                if(item.code == data.taskCode) {
+                  this.DYZlist.splice(index, 1)
+                }
+              })
             }else{
               this.DYZshow = false
+              this.DYZlist = []
+              this.DYZlistNum = 1
               this.$router.push({
                 name: 'complete'
               })
@@ -203,89 +198,6 @@
         this.cite.advertisement = res || ''
       })
     },
-    // 小程序下载
-    downloadPDF(id,name) {
-      // downloadPDF({id: id}).then(res => {
-      //   console.log(res)
-      //   const fileName = name
-      //   const blob = new Blob([res], {type: 'application/octet-stream'})
-      //   if (window.navigator.msSaveOrOpenBlob) {
-      //     navigator.msSaveBlob(blob, fileName)
-      //   } else {
-      //     let link = document.createElement('a')
-      //     link.href = window.URL.createObjectURL(blob)
-      //     link.download = fileName
-      //     link.click()
-      //     window.URL.revokeObjectURL(link.href)
-      //   }
-      // }).catch(() => {
-      // })
-      let data = {
-        destUrl: this.downloadPath+name,//下载路径
-        downloadUrl: 'https://mps.xlmalls.com/api/file/download?id='+id,//名称
-      }
-      readDownload(data).then(res =>{
-        console.log(res,id,name)
-      })
-    },
-    async dayin() {
-      let _this = this
-
-      _this.DYZshow = true
-      _this.zfShow = false
-      // let {listData} = _this
-      // await this.downloadPDF(listData.printFileId,listData.printFileName)
-
-      // setTimeout(() =>{
-      //   _this.DYZshow = true
-      //   _this.zfShow = false
-      //   _this.setDy(listData,listData.copies)
-      // },4000)
-
-    },
-    setDy(listData,num) {
-      let name = this.cite.memberLoginVo.printerGlossy || 'EPSON WF-C5890 Series3'
-      let type = 'img'
-      if(listData.printFileType=='PDF') {
-        name = this.cite.memberLoginVo.printerA4 || 'EPSON WF-C5890 Series2'
-        type = 'pdf'
-      }
-      let PrintColor = ''
-      if(listData.printingColor == 'BW') {
-        PrintColor = '黑白'
-      }
-      let DblPrt = ''
-      if(listData.printingFaces == 'DOUBLE') {
-        DblPrt = '双面打印'
-      }
-      console.log('设备名称',name,type,PrintColor,DblPrt)
-      let res = apiPrint({
-        "PrinterName": name,
-        "SourceFile": this.downloadPath+listData.printFileName,
-        "FileType": type,
-        "PrintColor": PrintColor,
-        "DblPrt": DblPrt
-      })
-      console.log(res)
-      if(res) {
-        num = num-1
-        if(num>0) {
-          this.setDy(listData,num)
-        }else{
-          setTimeout(()=>{
-            this.DYZshow = false
-            this.$router.push({
-              name: 'complete'
-            })
-          },2000)
-        }
-      }else{
-        setTimeout(() =>{
-          this.setDy(listData,num)
-        },2000)
-      }
-
-    },
   }
 }
 </script>