unify-external-plugin-platform 0.0.2-96 → 0.0.2-98

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=086932fa&scoped=true&
-var scanner_camera_componentvue_type_template_id_086932fa_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=2e6c51ee&scoped=true&
+var scanner_camera_componentvue_type_template_id_2e6c51ee_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -84069,8 +84069,8 @@ var scanner_camera_componentvue_type_template_id_086932fa_scoped_true_render = f
         "value": item.value
       }
     });
-  }), 1), _vm._l(_vm.buttonList, function (item) {
-    return [_c('el-button', {
+  }), 1), [_vm._l(_vm.buttonList, function (item) {
+    return [_vm._isShowButton(item.name) ? _c('el-button', {
       key: item.name,
       attrs: {
         "type": "primary",
@@ -84081,10 +84081,10 @@ var scanner_camera_componentvue_type_template_id_086932fa_scoped_true_render = f
           return _vm.handleAction(item.name);
         }
       }
-    }, [_vm._v(_vm._s(item.label))]), _vm._t("action")];
-  })], 2)])]);
+    }, [_vm._v(_vm._s(item.label))]) : _vm._e()];
+  }), _vm._t("action")]], 2)])]);
 };
-var scanner_camera_componentvue_type_template_id_086932fa_scoped_true_staticRenderFns = [];
+var scanner_camera_componentvue_type_template_id_2e6c51ee_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./packages/utils/custom-axios.ts
 /**
@@ -84151,6 +84151,10 @@ class custom_axios_CustomAxios {
 
 var eloam_plugin_service_ELoamMethodCode;
 (function (ELoamMethodCode) {
+  /** 糾偏 */
+  ELoamMethodCode["ScannerCameraDeskew_Base64"] = "ScannerCameraDeskew_Base64";
+  /** 合并*/
+  ELoamMethodCode["ScannerCameraMerge_Base64"] = "ScannerCameraMerge_Base64";
   /** 扫描-主摄像头 */
   ELoamMethodCode["ScannerMainCamera_Base64"] = "ScannerMainCamera_Base64";
   /** 扫描-副摄像头 */
@@ -84172,23 +84176,51 @@ class eloam_plugin_service_ELoamPassService {
   static get secondaryCameraUrl() {
     return this.baseServiceUrl + '/video=stream&camidx=1';
   }
-  static async read(method) {
+  static async read(method, data) {
     let param = {},
-      url = '';
+      url = '',
+      requestType = '';
     switch (method) {
+      case eloam_plugin_service_ELoamMethodCode.ScannerCameraDeskew_Base64:
+        // 开启纠偏裁边
+        url = this.baseServiceUrl + '/dvideo=cameradeskew';
+        param = {
+          camidx: "0",
+          open: "1"
+        };
+        requestType = 'post';
+        break;
+      case eloam_plugin_service_ELoamMethodCode.ScannerCameraMerge_Base64:
+        // 合并
+        url = this.baseServiceUrl + '/compose=photos';
+        // outputfilepath 输出文件保存地址。例：D://res.jpg
+        // outputmaxwidth 合成后文件最大宽度。例：3000px
+        // inputimagetype 待合成文件类型：0：file；1：base64
+        // outputimagetype 合成后文件类型：0：jpg；1：PDF
+        param = {
+          outputfilepath: "",
+          outputmaxwidth: "3000",
+          inputimagetype: "1",
+          outputimagetype: "0",
+          imagelist: data.toString()
+        };
+        requestType = 'post';
+        break;
       case eloam_plugin_service_ELoamMethodCode.ScannerMainCamera_Base64:
         // rotate: 旋转角度；deskew：纠偏，主摄像头1，副摄像头0 camidx：主摄像头0，副摄像头1；ColorMode：quality
         url = this.baseServiceUrl + '/video=grabimage';
         param = {
           filepath: "",
           rotate: "0",
-          deskew: "0",
-          deskewval: "0",
+          deskew: "1",
+          deskewval: "10",
           camidx: "0",
           ColorMode: "0",
           quality: "0",
           bIsPrint1to1: "0"
         };
+        url = `${url}?${JSON.stringify(param)}`;
+        requestType = 'get';
         break;
       case eloam_plugin_service_ELoamMethodCode.ScannerSecondaryCamera_Base64:
         // rotate: 旋转角度,；deskew：纠偏，主摄像头1，副摄像头0 camidx：主摄像头0，副摄像头1；ColorMode：quality
@@ -84203,12 +84235,15 @@ class eloam_plugin_service_ELoamPassService {
           quality: "0",
           bIsPrint1to1: "0"
         };
+        url = `${url}?${JSON.stringify(param)}`;
+        requestType = 'get';
         break;
       case eloam_plugin_service_ELoamMethodCode.ReadIDCard_Base64:
         url = this.baseServiceUrl + '/card=idcard';
+        requestType = 'post';
         break;
     }
-    let res = await custom_axios_CustomAxios.post(url, param);
+    let res = await custom_axios_CustomAxios[requestType](url, param);
     return res;
   }
   /** 主摄像头拍照 */
@@ -84221,6 +84256,10 @@ class eloam_plugin_service_ELoamPassService {
     const res = await eloam_plugin_service_ELoamPassService.read(eloam_plugin_service_ELoamMethodCode.ScannerSecondaryCamera_Base64);
     return res.photoBase64;
   }
+  static async mergeImage(list) {
+    const res = await eloam_plugin_service_ELoamPassService.read(eloam_plugin_service_ELoamMethodCode.ScannerCameraMerge_Base64, list);
+    return res.base64;
+  }
   static async scanByCamera(type) {
     switch (type) {
       case "main":
@@ -84233,31 +84272,52 @@ class eloam_plugin_service_ELoamPassService {
   /** 读取身份证 */
   static async idCardRead() {
     const res = await eloam_plugin_service_ELoamPassService.read(eloam_plugin_service_ELoamMethodCode.ReadIDCard_Base64);
-    let {
-      name,
-      sex,
-      birthday,
-      address,
-      cardID,
-      nationCode,
-      photoBase64,
-      issueOrgan,
-      validStart,
-      validEnd
-    } = res.IDCardInfo;
+    var readData = res.IDCardInfo;
+    // Agency 发证机关，外国人永居证时，该值为中文名
+    var name = readData.name;
+    var enname = readData.enname;
+    var cnname = readData.cnname;
+    var sex = readData.sex;
+    var birthday = readData.birthday;
+    var address = readData.address;
+    var idNumber = readData.cardID;
+    var nation = readData.nationCode;
+    var police = readData.issueOrgan;
+    var PhotoB64 = readData.photoBase64;
+    var validStart = readData.validStart;
+    var validEnd = readData.validEnd;
+    var type = readData.cardType;
+    var chineseName = '',
+      englishName = '',
+      cardType = '1',
+      nationality = '中国';
+    // 外国人永居证
+    if (type == 2 || type == 4) {
+      englishName = enname; // 英文名
+      chineseName = cnname || '无中文姓名'; // 中文名，没有时为 无中文姓名
+      name = cnname === '无中文姓名' ? enname : cnname || enname; // 姓名，先读中文名，没有时读英文名 捷宇高拍仪读卡  外国人永居证时  发证机关（Agency），该值为中文名
+      police = '中华人民共和国国家移民管理局'; // 发证机关，读不到，默认
+      cardType = '9'; // 永居证
+      nationality = ''; // 读不到，暂时为空
+    }
+
     const IDCardData = {
       info: {
-        name,
-        sex,
-        birthday: birthday.replace('-', '').replace('-', ''),
-        address,
-        cardId: cardID,
-        nation: nationCode,
-        police: issueOrgan,
-        validStart,
-        validEnd
+        cardType: cardType,
+        nationality: nationality,
+        name: name,
+        chineseName: chineseName,
+        englishName: englishName,
+        sex: sex,
+        birthday: birthday,
+        address: address,
+        cardId: idNumber,
+        nation: nation,
+        police: police,
+        validStart: validStart,
+        validEnd: validEnd
       },
-      headImage: photoBase64
+      headImage: PhotoB64
     };
     return IDCardData;
   }
@@ -85383,6 +85443,7 @@ _defineProperty(WeiRongPluginService, "timer", null);
 
 
 
+
 const scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA = 'data:image/jpg;base64,';
 /* harmony default export */ var scanner_camera_componentvue_type_script_lang_js_ = ({
   name: "scanner-camera-component",
@@ -85412,7 +85473,11 @@ const scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA = 'data:image/j
       buttonList: [{
         label: '拍照',
         name: 'take-pictures'
-      }]
+      }, {
+        label: '合并拍照',
+        name: 'take-pictures-merge'
+      }],
+      mergeImageList: []
     };
   },
   watch: {
@@ -85511,6 +85576,9 @@ const scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA = 'data:image/j
         case 5:
           // 良田高拍仪
           this.scannerVideoSrc = eloam_plugin_service_ELoamPassService.mainCameraUrl;
+          setTimeout(() => {
+            eloam_plugin_service_ELoamPassService.read(eloam_plugin_service_ELoamMethodCode.ScannerCameraDeskew_Base64); // 开启纠偏裁边
+          }, 2000);
           break;
         case 6:
           // 国产客户端一体机
@@ -85545,6 +85613,26 @@ const scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA = 'data:image/j
           break;
       }
     },
+    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}`);
+      }
+    },
+    _isShowButton(name) {
+      switch (name) {
+        case 'take-pictures-merge':
+          return this.machineType === 5;
+        // 良田显示合并拍照
+        default:
+          return true;
+      }
+    },
     handleAction(name) {
       switch (name) {
         case 'start-main':
@@ -85559,16 +85647,20 @@ const scanner_camera_componentvue_type_script_lang_js_BEGIN_DATA = 'data:image/j
           // 拍照
           this.takePictures();
           break;
+        case 'take-pictures-merge':
+          // 拍照合并
+          this.takePictureMerge();
+          break;
       }
     }
   }
 });
 ;// 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=086932fa&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=2e6c51ee&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=086932fa&prod&scoped=true&lang=scss&
+;// CONCATENATED MODULE: ./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue?vue&type=style&index=0&id=2e6c51ee&prod&scoped=true&lang=scss&
 
 ;// CONCATENATED MODULE: ./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue
 
@@ -85581,11 +85673,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_086932fa_scoped_true_render,
-  scanner_camera_componentvue_type_template_id_086932fa_scoped_true_staticRenderFns,
+  scanner_camera_componentvue_type_template_id_2e6c51ee_scoped_true_render,
+  scanner_camera_componentvue_type_template_id_2e6c51ee_scoped_true_staticRenderFns,
   false,
   null,
-  "086932fa",
+  "2e6c51ee",
   null
   
 )