【nev-pc】高拍仪优化

fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue

@@ -123,7 +123,7 @@
                 :key="index"
               >
                 <span v-if="item.type == 'uploadPictureCard'"  >
-                  <div v-loading="guideBookLoading" id="uploadPictureCardGuideBook"></div>
+                  <div @click="isShowGuideBook = true" v-loading="guideBookLoading" id="uploadPictureCardGuideBook"></div>
                 </span>
                 <!-- 文本域 -->
                 <span v-else>
@@ -171,6 +171,7 @@
         :modal="false"
         :modal-append-to-body="false"
         :show-close="false"
+        class="inspectNoticeDetailsPop"
       >
         <curren-Form
           v-loading="gpyLoading"
@@ -237,7 +238,13 @@
       @closePDF="closePDF"
       :showDownLoad="true"
     ></pdf>
-    <!-- 抽屉查看报告弹窗 -->
+    <!-- 抽屉查看作业指导书报告弹窗 -->
+    <el-image-viewer 
+      style="z-index:9999999"
+      v-if="isShowGuideBook" 
+      :on-close="(()=>{isShowGuideBook = false})" 
+      :url-list="imgListGuideBookViews" />
+    <!-- 抽屉查看供应商报告弹窗 -->
     <el-image-viewer 
       v-if="isShowBase64" 
       :on-close="(()=>{isShowBase64 = false})" 
@@ -365,7 +372,7 @@ export default {
       rowReceiveQty: null,
       // pdf预览路径
       urlPDF: '',
-      //列表图片预览集合
+      //抽屉查看供应商报告弹窗
       imgListViews:[],
       // 纯base64（去掉data:application/pdf;base64,）
       base64PDF:'',
@@ -374,6 +381,9 @@ export default {
       // 是否显示文件预览框
       isShowPDF: false,
       isShowBase64:false,
+      isShowGuideBook:false,
+      // 抽屉查看作业指导书报告弹窗
+      imgListGuideBookViews:[],
       // 加载PDF
       loadingPDF: false,
       // 箱码查询输入框
@@ -673,16 +683,25 @@ export default {
     addGrabimageEvent(){
       let _this = this
       // 获取高拍仪返回结果
+      let _ids = []
       window.addEventListener('message', function(event) {
-        console.log(3333,event.data)
         // if (event.origin === 'http://192.168.1.75:33336') { // 确保消息来自iframe的域
-          var result = event.data; // 接收函数执行结果
+          var result = event.data.base64; // 接收函数执行结果
+          var timeId = event.data.timeid
+          if(_ids.indexOf(timeId) >= 0){
+            clearTimeout(_this.gpy_setTimeout)
+            setTimeout(()=>{
+              _this.getGrabimage()
+            },2000)
+            return
+          }
+          _ids.push(timeId)
           _this.currentFileBase64 = 'data:image/png;base64,'+result
           _this.fileBase64List.push(_this.currentFileBase64)
           _this.inspectNoticeDetailsForm[_this.inspectNoticeDetailsForm.length - 1].srcList = _this.fileBase64List
           _this.Loading.appMainLoading = false
           clearTimeout(_this.gpy_setTimeout)
-          this.isRemoveImageIframe = true
+          _this.isRemoveImageIframe = true
           // document.getElementById('getGrabimageIframe').parentNode.removeChild(document.getElementById('getGrabimageIframe'));
           // window.removeEventListener("message",(()=>{
           //   this.isRemoveImageIframe = true
@@ -833,7 +852,7 @@ export default {
             _httpNumber++
             // this.urlPDF = 'data:application/pdf;base64,'+res.bytes
             _urls[key] = 'data:application/pdf;base64,'+res.bytes
-            // 原查看pdf方法
+            // 原查看pdf方法isShowGuideBook
             // this.base64PDF=res.bytes
             // this.titlePDF = res.fileName
             // this.isShowPDF = true
@@ -1485,7 +1504,9 @@ export default {
           img.width="300" 
           img.height="300"
           img.src = URL.createObjectURL(blob)
+          this.imgListGuideBookViews = [URL.createObjectURL(blob)]
           var otest = document.getElementById("uploadPictureCardGuideBook")
+          otest.innerHTML = ""
           otest.appendChild(img)
           this.guideBookLoading = false
         }).catch(err => {