unify-external-plugin-platform 0.0.2-97 → 0.0.2-99

package/dist/external-plugin.common.js

@@ -84019,8 +84019,8 @@ var scanner_cameravue_type_template_id_00e9072f_scoped_true_render = function re
 };
 var scanner_cameravue_type_template_id_00e9072f_scoped_true_staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue?vue&type=template&id=4738d4d2&scoped=true&
-var scanner_camera_componentvue_type_template_id_4738d4d2_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue?vue&type=template&id=dc9fa1f2&scoped=true&
+var scanner_camera_componentvue_type_template_id_dc9fa1f2_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -84069,7 +84069,7 @@ var scanner_camera_componentvue_type_template_id_4738d4d2_scoped_true_render = f
         "value": item.value
       }
     });
-  }), 1), _vm._l(_vm.buttonList, function (item) {
+  }), 1), [_vm._l(_vm.buttonList, function (item) {
     return [_vm._isShowButton(item.name) ? _c('el-button', {
       key: item.name,
       attrs: {
@@ -84081,10 +84081,10 @@ var scanner_camera_componentvue_type_template_id_4738d4d2_scoped_true_render = f
           return _vm.handleAction(item.name);
         }
       }
-    }, [_vm._v(_vm._s(item.label))]) : _vm._e(), _vm._t("action")];
-  })], 2)])]);
+    }, [_vm._v(_vm._s(item.label))]) : _vm._e()];
+  }), _vm._t("action")]], 2)])]);
 };
-var scanner_camera_componentvue_type_template_id_4738d4d2_scoped_true_staticRenderFns = [];
+var scanner_camera_componentvue_type_template_id_dc9fa1f2_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./packages/utils/custom-axios.ts
 /**
@@ -84298,7 +84298,8 @@ class eloam_plugin_service_ELoamPassService {
       name = cnname === '无中文姓名' ? enname : cnname || enname; // 姓名，先读中文名，没有时读英文名 捷宇高拍仪读卡  外国人永居证时  发证机关（Agency），该值为中文名
       police = '中华人民共和国国家移民管理局'; // 发证机关，读不到，默认
       cardType = '9'; // 永居证
-      nationality = ''; // 读不到，暂时为空
+      nationality = nation;
+      nation = ''; // 读不到，暂时为空
     }
 
     const IDCardData = {
@@ -85544,7 +85545,12 @@ const scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA = 'data:image/j
             // 良田
             let type = this.camera === 0 ? 'main' : 'vice';
             const res = await eloam_plugin_service_ELoamPassService.scanByCamera(type);
-            this.$emit('send-scanner-result', `${scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA}${res}`);
+            console.log('良田=>', res);
+            if (res) {
+              this.$emit('send-scanner-result', `${scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA}${res}`);
+            } else {
+              this.$message.error('拍照出错，请检查设备是否连接成功');
+            }
             break;
           }
         case 6:
@@ -85615,13 +85621,17 @@ const scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA = 'data:image/j
     },
     async takePictureMerge() {
       const res = await eloam_plugin_service_ELoamPassService.scanByCamera('main');
-      this.mergeImageList.push(res);
-      if (this.mergeImageList.length === 1) this.$message.success('第一张拍摄成功，请拍第二张');
-      if (this.mergeImageList.length === 2) {
-        let result = await eloam_plugin_service_ELoamPassService.mergeImage(this.mergeImageList);
-        this.mergeImageList = [];
-        this.$message.success('合并成功');
-        this.$emit('send-scanner-result', `${scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA}${result}`);
+      if (res) {
+        this.mergeImageList.push(res);
+        if (this.mergeImageList.length === 1) this.$message.success('第一张拍摄成功，请拍第二张');
+        if (this.mergeImageList.length === 2) {
+          let result = await eloam_plugin_service_ELoamPassService.mergeImage(this.mergeImageList);
+          this.mergeImageList = [];
+          this.$message.success('合并成功');
+          this.$emit('send-scanner-result', `${scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA}${result}`);
+        }
+      } else {
+        this.$message.error('合并拍照出错，请检查设备是否连接成功');
       }
     },
     _isShowButton(name) {
@@ -85657,10 +85667,10 @@ const scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA = 'data:image/j
 });
 ;// CONCATENATED MODULE: ./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue?vue&type=script&lang=js&
  /* harmony default export */ var component_scanner_camera_componentvue_type_script_lang_js_ = (scanner_camera_componentvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue?vue&type=style&index=0&id=4738d4d2&prod&scoped=true&lang=scss&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue?vue&type=style&index=0&id=dc9fa1f2&prod&scoped=true&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue?vue&type=style&index=0&id=4738d4d2&prod&scoped=true&lang=scss&
+;// CONCATENATED MODULE: ./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue?vue&type=style&index=0&id=dc9fa1f2&prod&scoped=true&lang=scss&
 
 ;// CONCATENATED MODULE: ./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue
 
@@ -85673,11 +85683,11 @@ const scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA = 'data:image/j
 
 var scanner_camera_component_component = normalizeComponent(
   component_scanner_camera_componentvue_type_script_lang_js_,
-  scanner_camera_componentvue_type_template_id_4738d4d2_scoped_true_render,
-  scanner_camera_componentvue_type_template_id_4738d4d2_scoped_true_staticRenderFns,
+  scanner_camera_componentvue_type_template_id_dc9fa1f2_scoped_true_render,
+  scanner_camera_componentvue_type_template_id_dc9fa1f2_scoped_true_staticRenderFns,
   false,
   null,
-  "4738d4d2",
+  "dc9fa1f2",
   null
   
 )