合并

public/index.html

 <!--
  * @Author: your name
  * @Date: 2021-11-08 20:00:34
- * @LastEditTime: 2021-11-29 10:38:45
- * @LastEditors: your name
+ * @LastEditTime: 2021-11-29 18:29:19
+ * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \指纹系统\founder_vue\public\index.html
 -->
@@ -43,11 +43,11 @@
   }
 
   .el-dialog__wrapper {
-    z-index: 99999 !important;
+    /* z-index: 99999 !important; */
   }
 
   .el-cascader__dropdown {
-    z-index: 99999999 !important;
+    /* z-index: 99999999 !important; */
   }
 </style>
 

src/plugins/axios.js

 /*
  * @Author: your name
  * @Date: 2021-09-07 09:57:48
- * @LastEditTime: 2021-11-29 18:23:41
+ * @LastEditTime: 2021-11-30 09:16:35
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\plugins\axios.js
@@ -85,7 +85,7 @@ _axios.interceptors.response.use(
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          router.replace("/login1");
+          router.replace("/Login");
         }).catch(() => {
         });
       }, 200);

src/views/Editor/modules/ajdaxx.vue

@@ -3,9 +3,9 @@
     size="50%"
     class="rydaxx-drawer ajdaxx-drawer"
     :modal="false"
-    :wrapperClosable="false"
     :append-to-body="true"
     :modal-append-to-body="false"
+    @close="closeDrawer"
     :visible.sync="drawer"
     :with-header="false">
     <div class="header">

src/views/Editor/modules/imageEd.vue

 <!--
  * @Author: your name
  * @Date: 2021-10-22 11:36:10
- * @LastEditTime: 2021-11-29 17:05:44
+ * @LastEditTime: 2021-11-29 22:33:17
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
@@ -1291,6 +1291,7 @@ export default {
         if (sessionStorage.getItem(self.seq) != "undefined") {
           //console.log(sessionStorage.getItem(self.seq));
           let preTzd = JSON.parse(sessionStorage.getItem(self.seq));
+          console.log(preTzd);
           if (preTzd && preTzd.length > 0) {
             preTzd.forEach((item, index) => {
               self.tzdArr.push({
@@ -1678,6 +1679,8 @@ export default {
           if (deg === NaN) {
             deg = 0;
           }
+          // 给 obj 对象的 deg 赋值
+          obj.deg = deg
 
           //console.log(self.startPlace, "原点 ");
           if (deg) {
@@ -1707,7 +1710,7 @@ export default {
               return item.id == self.tzdId;
             });
             // self.$set(self.tzdArr[self.tzdId], 'angle', obj.deg)
-            self.tzdArr[objindex].angle = obj.deg;
+            self.tzdArr[objindex].angle = obj.deg - self.startPlace;
           } else {
             //console.log(self.tzdArr);
             //console.log(self.tzdId);
@@ -1734,7 +1737,7 @@ export default {
             });
           }
 
-          //console.log(self.pretzdall);
+          console.log(self.pretzdall);
           // 全部数据保存
           self.$store.commit("zwbj/setTzdall", self.pretzdall);
           //console.log(self.preTzdArr);

src/views/Editor/modules/imageEdAJ.vue

 <!--
  * @Author: your name
  * @Date: 2021-10-22 11:36:10
- * @LastEditTime: 2021-11-29 17:28:09
+ * @LastEditTime: 2021-11-29 22:40:47
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
@@ -2708,6 +2708,9 @@ export default {
             deg = 0;
           }
 
+          // 给 obj 对象的 deg 赋值
+          // TODO
+          obj.deg = deg
           // console.log(self.startPlace, "原点 ");
           if (deg) {
             $("#tzd" + self.tzdId).css("transform", `rotate(${deg - self.startPlace}deg)`);
@@ -2818,7 +2821,7 @@ export default {
               return item.id == self.tzdId;
             });
             // self.$set(self.tzdArr[self.tzdId], 'angle', obj.deg)
-            self.tzdArr[objindex].angle = obj.deg;
+            self.tzdArr[objindex].angle = obj.deg - self.startPlace;
           } else {
             console.log(self.tzdArr);
             console.log(self.tzdId);

src/views/Editor/modules/rydaxx.vue

@@ -3,7 +3,7 @@
     size="50%"
     class="rydaxx-drawer"
     :modal="false"
-    :wrapperClosable="false"
+    @close="closeDrawer"
     :append-to-body="true"
     :modal-append-to-body="false"
     :visible.sync="drawer"

src/views/login/Login1.vue

@@ -370,4 +370,7 @@ div {
   margin: 0 auto;
   text-align: center;
 }
+.video-js {
+  position: static !important;
+}
 </style>

vue.config.js

 /*
  * @Author: your name
  * @Date: 2021-09-07 09:57:48
- * @LastEditTime: 2021-11-30 09:18:21
+ * @LastEditTime: 2021-11-30 09:22:48
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\vue.config.js