From 41808c3dd94963ac773211f4b6709aa58c2f8412 Mon Sep 17 00:00:00 2001
From: luoliangyi <87842688@qq.com>
Date: Thu, 28 Mar 2024 14:59:31 +0800
Subject: [PATCH] =?UTF-8?q?websdk=20demo=EF=BC=9A=E9=80=80=E5=87=BA?=
 =?UTF-8?q?=E6=97=B6=E6=B8=85=E7=90=86=E5=85=A8=E5=B1=80=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=E7=BB=91=E5=AE=9A=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/webservice/webdemoproject/js/scanWeb.js | 21 ++++++++++++--------
 test/webservice/webdemoproject/webDemo.html  | 10 +++++-----
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/test/webservice/webdemoproject/js/scanWeb.js b/test/webservice/webdemoproject/js/scanWeb.js
index 6838a54e..8e6acf9e 100644
--- a/test/webservice/webdemoproject/js/scanWeb.js
+++ b/test/webservice/webdemoproject/js/scanWeb.js
@@ -537,6 +537,7 @@ new Vue({
             this.getBatchList(function () {
                 that.changeBatch(that.batchIdList.slice(-1)[0])
             })
+            this.stopBindFolder()
         },
         //界面销毁
         onCloseScreen: function () {
@@ -550,6 +551,10 @@ new Vue({
             console.log('releaseService')
             this.deinitDevices()
             // this.stopBindFolder()
+            console.log('网页关闭，清理全局文件')
+            this.WebScanController.clearGlobalFileSavePath(function (info) {
+                console.log('网页关闭，清理文件成功')
+            })
             if (this.WebScanController) {
                 this.WebScanController.disconnect()
             }
@@ -561,13 +566,13 @@ new Vue({
             this.WebScanController.getGlobalConfig(function (info) {
                 console.log('getGlobalConfig :' + info)
                 that.globalConfig = info
-                var pre = info.file_save_path
-                if (pre.endsWith("\\")) {
-                    that.bindFolderPath = pre + 'auto'
-                } else {
-                    that.bindFolderPath = pre + '\\auto'
-                }
-                that.bindFolder()
+                // var pre = info.file_save_path
+                // if (pre.endsWith("\\")) {
+                //     that.bindFolderPath = pre + 'auto'
+                // } else {
+                //     that.bindFolderPath = pre + '\\auto'
+                // }
+                // that.bindFolder()
             })
         },
         //设置全局参数
@@ -826,7 +831,7 @@ new Vue({
             this.isSetup = false
             this.setGlobalConfig()
             this.setScanParams()
-            this.bindFolder()
+            // this.bindFolder()
         },
         onDeviceChanged: function (deviceName) {
             this.closeDevice()
diff --git a/test/webservice/webdemoproject/webDemo.html b/test/webservice/webdemoproject/webDemo.html
index 3ea146a6..a222c5ed 100644
--- a/test/webservice/webdemoproject/webDemo.html
+++ b/test/webservice/webdemoproject/webDemo.html
@@ -374,7 +374,7 @@
                          @contextmenu.prevent>
                         <div v-show="showWaterMark" ref="water-mark-opt"
                              style="background-color: white;width: 300px;height: 300px;z-index:20;position: absolute;
-                                box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);left: 80px;top: 450px;padding: 8px">
+                                box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);left: 80px;top: 200px;padding: 8px">
                             <div>
                                 <span>输入文字</span>
                                 <el-input v-model="waterMarkText" style="width: 220px" placeholder="请输入要添加的文字"></el-input>
@@ -577,10 +577,10 @@
                                             <el-input v-model="globalConfig.file_save_path"
                                                       placeholder="请输入文件保存目录"></el-input>
                                         </el-form-item>
-                                        <el-form-item label="文件绑定目录">
-                                            <el-input v-model="bindFolderPath"
-                                                      placeholder="请输入文件绑定目录"></el-input>
-                                        </el-form-item>
+                                        <!--                                        <el-form-item label="文件绑定目录">-->
+                                        <!--                                            <el-input v-model="bindFolderPath"-->
+                                        <!--                                                      placeholder="请输入文件绑定目录"></el-input>-->
+                                        <!--                                        </el-form-item>-->
 
                                         <el-form-item label="文件名前缀">
                                             <el-input v-model="globalConfig.file_name_prefix"