unify-external-plugin-platform 0.0.3-69 → 0.0.3-70

package/dist/external-plugin.common.js

@@ -83178,8 +83178,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=0caf60ba&scoped=true&
-var scanner_camera_componentvue_type_template_id_0caf60ba_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=31866b44&
+var scanner_camera_componentvue_type_template_id_31866b44_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -83207,7 +83207,12 @@ var scanner_camera_componentvue_type_template_id_0caf60ba_scoped_true_render = f
     domProps: {
       "muted": true
     }
-  }) : _c('img', {
+  }) : _c('div', {
+    staticClass: "camera-container",
+    class: {
+      'select-mode': _vm.isSelectAreaMode && _vm.machineType === 5
+    }
+  }, [_c('img', {
     staticStyle: {
       "max-width": "800px",
       "max-height": "600px",
@@ -83217,8 +83222,20 @@ var scanner_camera_componentvue_type_template_id_0caf60ba_scoped_true_render = f
     attrs: {
       "id": "photo",
       "src": _vm.scannerVideoSrc
+    },
+    on: {
+      "mousedown": _vm.handleMouseDown,
+      "mousemove": _vm.handleMouseMove,
+      "mouseup": _vm.handleMouseUp,
+      "mouseleave": _vm.handleMouseLeave
+    }
+  }), _vm.isSelectAreaMode && _vm.isSelecting ? _c('div', {
+    staticClass: "selection-box",
+    style: _vm.selectBoxStyle,
+    attrs: {
+      "id": "selection-box"
     }
-  })]) : _c('div', {
+  }) : _vm._e()])]) : _c('div', {
     staticClass: "load-error"
   }, [_c('i', {
     staticClass: "el-icon-s-cooperation"
@@ -83260,9 +83277,43 @@ var scanner_camera_componentvue_type_template_id_0caf60ba_scoped_true_render = f
         }
       }
     }, [_vm._v(_vm._s(item.label))]) : _vm._e()];
-  }), _vm._t("action")]], 2)])]);
+  }), _vm.machineType === 5 ? _c('el-dropdown', {
+    attrs: {
+      "size": "small"
+    },
+    on: {
+      "command": _vm.handleRotateCommand
+    }
+  }, [_c('el-button', {
+    staticStyle: {
+      "margin-left": "10px"
+    },
+    attrs: {
+      "type": "primary",
+      "size": "small"
+    }
+  }, [_vm._v(" 旋转"), _c('i', {
+    staticClass: "el-icon-arrow-down el-icon--right"
+  })]), _c('el-dropdown-menu', {
+    attrs: {
+      "slot": "dropdown"
+    },
+    slot: "dropdown"
+  }, [_c('el-dropdown-item', {
+    attrs: {
+      "command": "rotate-left"
+    }
+  }, [_vm._v("左旋90°")]), _c('el-dropdown-item', {
+    attrs: {
+      "command": "rotate-right"
+    }
+  }, [_vm._v("右旋90°")]), _c('el-dropdown-item', {
+    attrs: {
+      "command": "rotate-180"
+    }
+  }, [_vm._v("旋转180°")])], 1)], 1) : _vm._e(), _vm._t("action")]], 2)])]);
 };
-var scanner_camera_componentvue_type_template_id_0caf60ba_scoped_true_staticRenderFns = [];
+var scanner_camera_componentvue_type_template_id_31866b44_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/typeof.js
 function _typeof(obj) {
@@ -83402,6 +83453,8 @@ var ELoamMethodCode;
   /** 关闭摄像头*/
   ELoamMethodCode["StopMainCamera"] = "stopMainCamera";
   ELoamMethodCode["StopSecondaryCamera"] = "stopSecondaryCamera";
+  /** 框选拍照 */
+  ELoamMethodCode["ScannerCameraSelectArea"] = "ScannerCameraSelectArea";
 })(ELoamMethodCode || (ELoamMethodCode = {}));
 const ELoamMethodDesc = {
   [ELoamMethodCode.ScannerMainCamera_Base64]: '扫描',
@@ -83503,10 +83556,10 @@ class ELoamPassService {
             deskewval: "0",
             camidx: "0",
             ColorMode: "0",
-            quality: "0",
-            bIsPrint1to1: "0"
+            quality: "0"
           };
-          requestType = 'post';
+          url = this.baseServiceUrl + '/video=grabimage?' + JSON.stringify(param);
+          requestType = 'get';
         }
         break;
       case ELoamMethodCode.ScannerSecondaryCamera_Base64:
@@ -83514,8 +83567,7 @@ class ELoamPassService {
           url = this.baseLinuxServiceUrl + '/getPic?filepath=/tmp';
           requestType = 'get';
         } else {
-          url = this.baseServiceUrl + '/video=grabimage';
-          param = {
+          const grabImageData = {
             filepath: "",
             rotate: "0",
             deskew: "0",
@@ -83525,7 +83577,8 @@ class ELoamPassService {
             quality: "0",
             bIsPrint1to1: "0"
           };
-          requestType = 'post';
+          url = this.baseServiceUrl + '/video=grabimage?' + JSON.stringify(grabImageData);
+          requestType = 'get';
         }
         break;
       case ELoamMethodCode.StopMainCamera:
@@ -83565,6 +83618,30 @@ class ELoamPassService {
         param = data;
         requestType = 'post';
         break;
+      case ELoamMethodCode.ScannerCameraSelectArea:
+        // 框选拍照
+        if (this._isLinux) {
+          url = `${this.baseLinuxServiceUrl}/selectImageArea`;
+          param = {
+            filepath: data.filepath || '/tmp/select.jpg',
+            left: data.left,
+            top: data.top,
+            right: data.right,
+            bottom: data.bottom
+          };
+          requestType = 'post';
+        } else {
+          url = this.baseServiceUrl + '/select=imagearea';
+          param = {
+            filepath: data.filepath || 'base64',
+            left: data.left.toString(),
+            top: data.top.toString(),
+            right: data.right.toString(),
+            bottom: data.bottom.toString()
+          };
+          requestType = 'post';
+        }
+        break;
     }
     let res = await CustomAxios[requestType](url, param);
     return res;
@@ -83703,6 +83780,27 @@ class ELoamPassService {
     const res = await ELoamPassService.read(ELoamMethodCode.FaceAuth, param);
     return res.data;
   }
+  /**
+   * 框选拍照
+   * @param coords 框选坐标 {left, top, right, bottom}
+   * @param filepath 保存路径（可选）
+   * @returns 图片base64
+   */
+  static async scanBySelectArea(coords, filepath) {
+    const data = {
+      filepath: filepath || (this._isLinux ? '/tmp/select.jpg' : 'base64'),
+      left: coords.left,
+      top: coords.top,
+      right: coords.right,
+      bottom: coords.bottom
+    };
+    const res = await ELoamPassService.read(ELoamMethodCode.ScannerCameraSelectArea, data);
+    if (this._isLinux) {
+      return res.data?.img || res.data;
+    } else {
+      return res.base64 || res.photoBase64;
+    }
+  }
 }
 _defineProperty(ELoamPassService, "baseServiceUrl", 'http://127.0.0.1:38088');
 _defineProperty(ELoamPassService, "baseLinuxServiceUrl", 'http://127.0.0.1:6543');
@@ -85175,11 +85273,14 @@ const BEGIN_DATA = 'data:image/jpg;base64,';
         name: '照片',
         value: 1
       }],
-      deskewStatus: '0',
+      deskewStatus: 0,
       rotateDeg: 0,
       buttonList: [{
         label: '拍照',
         name: 'take-pictures'
+      }, {
+        label: '框选拍照',
+        name: 'take-select-area'
       }, {
         label: '图片合并',
         name: 'take-pictures-merge'
@@ -85189,9 +85290,6 @@ const BEGIN_DATA = 'data:image/jpg;base64,';
       }, {
         label: '纠偏裁边',
         name: 'open-deskew'
-      }, {
-        label: '旋转',
-        name: 'rotate-video'
       }, {
         label: '关闭',
         name: 'close'
@@ -85199,7 +85297,18 @@ const BEGIN_DATA = 'data:image/jpg;base64,';
       _isLinux: String(navigator.platform).indexOf("Linux") > -1,
       eloamLinuxFrameTimer: {},
       mergeImageList: [],
-      defaultVideoStream: null
+      defaultVideoStream: null,
+      // 框选相关 - 参考 liangtian.html 的实现
+      isSelecting: false,
+      selectStartPos: null,
+      selectEndPos: null,
+      selectBoxStyle: {},
+      zoomScaleVal: 1,
+      zoomScaleX: 1,
+      // X轴缩放比例
+      zoomScaleY: 1,
+      // Y轴缩放比例
+      isSelectAreaMode: false
     };
   },
   watch: {
@@ -85217,11 +85326,22 @@ const BEGIN_DATA = 'data:image/jpg;base64,';
             console.log('良田失败=>', res);
           });
         }
+        // 图片加载完成后重新计算缩放比例
+        if (this.isSelectAreaMode && this.machineType === 5) {
+          this.$nextTick(() => {
+            setTimeout(() => {
+              this.calculateZoomScale();
+            }, 500);
+          });
+        }
       }
     },
     'machineType': function () {
       this.loadSuccess = true;
       this.scannerVideoSrc = '';
+      // 重置框选模式
+      this.isSelectAreaMode = false;
+      this.isSelecting = false;
       let handleName = this.camera === 1 ? 'start-vice' : 'start-main';
       this.handleAction(handleName);
     }
@@ -85302,6 +85422,7 @@ const BEGIN_DATA = 'data:image/jpg;base64,';
           {
             // 良田
             let type = this.camera === 0 ? 'main' : 'vice';
+            console.log('this.deskewStatus', this.deskewStatus);
             const res = await ELoamPassService.scanByCamera(type, this.deskewStatus);
             if (res) {
               let path = res;
@@ -85509,10 +85630,11 @@ const BEGIN_DATA = 'data:image/jpg;base64,';
         case 'take-pictures-merge':
         case 'take-idCard-pictures-merge':
         case 'open-deskew': // 纠偏裁边
-        case 'rotate-video':
         case 'close':
+        case 'take-select-area':
+          // 框选拍照
           return this.machineType === 5;
-        // 良田显示合并拍照
+        // 良田显示
         case 'take-pictures':
           return true;
         // 拍照按钮始终显示
@@ -85542,32 +85664,268 @@ const BEGIN_DATA = 'data:image/jpg;base64,';
           // 合并拍照身份证
           this.takePictureMerge('1');
           break;
-        case 'rotate-video':
-          if (String(navigator.platform).indexOf("Linux") > -1) {
-            this.rotateDeg += 90;
-            if (this.rotateDeg === 360) this.rotateDeg = 0;
-          } else {
-            this.rotateDeg = 90;
-          }
-          ELoamPassService.read(ELoamMethodCode.ScannerCameraRotate, this.rotateDeg); // 选装
-          break;
         case 'open-deskew':
+          // 如果当前在框选模式，先退出框选模式
+          if (this.isSelectAreaMode) {
+            this.isSelectAreaMode = false;
+            this.isSelecting = false;
+            this.$message.info('已退出框选模式（纠偏裁边与框选拍照不能同时使用）');
+          }
           this.deskewStatus = this.deskewStatus === '1' ? '0' : '1';
           ELoamPassService.read(ELoamMethodCode.ScannerCameraDeskew_Base64, this.deskewStatus); // 开启纠偏裁边
           break;
+        case 'take-select-area':
+          // 如果纠偏裁边已开启，提示用户
+          if (this.deskewStatus === '1') {
+            this.$message.warning('请先关闭纠偏裁边后再使用框选拍照');
+            return;
+          }
+          this.toggleSelectAreaMode(); // 框选拍照模式
+          break;
         case 'close':
           await ELoamPassService.stopCamera(this.camera === 0);
           break;
       }
+    },
+    /**
+     * 处理旋转命令
+     * @param command 旋转命令：rotate-left(左旋90°), rotate-right(右旋90°), rotate-180(旋转180°)
+     */
+    handleRotateCommand(command) {
+      if (this.machineType !== 5) return; // 仅良田支持旋转
+
+      const isLinux = String(navigator.platform).indexOf("Linux") > -1;
+      switch (command) {
+        case 'rotate-left':
+          // 左旋90°
+          if (isLinux) {
+            // Linux系统：累加旋转角度
+            this.rotateDeg -= 90;
+            if (this.rotateDeg <= -360) this.rotateDeg = 0;
+            // 转换为正角度
+            let positiveDeg = this.rotateDeg < 0 ? 360 + this.rotateDeg : this.rotateDeg;
+            ELoamPassService.read(ELoamMethodCode.ScannerCameraRotate, positiveDeg);
+          } else {
+            // Windows系统：直接设置角度
+            this.rotateDeg = 270;
+            ELoamPassService.read(ELoamMethodCode.ScannerCameraRotate, this.rotateDeg);
+          }
+          break;
+        case 'rotate-right':
+          // 右旋90°
+          if (isLinux) {
+            // Linux系统：累加旋转角度
+            this.rotateDeg += 90;
+            if (this.rotateDeg >= 360) this.rotateDeg = 0;
+            ELoamPassService.read(ELoamMethodCode.ScannerCameraRotate, this.rotateDeg);
+          } else {
+            // Windows系统：直接设置角度
+            this.rotateDeg = 90;
+            ELoamPassService.read(ELoamMethodCode.ScannerCameraRotate, this.rotateDeg);
+          }
+          break;
+        case 'rotate-180':
+          // 旋转180°
+          if (isLinux) {
+            // Linux系统：累加旋转角度
+            this.rotateDeg += 180;
+            if (this.rotateDeg >= 360) this.rotateDeg = this.rotateDeg - 360;
+            ELoamPassService.read(ELoamMethodCode.ScannerCameraRotate, this.rotateDeg);
+          } else {
+            // Windows系统：直接设置角度
+            this.rotateDeg = 180;
+            ELoamPassService.read(ELoamMethodCode.ScannerCameraRotate, this.rotateDeg);
+          }
+          break;
+      }
+    },
+    /**
+     * 切换框选拍照模式
+     */
+    async toggleSelectAreaMode() {
+      if (this.machineType !== 5) {
+        this.$message.warning('框选拍照仅支持良田高拍仪');
+        return;
+      }
+      this.isSelectAreaMode = !this.isSelectAreaMode;
+      if (this.isSelectAreaMode) {
+        this.$message.success('已进入框选模式，正在校准坐标...');
+        // 先拍一张照片用于校准坐标
+        await this.calibrateZoomScale();
+      } else {
+        this.$message.info('已退出框选模式');
+        this.isSelecting = false;
+      }
+    },
+    /**
+     * 校准缩放比例 - 完全参考 liangtian.html 的实现
+     */
+    async calibrateZoomScale() {
+      try {
+        const type = this.camera === 0 ? 'main' : 'vice';
+        // 先拍一张照片获取真实图片
+        const res = await ELoamPassService.scanByCamera(type, '0', false);
+        if (res) {
+          // 创建临时图片获取真实尺寸
+          const tempImg = new Image();
+          tempImg.onload = () => {
+            const sourceWidth = tempImg.naturalWidth;
+            const sourceHeight = tempImg.naturalHeight;
+
+            // 获取显示尺寸
+            const img = document.getElementById('photo');
+            const displayWidth = img ? img.clientWidth : 800;
+            const displayHeight = img ? img.clientHeight : 600;
+            console.log('源图片尺寸:', sourceWidth, 'x', sourceHeight);
+            console.log('显示尺寸:', displayWidth, 'x', displayHeight);
+
+            // 分别计算 X 和 Y 方向的缩放比例
+            this.zoomScaleX = sourceWidth / displayWidth;
+            this.zoomScaleY = sourceHeight / displayHeight;
+
+            // 保持兼容性
+            this.zoomScaleVal = this.zoomScaleX;
+            console.log('X轴缩放比例:', this.zoomScaleX);
+            console.log('Y轴缩放比例:', this.zoomScaleY);
+            this.$message.success('坐标校准完成，可以开始框选');
+          };
+          tempImg.src = `${BEGIN_DATA}${res}`;
+        }
+      } catch (err) {
+        console.error('坐标校准失败:', err);
+        this.$message.error('坐标校准失败，请重试');
+      }
+    },
+    /**
+     * 鼠标按下 - 开始框选
+     */
+    handleMouseDown(e) {
+      if (!this.isSelectAreaMode || this.machineType !== 5) return;
+      this.isSelecting = true;
+      this.selectStartPos = {
+        x: e.offsetX,
+        y: e.offsetY
+      };
+      e.preventDefault();
+    },
+    /**
+     * 鼠标移动 - 更新框选框
+     */
+    handleMouseMove(e) {
+      if (!this.isSelectAreaMode || !this.isSelecting) return;
+      const endX = e.offsetX;
+      const endY = e.offsetY;
+
+      // 计算框选框的位置和大小（使用相对于图片的坐标）
+      const startX = this.selectStartPos.x;
+      const startY = this.selectStartPos.y;
+      const left = Math.min(startX, endX);
+      const top = Math.min(startY, endY);
+      const width = Math.abs(endX - startX);
+      const height = Math.abs(endY - startY);
+
+      // 使用绝对定位（相对于 camera-container）
+      this.selectBoxStyle = {
+        left: left + 'px',
+        top: top + 'px',
+        width: width + 'px',
+        height: height + 'px',
+        display: 'block'
+      };
+      this.selectEndPos = {
+        x: endX,
+        y: endY
+      };
+      e.preventDefault();
+    },
+    /**
+     * 鼠标松开 - 完成框选并拍照
+     */
+    async handleMouseUp(e) {
+      if (!this.isSelectAreaMode || !this.isSelecting) return;
+      this.isSelecting = false;
+      const endX = e.offsetX;
+      const endY = e.offsetY;
+      console.log('框选起始位置:', this.selectStartPos);
+      console.log('框选结束位置:', {
+        x: endX,
+        y: endY
+      });
+      console.log('使用缩放比例:', this.zoomScaleVal);
+
+      // 使用独立的 X/Y 缩放比例进行坐标转换
+      const x1 = Math.round(this.selectStartPos.x * this.zoomScaleX);
+      const y1 = Math.round(this.selectStartPos.y * this.zoomScaleY);
+      const x2 = Math.round(endX * this.zoomScaleX);
+      const y2 = Math.round(endY * this.zoomScaleY);
+      console.log('转换前坐标:', {
+        x1,
+        y1,
+        x2,
+        y2
+      });
+      console.log('使用缩放比例 - X:', this.zoomScaleX, 'Y:', this.zoomScaleY);
+
+      // liangtian.html 中的坐标排序逻辑
+      let res_left = Math.min(x1, x2);
+      let res_top = Math.min(y1, y2);
+      let res_right = Math.max(x1, x2);
+      let res_bottom = Math.max(y1, y2);
+      console.log('排序后坐标:', {
+        res_left,
+        res_top,
+        res_right,
+        res_bottom
+      });
+
+      // 验证框选范围
+      if (res_left === res_right || res_top === res_bottom || res_right - res_left < 10 || res_bottom - res_top < 10) {
+        this.$message.warning('框选范围过小，请重新框选');
+        return;
+      }
+      try {
+        // 使用 liangtian.html 的坐标命名方式
+        const coords = {
+          left: res_left.toString(),
+          top: res_top.toString(),
+          right: res_right.toString(),
+          bottom: res_bottom.toString()
+        };
+        console.log('发送到设备的坐标:', coords);
+        const res = await ELoamPassService.scanBySelectArea(coords);
+        if (res) {
+          this.$emit('send-scanner-result', `${BEGIN_DATA}${res}`);
+          this.$message.success('框选拍照成功，可继续框选或点击"框选拍照"退出');
+        } else {
+          this.$message.error('框选拍照失败');
+        }
+      } catch (err) {
+        console.error('框选拍照出错:', err);
+        this.$message.error('框选拍照出错，请检查设备连接');
+      }
+
+      // 重置选择状态，但保持框选模式开启，支持多次框选
+      this.isSelecting = false;
+      this.selectBoxStyle = {};
+      e.preventDefault();
+    },
+    /**
+     * 鼠标离开 - 取消框选
+     */
+    handleMouseLeave() {
+      if (this.isSelectAreaMode && this.isSelecting) {
+        this.isSelecting = false;
+        this.selectBoxStyle = {};
+      }
     }
   }
 });
 ;// 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=0caf60ba&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=31866b44&prod&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=0caf60ba&prod&scoped=true&lang=scss&
+;// CONCATENATED MODULE: ./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue?vue&type=style&index=0&id=31866b44&prod&lang=scss&
 
 ;// CONCATENATED MODULE: ./packages/scanner/scanner-camera/src/component/scanner-camera-component.vue
 
@@ -85580,11 +85938,11 @@ const BEGIN_DATA = 'data:image/jpg;base64,';
 
 var scanner_camera_component_component = normalizeComponent(
   component_scanner_camera_componentvue_type_script_lang_js_,
-  scanner_camera_componentvue_type_template_id_0caf60ba_scoped_true_render,
-  scanner_camera_componentvue_type_template_id_0caf60ba_scoped_true_staticRenderFns,
+  scanner_camera_componentvue_type_template_id_31866b44_render,
+  scanner_camera_componentvue_type_template_id_31866b44_staticRenderFns,
   false,
   null,
-  "0caf60ba",
+  null,
   null
   
 )