问题修改

src/components/ImageEd.scss

@@ -84,7 +84,8 @@ div {
     color: #333333;
   }
   .center {
-    z-index: 2022;
+    //z-index: 2022;
+    z-index: 99999;
     width: 1120px;
     display: flex;
     align-items: center;

src/components/ImageEd.vue

@@ -2355,7 +2355,7 @@ export default {
       self.$bus.on('target_info', (target_info) => {
         console.log(target_info);
         // 西藏上云暂时不用
-        // self.getBdjqData(target_info.barcode_source, target_info.seq_source, target_info.barcode_target, target_info.seq_target, target_info.type)
+        self.getBdjqData(target_info.barcode_source, target_info.seq_source, target_info.barcode_target, target_info.seq_target, target_info.type)
       })
 
       let canvasImage = self.imageEditor._graphics.getCanvasImage();
@@ -2450,7 +2450,7 @@ export default {
       self.$bus.on('target_info', (target_info) => {
         console.log(target_info);
         // 西藏上云暂时不用
-        // self.getBdjqData(target_info.barcode_source, target_info.seq_source, target_info.barcode_target, target_info.seq_target, target_info.type)
+        self.getBdjqData(target_info.barcode_source, target_info.seq_source, target_info.barcode_target, target_info.seq_target, target_info.type)
       })
       this.imageEditor2.changeCursor("auto");
       let canvasImage = this.imageEditor2._graphics.getCanvasImage();
@@ -7558,6 +7558,6 @@ export default {
 </style>
 <style lang="scss">
 .el-tooltip__popper {
-  z-index: 9999 !important;
+  //z-index: 9999 !important;
 }
 </style>

src/store/modules/ljk.js

@@ -40,7 +40,7 @@ const actions = {
   //     }
   //   })
   // },
-  _ljkRy (context, options) {// 获取人员逻辑库
+  async _ljkRy (context, options) {// 获取人员逻辑库
     let userInfo = JSON.parse(localStorage.getItem("userInfo"))
     let params = {
       userId: null,
@@ -48,14 +48,14 @@ const actions = {
     }
     params.userId = userInfo.user.id
     params.userGroupIds = userInfo.groupIds
-    _axios.post('/api/code/personLogic', params).then(res => {
+    await _axios.post('/api/code/personLogic', params).then(res => {
       console.log(res, '/api/code/personLogic   luojiku ')
       if (res.data.code == 0 && res.data.message == "success") {
         context.commit('ljkRy', res.data.ret);
       }
     })
   },
-  _ljkAj (context, options) {// 获取案件逻辑库
+  async _ljkAj (context, options) {// 获取案件逻辑库
     let userInfo = JSON.parse(localStorage.getItem("userInfo"))
     let params = {
       userId: null,
@@ -63,14 +63,14 @@ const actions = {
     }
     params.userId = userInfo.user.id
     params.userGroupIds = userInfo.groupIds
-    _axios.post('/api/code/caseLogic', params).then(res => {
+    await _axios.post('/api/code/caseLogic', params).then(res => {
       console.log(res, '/api/code/caseLogic   luojiku ')
       if (res.data.code == 0 && res.data.message == "success") {
         context.commit('ljkAj', res.data.ret);
       }
     })
   },
-  _ljkAll (context, options) {// 获取全部逻辑库名称
+  async _ljkAll (context, options) {// 获取全部逻辑库名称
     let userInfo = JSON.parse(localStorage.getItem("userInfo"))
     let params = {
       userId: null,
@@ -78,7 +78,7 @@ const actions = {
     }
     params.userId = userInfo.user.id
     params.userGroupIds = userInfo.groupIds
-    _axios.post('/api/code/allLogicName', params).then(res => {
+    await _axios.post('/api/code/allLogicName', params).then(res => {
       console.log(res, '/api/code/allLogicName   luojiku ')
       if (res.data.code == 0 && res.data.message == "success") {
         context.commit('ljkAll', res.data.ret);

src/views/AllPersonnelBase/modules/ryxxk.vue

@@ -511,9 +511,8 @@ export default {
       this.FaceImgNum = 0;
       NetUtil.ryxxk.getFaceByBarcode({ barcode: this.ysryjbxx.ysxtAsjxgrybh })
         .then((response) => {
-          console.log(response.data);
-          if (response.data.code == 0) {
-            response.data.ret.forEach((element, index) => {
+          if (response.code == 0) {
+            response.ret.forEach((element, index) => {
               self.FaceImg.forEach((item) => {
                 if (item.code == element.seq) {
                   item.img = element.image;
@@ -523,7 +522,7 @@ export default {
             });
             // 去掉加载状态
             self.FaceLoading = false;
-          } else if (response.data.code == 4) {
+          } else if (response.code == 4) {
             // 去掉加载状态
             self.FaceLoading = false;
           }
@@ -540,9 +539,8 @@ export default {
       this.PalmImgNum = 0;
       NetUtil.ryxxk.getPalmByBarcode({ barcode: this.ysryjbxx.ysxtAsjxgrybh })
         .then((response) => {
-          console.log(response.data);
-          if (response.data.code == 0) {
-            response.data.ret.forEach((element, index) => {
+          if (response.code == 0) {
+            response.ret.forEach((element, index) => {
               self.PlamImg.forEach((item) => {
                 if (item.code == element.seq) {
                   item.img = element.image;
@@ -552,7 +550,7 @@ export default {
             });
             // 去掉加载状态
             self.PlamLoading = false;
-          } else if (response.data.code == 4) {
+          } else if (response.code == 4) {
             // 去掉加载状态
             self.PlamLoading = false;
           }
@@ -567,9 +565,9 @@ export default {
       NetUtil.ryxxk.getPlainByBarcode({ barcode: this.ysryjbxx.ysxtAsjxgrybh })
         .then((response) => {
           // console.log(response.data);
-          if (response.data.code == 0) {
-            this.PlainImgNum = response.data.ret.length;
-            response.data.ret.forEach((element, index) => {
+          if (response.code == 0) {
+            this.PlainImgNum = response.ret.length;
+            response.ret.forEach((element, index) => {
               self.PlainImg.forEach((item) => {
                 if (item.code == element.seq) {
                   item.img = element.image;
@@ -579,7 +577,7 @@ export default {
             });
             // 去掉加载状态
             self.PlainImgfingerLoading = false;
-          } else if (response.data.code == 4) {
+          } else if (response.code == 4) {
             // 去掉加载状态
             self.PlainImgfingerLoading = false;
           }
@@ -593,12 +591,11 @@ export default {
       // let self = this;
       NetUtil.ryxxk.getRollByBarcode({ barcode: this.ysryjbxx.ysxtAsjxgrybh })
         .then((response) => {
-          console.log(response.data);
-          if (response.data.code == 0) {
+          if (response.code == 0) {
             // 去掉加载状态
             this.RollImgfingerLoading = false;
-            this.RollImgNum = response.data.ret.length;
-            response.data.ret.forEach((element, index) => {
+            this.RollImgNum = response.ret.length;
+            response.ret.forEach((element, index) => {
               this.RollImg.forEach((item) => {
                 if (item.code == element.seq) {
                   item.img = element.image;
@@ -608,7 +605,7 @@ export default {
             });
             // console.log("RollImgNum", this.RollImgNum);
             // console.log("RollImgfingerLoading", this.RollImgfingerLoading);
-          } else if (response.data.code == 4) {
+          } else if (response.code == 4) {
             // 去掉加载状态
             this.RollImgfingerLoading = false;
           }

src/views/cxyrd/QueryConfirm.vue

@@ -1014,6 +1014,7 @@ export default {
     //点击列表进入页面
     enterInto (row) {
       // !scope.row.querycfg
+      if(row.queryStateName === '等待比对') return;
       if (row.children && row.children.length > 0) {
         if (row.children[0].querytype === '0') {
           let routeUrl = this.$router.resolve({

src/views/cxyrd/modules/LTCandidate.vue

@@ -261,9 +261,9 @@ export default {
   name: "LTCandidate",
   data () {
     return {
-      width3: 80,
-      width2: 60,
-      width1: 50,
+      width3: 75,
+      width2: 55,
+      width1: 48,
       checked: true,
       tableData: null,
       // 不做处理的数据

src/views/drFPTX/Index.vue

@@ -515,7 +515,7 @@
           class='ckxq'
           style="background: #055FE7;border-radius: .25rem; border-color:#055FE7;"
           @click="goList"
-        ><span style="color:#fff;font-size: 0.875rem;">{{$t('FptxDr.see_details')}}</span></el-button>
+        ><span style="color:#fff;font-size: 0.875rem;">{{$t('Common.see_details')}}</span></el-button>
       </div>
     </el-dialog>
 
@@ -1196,7 +1196,7 @@ export default {
           this.UploadPercent = 0
         }
       }).catch(() => {
-        this.$message.error(this.$t('FptxDr.server_error'))
+        this.$message.error(this.$t('Common.server_error'))
         this.showProgress = false
         this.UploadPercent = 0
       })

src/views/login/modules/AccountsLogin.vue

@@ -204,7 +204,7 @@ export default {
           'appToken': me.appToken,
           'token': me.userToken
         },
-      }).then((res) => {
+      }).then(async (res) => {
         me.btnLoading = false
         if (res.data.code == 200) {
           localStorage.setItem('token', res.data.token)
@@ -219,9 +219,9 @@ export default {
 
           this.$message.success(this.$t('Login.login_success_tip'))
           //所在单位数据
-          this.$store.dispatch("ljk/_ljkRy") // 获取用户人员逻辑库JSON
-          this.$store.dispatch("ljk/_ljkAj") // 获取用户案件逻辑库JSON
-          this.$store.dispatch("ljk/_ljkAll") // 获取用户所有逻辑库名称NAME
+          await this.$store.dispatch("ljk/_ljkRy") // 获取用户人员逻辑库JSON
+          await this.$store.dispatch("ljk/_ljkAj") // 获取用户案件逻辑库JSON
+          await this.$store.dispatch("ljk/_ljkAll") // 获取用户所有逻辑库名称NAME
           this.$router.push("/index");
           this.$bus.emit("goLogin");
           this.$store.commit("layout/setMenu", res.data.auth);