人员/案件指纹编辑部分修改

src/views/Editor/modules/imageEd.vue

@@ -2045,10 +2045,7 @@ export default {
                 let auto_tzdindex = self.autoTzdArr.findIndex((item) => {
                   return (
                     item.id ==
-                    e.target.id.substring(
-                      11,
-                      e.target.id.length
-                    )
+                    e.target.id
                   );
                 });
 
@@ -2070,10 +2067,7 @@ export default {
                 let tdzindex = self.tzdArr.findIndex((item) => {
                   return (
                     item.id ==
-                    e.target.id.substring(
-                      3,
-                      e.target.id.length
-                    )
+                    e.target.id.substring(3, e.target.id.length)
                   );
                 });
                 if (tdzindex != -1) {
@@ -2106,11 +2100,7 @@ export default {
                 // 删除该特征点
                 let auto_tzdindex = self.autoTzdArr.findIndex((item) => {
                   return (
-                    item.id ==
-                    e.target.parentNode.id.substring(
-                      11,
-                      e.target.parentNode.id.length
-                    )
+                    item.id == e.target.parentNode.id
                   );
                 });
 
@@ -2132,10 +2122,7 @@ export default {
                 let tdzindex = self.tzdArr.findIndex((item) => {
                   return (
                     item.id ==
-                    e.target.parentNode.id.substring(
-                      3,
-                      e.target.parentNode.id.length
-                    )
+                    e.target.parentNode.id.substring(3, e.target.parentNode.id.length)
                   );
                 });
                 if (tdzindex != -1) {
@@ -2841,7 +2828,6 @@ export default {
     });
   },
   methods: {
-<<<<<<< HEAD
     /**
      * 右三角开关
      */
@@ -2949,10 +2935,7 @@ export default {
       }
     },
     onClickEnterKeyup () {},
-    hiddenPosition() {
-=======
     hiddenPosition () {
->>>>>>> fe2d27a9f47ec01d375322c7173d2b0c4d4d4e93
       // console.log($('.direction'));
       // $('.direction').css('opacity', '0')
       if (this.hiddenPositionFlag) {
@@ -4611,7 +4594,7 @@ export default {
             zhw_zwysj_tzyzb: self.rightTrigleObj && self.rightTrigleObj.y / self.height_ratio || '',
             zhw_zwzxd_tzxzb: self.centerPointObj && self.centerPointObj.x / self.width_ratio || '',
             zhw_zwzxd_tzyzb: self.centerPointObj && self.centerPointObj.y / self.height_ratio || '',
-            zhw_zwzxd_tzfx: self.centerPointObj && self.centerPointObj.angle
+            zhw_zwzxd_tzfx: self.centerPointObj && self.centerPointObj.angle || ''
             /**
              * 人员掌纹
              备注    zzhwbz

src/views/Editor/modules/imageEdAJ.vue

@@ -5761,7 +5761,7 @@ export default {
             console.log(res.data);
             if (res.data.ret && res.data.ret.minutiaSet && res.data.ret.minutiaSet.minutia && res.data.ret.minutiaSet.minutia.length > 0) {
               res.data.ret.minutiaSet.minutia.forEach(item => {
-                if (!item.tzbh) {
+                if (item.tzbh == null) {
                   item.tzbh = self.tzdId
                   self.tzdId++
                 }

src/views/login/modules/AccountsLogin.vue

 <template>
-  <div class="login_account width70 middle" v-show="isShow">
+<!--  <div class="login_account width70 middle" v-show="isShow">
     <el-input class="width100 margin_top25_bottom10" type="text" :placeholder="$t('Login.username_placeholder')" @keydown.enter.native="login(userInfo)" v-model="userInfo.username">
       <i slot="prefix" style="display: flex; align-items: center">
         <img style="
@@ -20,12 +20,12 @@
     </el-input>
     <el-button class="login_button width100 margin_top25_bottom10" type="primary" ref="userLogin" @click="login(userInfo)" :loading="btnLoading">{{$t('Login.login_btn')}}
     </el-button>
-  </div>
+  </div>-->
   <!-- 对接线上 -->
-<!--  <div class="AccountsLogin">
+  <div class="AccountsLogin">
     <div class="el-icon-loading"></div>
     <span>正在加载中...</span>
-  </div>-->
+  </div>
 </template>
 
 <script>