1.优化认定详情候选加载动画。2.解决列表展开收缩样式位置错乱。

ab996b9d · 张超军 · b75b6ed3 · ab996b9d · ab996b9d · ab996b9d
Commit ab996b9d authored Apr 20, 2022 by 张超军
11 changed files
--- a/public/image-edit/js/tui-image-editor.js
+++ b/public/image-edit/js/tui-image-editor.js
@@ -12991,7 +12991,9 @@
             * @override
             */
            initialize: function initialize() {
-              this.matrix = [4, 4, 4, 4, 0.7, -4, -4, -4, -4];
+              this.matrix = [4, 4, 4, 
+                            4, 0.7, -4,
+                            -4, -4, -4];
              // this.matrix = [1, 1, 1, 1, 0.7, -1, -1, -1, -1];
              // this.matrix = [0, -1,  0, -1,  5, -1, 0, -1,  0];
              // this.matrix = [1/9, 1/9,  1/9, 1/9,  1/9, 1/9, 1/9, 1/9, 1/9];
--- a/src/App.vue
+++ b/src/App.vue
 <!--
 * @Author: your name
 * @Date: 2021-09-07 09:58:13
- * @LastEditTime: 2022-03-25 17:27:15
+ * @LastEditTime: 2022-04-17 00:36:57
 * @LastEditors: Please set LastEditors
 * @Description: In User Settings Edit
 * @FilePath: \指纹系统\founder_vue\src\App.vue
@@ -78,6 +78,7 @@ export default {

 .el-message {
  z-index: 999999 !important;
+  justify-content: flex-start !important;
 }

 // 滚动条的滑块
@@ -141,10 +142,6 @@ export default {
  }
 }

-/deep/ .el-message {
-  justify-content: flex-start !important;
-}
-
 .el-message-box__message {
  margin: 23px 24px 17px 24px;
  font-size: 14px;

--- a/src/components/ImageEd.vue
+++ b/src/components/ImageEd.vue
 <!--
 * @Author: your name
 * @Date: 2021-09-09 09:28:46
- * @LastEditTime: 2022-04-16 10:50:45
+ * @LastEditTime: 2022-04-17 00:41:00
 * @Description: In User Settings Edit
 * @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
 -->
@@ -2643,6 +2643,11 @@ export default {

    this.$bus.on('deleteMessage', (obj) => {
      if (obj.delTime != null) {
+        // 移除源特征点
+        self.bdjqData_source = []
+        // 移除目标特征点
+        self.bdjqData_target = []
+        
        self.targetImage = "xxx";
        self.sourceImage = "xxx";
        self.zwtp_target = false
@@ -2673,6 +2678,15 @@ export default {

    this.$bus.on('targetDeleteMessage', (obj) => {
      if (obj.delTime != null) {
+        self.$bus.on('target_info', (target_info) => {
+          self.target_info = target_info
+          // 移除源特征点
+          self.bdjqData_source = []
+          // 移除目标特征点
+          self.bdjqData_target = []
+          self.getBdjqData(self.target_info.barcode_source, self.target_info.seq_source, self.target_info.barcode_target, self.target_info.seq_target, self.target_info.type)
+        })
+        
        self.targetImage = "xxx";
        self.zwtp_target = false
        self.zwtp_source = false

--- a/src/netmgr/cxyrd/cxyrd.js
+++ b/src/netmgr/cxyrd/cxyrd.js
 /*
 * @Author: your name
 * @Date: 2022-01-07 17:40:44
- * @LastEditTime: 2022-02-14 17:02:06
+ * @LastEditTime: 2022-04-20 10:20:51
 * @LastEditors: Please set LastEditors
 * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 * @FilePath: \指纹系统\founder_vue\src\netmgr\cxyrd\cxyrd.js
@@ -24,22 +24,22 @@ const _path = {
 export default {
  // 获取案件指纹
  ajfinger(_parameter) {
-    return fHttp.postJson(_path.ajfinger, _parameter, HttpConfigUtil.closeLoadAndTip())
+    return fHttp.postJson(_path.ajfinger, _parameter)
  },
  // 获取案件掌纹
  ajhand(_parameter) {
-    return fHttp.postJson(_path.ajhand, _parameter, HttpConfigUtil.closeLoadAndTip())
+    return fHttp.postJson(_path.ajhand, _parameter)
  },
  // 获取人员平面指纹
  ryfingerPain(_parameter) {
-    return fHttp.postJson(_path.ryfingerPain, _parameter, HttpConfigUtil.closeLoadAndTip())
+    return fHttp.postJson(_path.ryfingerPain, _parameter)
  },
  // 获取人员滚动指纹
  ryfingerRoll(_parameter) {
-    return fHttp.postJson(_path.ryfingerRoll, _parameter, HttpConfigUtil.closeLoadAndTip())
+    return fHttp.postJson(_path.ryfingerRoll, _parameter)
  },
  // 获取人员掌纹
  ryhand(_parameter) {
-    return fHttp.postJson(_path.ryhand, _parameter, HttpConfigUtil.closeLoadAndTip())
+    return fHttp.postJson(_path.ryhand, _parameter)
  },
 }
--- a/src/netmgr/imageEd/imageEd.js
+++ b/src/netmgr/imageEd/imageEd.js
 /*
 * @Author: zhangchaojun
 * @Date: 2022-02-15 15:58:41
- * @LastEditTime: 2022-04-12 19:33:25
+ * @LastEditTime: 2022-04-20 10:21:16
 * @LastEditors: Please set LastEditors
 * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 * @FilePath: \指纹系统\founder_vue\src\netmgr\imageEd\imageEd.js
@@ -21,15 +21,15 @@ const _path = {
 export default {
  // 获取图片特征
  fingerTZD(_parameter) {
-    return fHttp.postJson(_path.fingerTZD, _parameter, HttpConfigUtil.closeLoadAndTip())
+    return fHttp.postJson(_path.fingerTZD, _parameter)
  },
  fingerTZD_LL(_parameter) {
-    return fHttp.postJson(_path.fingerTZD_LL, _parameter, HttpConfigUtil.closeLoadAndTip())
+    return fHttp.postJson(_path.fingerTZD_LL, _parameter)
  },
  handTZD(_parameter) {
-    return fHttp.postJson(_path.handTZD, _parameter, HttpConfigUtil.closeLoadAndTip())
+    return fHttp.postJson(_path.handTZD, _parameter)
  },
  handTZD_LL(_parameter) {
-    return fHttp.postJson(_path.handTZD_LL, _parameter, HttpConfigUtil.closeLoadAndTip())
+    return fHttp.postJson(_path.handTZD_LL, _parameter)
  },
 }
--- a/src/views/AllPersonnelBase/dclb.vue
+++ b/src/views/AllPersonnelBase/dclb.vue
@@ -189,7 +189,7 @@
          <el-table-column
            prop="taskNumber"
            :label="$t('FptxDr.task_number')"
-            :width="width1"
+            :width="width_rwh"
          >
            <template slot-scope="scope">
              <svg-icon
@@ -324,7 +324,7 @@
        <el-table-column
          prop="taskNumber"
          :label="$t('FptxDr.task_number')"
-          :width="width1"
+          :width="width_rwh"
        >
          <template slot-scope="scope">
            <svg-icon
@@ -439,6 +439,7 @@ export default {
  name: "gzlb",
  data () {
    return {
+      width_rwh: 240,
      width5: 50,
      width3: 100,
      width2: 240,
@@ -479,7 +480,8 @@ export default {
    this.width2 = (this.width2 * w2) / w1;
    this.width3 = (this.width3 * w2) / w1;
    this.width4 = (this.width4 * w2) / w1;
-    this.width5 = (this.width5 * w2) / w1
+    this.width5 = (this.width5 * w2) / w1;
+    this.width_rwh = (this.width_rwh * w2) / w1;
  },
  watch: {
    // showType (newNum, oldNum) {
@@ -497,7 +499,7 @@ export default {
     * @description: 切换选项时调用
     * @param {*}
     * @return {*}
-     */    
+     */
    getPersonOrCaseData() {
      this.selectBoo = false // 是否批量操作
      this.isShowTip = false;
@@ -1240,15 +1242,15 @@ export default {
 }
 @import "@/assets/css/globalBase.scss";
 </style>
-<style lang="scss" >
-.el-table__expand-icon {
+<style lang="scss" scoped>
+/deep/.el-table__expand-icon {
  position: absolute;
  right: 45px;
  cursor: pointer;
  color: #b51f1f;
  transition: transform 0.2s ease-in-out;
  width: 11px;
-  height: 11px;
+  //height: 11px;
  /* border: black 1px solid; */
  margin: 0;
  background-image: url("../../assets/img/confirm/expend.png");
@@ -1256,14 +1258,19 @@ export default {
  background-size: 11px;
  background-repeat: no-repeat;
 }
-.el-table__expand-icon.el-table__expand-icon--expanded {
+/deep/.el-table__expand-icon.el-table__expand-icon--expanded {
+  position: absolute;
+  //right: 45px;
+  cursor: pointer;
  width: 11px;
-  height: 11px;
+  //height: 11px;
  background-image: url("../../assets/img/confirm/shrink.png");
  background-position: center;
  background-size: 11px;
  background-repeat: no-repeat;
+  transform-origin: center;
  transform: rotate(180deg) !important;
+  transition: transform 0.2s ease-in-out;
 }
 .el-checkbox__input.is-checked .el-checkbox__inner {
  background-color: #006aff;
@@ -1299,4 +1306,4 @@ export default {
  background-color: #006aff;
  border-color: #006aff;
 }
-</style>
+</style>
\ No newline at end of file
--- a/src/views/cxyrd/QueryConfirm.vue
+++ b/src/views/cxyrd/QueryConfirm.vue
@@ -2246,7 +2246,7 @@ b {
  cursor: pointer;
 }
 </style>
-<style lang="scss">
+<style lang="scss" scoped>
 .el-tag-box {
  // width: 930px;
  display: flex !important;
@@ -2279,7 +2279,7 @@ b {
  background: #dadde0;
 }

-.el-table__expand-icon {
+/deep/.el-table__expand-icon {
  .el-icon-arrow-right {
    cursor: pointer !important;
  }
@@ -2291,7 +2291,7 @@ b {
  color: #b51f1f;
  transition: transform 0.2s ease-in-out;
  width: 11px;
-  height: 11px;
+  // height: 11px;
  /* border: black 1px solid; */
  margin: 0;
  background-image: url("../../assets/img/confirm/expend.png");
@@ -2300,9 +2300,9 @@ b {
  background-repeat: no-repeat;
 }

-.el-table__expand-icon.el-table__expand-icon--expanded {
+/deep/.el-table__expand-icon.el-table__expand-icon--expanded {
  width: 11px;
-  height: 11px;
+  // height: 11px;
  background-image: url("../../assets/img/confirm/shrink.png");
  background-position: center;
  background-size: 11px;

--- a/src/views/drFPTX/Index.vue
+++ b/src/views/drFPTX/Index.vue
@@ -480,6 +480,7 @@
        <el-progress
          type="circle"
          :percentage="UploadPercent"
+          color="#006AFF"
        ></el-progress>
        <div
          v-show="UploadPercent<100"
@@ -1198,7 +1199,6 @@ export default {
          // TODO 导入日志记录
          // this.sendLog('导入')
        } else {
-          debugger
          this.$message.error(res.data.message)
          this.dialogVisible = false// 进度条弹窗
          this.$bus.emit('isBlur', false)
@@ -1442,8 +1442,8 @@ export default {
  cursor: pointer;
 }
 </style>
-<style lang="scss">
-.el-table__expand-icon {
+<style lang="scss" scoped>
+/deep/.el-table__expand-icon {
  .el-icon-arrow-right {
    cursor: pointer !important;
  }
@@ -1455,7 +1455,7 @@ export default {
  color: #b51f1f;
  transition: transform 0.2s ease-in-out;
  width: 11px;
-  height: 11px;
+  // height: 11px;
  /* border: black 1px solid; */
  margin: 0;
  background-image: url("../../assets/img/confirm/expend.png");
@@ -1464,9 +1464,9 @@ export default {
  background-repeat: no-repeat;
 }

-.el-table__expand-icon.el-table__expand-icon--expanded {
+/deep/.el-table__expand-icon.el-table__expand-icon--expanded {
  width: 11px;
-  height: 11px;
+  // height: 11px;
  background-image: url("../../assets/img/confirm/shrink.png");
  background-position: center;
  background-size: 11px;

--- a/src/views/drFPTX/RAList.vue
+++ b/src/views/drFPTX/RAList.vue
@@ -2221,8 +2221,8 @@ export default {
  cursor: pointer;
 }
 </style>
-<style lang="scss">
-.el-table__expand-icon {
+<style lang="scss" scoped>
+/deep/.el-table__expand-icon {
  .el-icon-arrow-right {
    right: 0 !important;
    cursor: pointer !important;
@@ -2233,7 +2233,7 @@ export default {
  color: #b51f1f;
  transition: transform 0.2s ease-in-out;
  width: 11px;
-  height: 11px;
+  // height: 11px;
  /* border: black 1px solid; */
  margin: 0;
  background-image: url("../../assets/img/confirm/expend.png");
@@ -2241,9 +2241,9 @@ export default {
  background-size: 11px;
  background-repeat: no-repeat;
 }
-.el-table__expand-icon.el-table__expand-icon--expanded {
+/deep/.el-table__expand-icon.el-table__expand-icon--expanded {
  width: 11px;
-  height: 11px;
+  // height: 11px;
  background-image: url("../../assets/img/confirm/shrink.png");
  background-position: center;
  background-size: 11px;
@@ -2251,15 +2251,15 @@ export default {
  transform: rotate(180deg) !important;
 }
 </style>
-<style  scoped lang="scss" >
-.el-table__expand-icon {
+<style  scoped lang="scss">
+/deep/.el-table__expand-icon {
  position: absolute;
  right: 45px;
  cursor: pointer;
  color: #b51f1f;
  transition: transform 0.2s ease-in-out;
  width: 11px;
-  height: 11px;
+  // height: 11px;
  /* border: black 1px solid; */
  margin: 0;
  background-image: url("../../assets/img/confirm/expend.png");
@@ -2267,9 +2267,9 @@ export default {
  background-size: 11px;
  background-repeat: no-repeat;
 }
-.el-table__expand-icon.el-table__expand-icon--expanded {
+/deep/.el-table__expand-icon.el-table__expand-icon--expanded {
  width: 11px;
-  height: 11px;
+  // height: 11px;
  background-image: url("../../assets/img/confirm/shrink.png");
  background-position: center;
  background-size: 11px;

--- a/src/views/login/modules/AccountsLogin.vue
+++ b/src/views/login/modules/AccountsLogin.vue
--- a/vue.config.js
+++ b/vue.config.js
 /*
 * @Author: your name
 * @Date: 2021-09-07 09:57:48
- * @LastEditTime: 2022-04-15 17:46:08
+ * @LastEditTime: 2022-04-20 16:38:45
 * @LastEditors: Please set LastEditors
 * @Description: In User Settings Edit
 * @FilePath: \指纹系统\founder_vue\vue.config.js
@@ -104,11 +104,11 @@ module.exports = {
        // target: "http://127.0.0.1:8099",
        // target: "http://47.92.225.109:5602",
        // target: "http://www.meetfood.cn:2390", // 湖南-线上
-        target: "http://zwpt.xzclub.top:9333/",
+        // target: "http://zwpt.xzclub.top:9333/",
        // target: "http://192.168.128.104:8099",  // 江
        // target: "http://172.20.0.149:8099", // 北京  张
-        // target: "http://192.168.43.24:8099", // 西藏  张
-        // target: "http://192.168.0.108:8099", // 西藏  马
+        // target: "http://192.168.0.109:8099", // 西藏  张
+        target: "http://192.168.0.134:8099", // 西藏  马
        ws: true,
        changeOrigin: true,
        pathRewrite: {