上传失败弹窗修改

src/views/zwxt/fingerprint.scss

@@ -2734,6 +2734,24 @@ $versionColor: var(--versionColor, #fff);  // #000
         font-family: Microsoft YaHei;
         color: #909090;
       }
+      .close-uploading-error {
+        width: 100px;
+        height: 45px;
+        background: $deepBg;
+        border: 2px solid $btnBorder;
+        opacity: 1;
+        border-radius: 26px;
+        font-size: 15px;
+        font-family: Microsoft YaHei;
+        font-weight: 400;
+        line-height: 34px;
+        color: $btnfontColor;
+        outline: none;
+        cursor: pointer;
+        &:hover {
+          border: 2px solid $finishTrue;  //2px
+        }
+      }
     }
     .uploading-content {
       width: 480px;

src/views/zwxt/fingerprint6.vue

@@ -602,8 +602,9 @@
       </div>
       <div class="uploading-error" v-show="uploadingClose == 'uploadingError'">
         <img src="../../assets/img/zw/uploading-error.png" alt="">
-        <div class="uploading-error-title">指纹上传失败</div>
-        <div class="uploading-error-tip">弹窗将在3秒后自动关闭</div>
+        <div class="uploading-error-title">{{uploadingTitle}}</div>
+        <!-- <div class="uploading-error-tip">弹窗将在3秒后自动关闭</div> -->
+        <button class="close-uploading-error" @click="closeUploadingError">确定</button>
       </div>
     </div>
 
@@ -1058,7 +1059,7 @@ export default {
         fsr_lxdh: ''
       },
       collectInfoMsg: {
-        zwbdxtlxms: '',
+        zwbdxtlxms: '2900',
         nydw_gajgjgdm: '',
         nydw_gajgmc: '',
         nyry_xm: '',
@@ -1087,8 +1088,8 @@ export default {
         cjxxyydm: ''
       },
       fingerMsg: {
-        zzhwtztqfsdm: '',
-        zzhwqsqkdm: '',
+        zzhwtztqfsdm: 'A',
+        zzhwqsqkdm: '0',
         zwwxzfl_zwwxdm: '',
         zwwxffl_zwwxdm: '',
         zwfx_tzfx: '',
@@ -1122,7 +1123,7 @@ export default {
         zw_txspfxcd: '640',
         zw_txczfxcd: '640',
         zw_txfbl: '500',
-        zw_txysffms: '',
+        zw_txysffms: '0000',
         // 图片打分
         // zw_txzl: '9',
         zwtzd_tzxzb: '',
@@ -8347,6 +8348,23 @@ export default {
       }
     },
     /**
+     * @description: 关闭采集失败弹窗
+     * @return {*}
+     */    
+    closeUploadingError() {
+      // 开始上传
+      this.percentage = 0
+      this.isUploadingError = false
+      this.isShowUploadingTxt = true
+      this.uploadingClose = 'uploading'
+      // 指纹上传时的小提示
+      this.uploadingTip = '上传期间请勿关闭此页面'
+      // 指纹上传时的标题
+      this.uploadingTitle = '指纹上传中…'
+      this.uploadingColor = '#FFFFFF'
+      this.uploadingStart = false
+    },
+    /**
      * @name: 上传
      * @param {*}
      * @return {*}
@@ -8562,12 +8580,13 @@ export default {
         self.isShowUploadingTxt = false
         // self.uploadingTitle = '指纹上传失败'
         self.uploadingTitle = fingerRes.data
-        self.uploadingTip = '弹窗将在3秒后自动关闭'
+        self.uploadingTip = ''
+        self.uploadingClose = 'uploadingError'
         setTimeout(() => {
-          self.uploadingClose = 'uploadingError'
-          setTimeout(() => {
-            self.uploadingStart = false
-          }, 3000);
+          // self.uploadingClose = 'uploadingError'
+          // setTimeout(() => {
+          //   self.uploadingStart = false
+          // }, 3000);
           // setTimeout(() => {
           //   if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
           //     window.location.href = "about:blank";
@@ -8679,25 +8698,25 @@ export default {
           self.uploadingColor = '#E82510'
           self.isUploadingError = true
           self.isShowUploadingTxt = false
-          self.uploadingTitle = '指纹上传失败'
-          self.uploadingTip = '弹窗将在3秒后自动关闭'
-          setTimeout(() => {
-            self.uploadingClose = 'uploadingError'
-
-            setTimeout(() => {
-              self.uploadingStart = false
-            }, 3000);
-            // setTimeout(() => {
-            //   if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
-            //     window.location.href = "about:blank";
-            //     window.close();
-            //   } else {
-            //     window.opener = null;
-            //     window.open("", "_self");
-            //     window.close();
-            //   }
-            // }, 3000);
-          }, 1500);
+          self.uploadingTitle = '协同系统上传失败'
+          self.uploadingTip = ''
+          self.uploadingClose = 'uploadingError'
+          // setTimeout(() => {
+          //   self.uploadingClose = 'uploadingError'
+          //   setTimeout(() => {
+          //     self.uploadingStart = false
+          //   }, 3000);
+          //   // setTimeout(() => {
+          //   //   if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
+          //   //     window.location.href = "about:blank";
+          //   //     window.close();
+          //   //   } else {
+          //   //     window.opener = null;
+          //   //     window.open("", "_self");
+          //   //     window.close();
+          //   //   }
+          //   // }, 3000);
+          // }, 1500);
         })
       }