From e928c36e1f7685b0b97fab0e7bc78e0ab5a42e2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Mon, 22 Jul 2024 17:30:10 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-pc=E3=80=91=E9=AB=98=E6=8B=8D?=
 =?UTF-8?q?=E4=BB=AA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/public/config.js                               |  1 +
 fe/PC/src/App.vue                                    |  1 +
 .../rawMaterialManage/quality/InspectRequest.vue     | 12 +++++++-----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/fe/PC/public/config.js b/fe/PC/public/config.js
index 2d4f136cf..6c6ad01b3 100644
--- a/fe/PC/public/config.js
+++ b/fe/PC/public/config.js
@@ -29,6 +29,7 @@ window.SITE_CONFIG['padKittingPackUpdate'] = 180000
 window.SITE_CONFIG['grabimageURL'] = 'http://192.168.1.75:33336/video/index.html' 
 window.SITE_CONFIG['showGrabimageIframeTest'] = false//登录页调试高拍仪显示按钮
 window.SITE_CONFIG['grabRegulateIframePage'] = 'http://10.164.230.173:33336/video/index4.html'//高拍仪-iframe内嵌对焦界面
+window.SITE_CONFIG['gpyLoadingTime'] = 6000 //高拍仪加载时间
 
 // 供应商接口地址（如立体库等）
 window.SITE_CONFIG['supplierOuterURL'] = 'http://7e42682n64.goho.co:21171'
diff --git a/fe/PC/src/App.vue b/fe/PC/src/App.vue
index e9406e083..9eac63cee 100644
--- a/fe/PC/src/App.vue
+++ b/fe/PC/src/App.vue
@@ -24,6 +24,7 @@ localStorage.setItem('company',window.SITE_CONFIG['company'])
 localStorage.setItem('largeScreen',window.SITE_CONFIG['largeScreen'])
 localStorage.setItem('padKittingPackUpdate',window.SITE_CONFIG['padKittingPackUpdate'])
 localStorage.setItem('grabimageURL',window.SITE_CONFIG['grabimageURL'])
+localStorage.setItem('gpyLoadingTime',window.SITE_CONFIG['gpyLoadingTime'])
 localStorage.setItem('supplierOuterURL',window.SITE_CONFIG['supplierOuterURL'])
 localStorage.setItem('apifoxToken',window.SITE_CONFIG['apifoxToken'])
 localStorage.setItem('reportsUrl',window.SITE_CONFIG['reportsUrl'])
diff --git a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue
index c4850bb66..66683a113 100644
--- a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue
+++ b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue
@@ -1,5 +1,10 @@
 <template>
   <div class="page-box InspectNoticePage" v-loading="Loading.appMainLoading">
+    <!-- 高拍仪调获取base64页面 -->
+    <iframe v-show="false" id="getGrabimageIframe" :src='getGrabimageIframeUrl' style="z-index:200;background:#fff;width:100px;height:100px;position:fixed;left:0"></iframe>
+    <!-- 高拍仪调试页面-目的：自动对焦 -->
+    <iframe v-show="false" id="grabRegulateIframePage" :src='grabRegulateIframePage' style="background:#fff;width:200px;height:200px;position:fixed;right:15px;bottom:10px;opacity:0"></iframe>
+    
     <tablePagination
       :currenButtonData="currenButtonData"
       :tableData="tableData"
@@ -167,10 +172,6 @@
         :modal-append-to-body="false"
         :show-close="false"
       >
-        <!-- 高拍仪调获取base64页面 -->
-        <iframe v-show="false" id="getGrabimageIframe" :src='getGrabimageIframeUrl' style="z-index:200;background:#fff;width:100px;height:100px;position:fixed;left:0"></iframe>
-        <!-- 高拍仪调试页面-目的：自动对焦 -->
-        <iframe v-show="false" id="grabRegulateIframePage" :src='grabRegulateIframePage' style="background:#fff;width:200px;height:200px;position:fixed;right:15px;bottom:10px;opacity:0"></iframe>
         <curren-Form
           v-loading="gpyLoading"
           element-loading-text="正在加载高拍仪"
@@ -921,9 +922,10 @@ export default {
         })
         this.inspectNoticeDetailsShow = true
         this.gpyLoading=true
+        let _time = localStorage.getItem('gpyLoadingTime') !="undefined" ? localStorage.getItem('gpyLoadingTime') : 5000
         setTimeout(()=>{
           this.gpyLoading=false
-        },5000)
+        },Number(_time))
       },300)
     },
     // 质检合格不合格-删除按钮