Merge branch 'dev_zwpt' of http://39.99.224.27:9022/changchao/founder_vue into dev_zwpt

src/views/Editor/modules/imageEdAJ.vue

 <!--
  * @Author: your name
  * @Date: 2021-10-22 11:36:10
- * @LastEditTime: 2022-01-19 17:59:49
+ * @LastEditTime: 2022-01-20 09:52:38
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
@@ -2129,7 +2129,6 @@ export default {
                   centerY: item.centerY,
                   radius: item.radius
                 });
-                self.circleId = item.id;
                 // 圆
                 var $circle = null;
                 $circle = $(
@@ -2139,8 +2138,8 @@ export default {
                 $circle.css("border", "2px solid red");
                 $circle.css("position", "absolute");
                 // 设置圆的大小和位置
-                $circle.css("left", Math.abs(item.centerX - radius) + "px");
-                $circle.css("top", Math.abs(item.centerY - radius) + "px");
+                $circle.css("left", Math.abs(item.centerX - item.radius) + "px");
+                $circle.css("top", Math.abs(item.centerY - item.radius) + "px");
                 $circle.css("width", 2 * item.radius + "px");
                 $circle.css("height", 2 * item.radius + "px");
                 $circle.css("border-radius", "50%");
@@ -3561,21 +3560,21 @@ export default {
             });
             // Fcanvas.viewportTransform = [0.7, 0, 0, 0.7, -50, 50];
             Fcanvas.add(polygon);
+            // console.log(self.Fcanvasarr);
+            if (self.Fcanvasarr == null) {
+              self.Fcanvasarr = []
+            }
+            self.Fcanvasarr.push(Fcanvasline1);
+            // console.log(self.Fcanvasarr);
+            // self.Fcanvasarr = Fcanvasarr || [];
+            resetTempLine();
+            // 更新vuex数据--自由绘制
+            self.$store.commit("zwbj/setZyhz", self.Fcanvasarr);
+            sessionStorage.setItem('zyhz_' + self.seq, JSON.stringify(self.Fcanvasarr))
+            // 进行了特征操作，记录一下
+            sessionStorage.setItem('isOption_' + self.seq, true)
+            self.judgeJumpRoute()
           }
-          // console.log(self.Fcanvasarr);
-          if (self.Fcanvasarr == null) {
-            self.Fcanvasarr = []
-          }
-          self.Fcanvasarr.push(Fcanvasline1);
-          // console.log(self.Fcanvasarr);
-          // self.Fcanvasarr = Fcanvasarr || [];
-          resetTempLine();
-          // 更新vuex数据--自由绘制
-          self.$store.commit("zwbj/setZyhz", self.Fcanvasarr);
-          sessionStorage.setItem('zyhz_' + self.seq, JSON.stringify(self.Fcanvasarr))
-          // 进行了特征操作，记录一下
-          sessionStorage.setItem('isOption_' + self.seq, true)
-          self.judgeJumpRoute()
         }
       }
     });
@@ -3966,25 +3965,27 @@ export default {
                 if (zddxx_zyhz.length > 0) {
                   zddxx_zyhz.forEach((item) => {
                     let arr = [];
-                    item.zddxx_zyhzzbd.forEach(item2 => {
-                      arr.push({
-                        x: item2.zdytq_tzdxzb * self.width_ratio,
-                        y: item2.zdytq_tzdyzb * self.height_ratio
+                    if (item.zddxx_zyhzzbd) {
+                      item.zddxx_zyhzzbd.forEach(item2 => {
+                        arr.push({
+                          x: item2.zdytq_tzdxzb * self.width_ratio,
+                          y: item2.zdytq_tzdyzb * self.height_ratio
+                        });
                       });
-                    });
-                    self.autoFcanvas.push(arr);
-
-                    var polygon = new fabric.Polygon(arr, {
-                      fill: "rgba(0,0,0,0)",
-                      strokeWidth: 2,
-                      stroke: "red",
-                      objectCaching: false,
-                      transparentCorners: false,
-                      cornerColor: "rgba(0,0,0,0)",
-                      // 设置可选
-                      selectable: true
-                    });
-                    self.Fcanvas_canvas.add(polygon);
+                      self.autoFcanvas.push(arr);
+
+                      var polygon = new fabric.Polygon(arr, {
+                        fill: "rgba(0,0,0,0)",
+                        strokeWidth: 2,
+                        stroke: "red",
+                        objectCaching: false,
+                        transparentCorners: false,
+                        cornerColor: "rgba(0,0,0,0)",
+                        // 设置可选
+                        selectable: true
+                      });
+                      self.Fcanvas_canvas.add(polygon);
+                    }
                   });
                 }
               } else {
@@ -3993,7 +3994,6 @@ export default {
               // console.log(self.autoFcanvas);
               self.$store.commit("zwbj/setAutoZyhz", self.autoFcanvas);
               // 将自动提取的特征点存入session中
-              debugger
               sessionStorage.setItem(`auto_zyhz_${self.seq}`, JSON.stringify(self.autoFcanvas));
             } else {
               self.$store.commit("zwbj/setAutoZyhz", []);
@@ -4125,7 +4125,7 @@ export default {
                 if (zddxx_zyhz.length > 0) {
                   zddxx_zyhz.forEach((item) => {
                     let arr = [];
-                    if(item.zddxx_zyhzzbd) {
+                    if (item.zddxx_zyhzzbd) {
                       item.zddxx_zyhzzbd.forEach(item2 => {
                         arr.push({
                           x: item2.zdytq_tzdxzb * self.height_ratio,
@@ -4133,7 +4133,7 @@ export default {
                         });
                       });
                       self.autoFcanvas.push(arr);
-  
+
                       var polygon = new fabric.Polygon(arr, {
                         fill: "rgba(0,0,0,0)",
                         strokeWidth: 2,
@@ -7273,6 +7273,7 @@ export default {
         // console.log(self.circleArr_hand);
         let circleArr_hand_t = [];
         let circleArr_hand_t2 = [];
+        
         if (self.circleArr_hand) {
           self.circleArr_hand.forEach((item) => {
             circleArr_hand_t.push({
@@ -7304,7 +7305,16 @@ export default {
             y: Number($(".tzdDrawing_2").height()) / 2
           };
           const point = { x: src.x, y: src.y };
-          const angle = tzdDrawing_angle * Math.PI / 180.00;
+          let angle = tzdDrawing_angle * Math.PI / 180.00;
+          if (flipX === 1 && flipY === 0) {
+            angle = -angle
+          } else if (flipX === 0 && flipY === 1) {
+            angle = -angle
+          } else if (flipX === 1 && flipY === 1) {
+
+          } else {
+
+          }
           // 弧度 = 角度 * Math.PI / 180
           const [x, y] = reverse(
             point.x,
@@ -7389,7 +7399,16 @@ export default {
               y: Number($(".tzdDrawing_2").height()) / 2
             };
             const point = { x: src.x, y: src.y };
-            const angle = tzdDrawing_angle * Math.PI / 180.00;
+            let angle = tzdDrawing_angle * Math.PI / 180.00;
+            if (flipX === 1 && flipY === 0) {
+              angle = -angle
+            } else if (flipX === 0 && flipY === 1) {
+              angle = -angle
+            } else if (flipX === 1 && flipY === 1) {
+
+            } else {
+
+            }
             // 弧度 = 角度 * Math.PI / 180
             const [x, y] = reverse(
               point.x,