历史记录

src/components/ImageEd.scss

@@ -336,7 +336,7 @@ div {
         }
       }
       .historyOptions {
-        padding: 14px 24px;
+        // padding: 14px 24px;
         z-index: 1;
         position: absolute;
         top: 35px;
@@ -348,6 +348,34 @@ div {
         box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06);
         border-radius: 4px;
         border: 1px solid #e6e6e8;
+        /* 设置滚动条的样式 */
+        &::-webkit-scrollbar {
+          width : 6px;  /*高宽分别对应横竖滚动条的尺寸*/
+          height: 1px;
+        }
+        /* 滚动槽 */
+        &::-webkit-scrollbar-track {
+          height: 65px;
+          -webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.3);
+          border-radius: 10px;
+        }
+        /* 滚动条滑块 */
+        &::-webkit-scrollbar-thumb {
+          border-radius: 10px;
+          height: 65px;
+          background: #DADDE0;
+        }
+        .history_item {
+          cursor: pointer;
+          width: 100%;
+          &:hover {
+            background-color: #f5f5f7;
+          }
+          .item_left {
+            padding-left: 8px;
+            width: 31.7px;
+          }
+        }
       }
     }
     .clearConfirm {
@@ -1022,7 +1050,7 @@ div {
       width: 520px;
       height: 520px;
       // background: rgba(0, 0, 0, 0.8);
-      margin-left: 14px;
+      // margin-left: 14px;
       margin-top: 60px;
       .body-container {
         width: 520px;

src/views/cxyrd/TL.vue

@@ -301,19 +301,22 @@ div {
     width: 360px;
   }
 }
+/deep/.el-dialog {
+  width: 800px;
+}
 .bz-dialog {
   .tl {
-    width: 763px;
+    width: 100%;
     height: 634px;
     .type {
       display: flex;
-      width: 763px;
+      width: 100%;
       height: 160px;
       background: rgba(230, 0, 18, 0.04);
     }
     .other {
       display: flex;
-      width: 763px;
+      width: 100%;
       height: 160px;
       //background: rgba(230, 0, 18, 0.04);
     }

src/views/cxyrd/modules/LTCandidate.vue

@@ -20,7 +20,7 @@
         v-model="input3"
         placeholder="请输入条码号/指位"
       ></el-input>
-      <div class="btn">筛选</div>
+      <div class="btn" @click="search">筛选</div>
       <div class="checked">
         <el-checkbox v-model="checked">显示已比中候选</el-checkbox>
       </div>
@@ -50,50 +50,50 @@
         <!--        <el-table-column label="排名" width="50"></el-table-column>-->
         <el-table-column prop="score" label="得分" width="50"></el-table-column>
         <el-table-column
-          prop="destid"
+          prop="destseqno"
           label="指位"
           width="70"
           :render-header="icons"
         >
           <template slot-scope="scope">
             {{
-              scope.row.destid == "1"
+              scope.row.destseqno == "1"
                 ? "拇指"
-                : scope.row.destid == "2"
+                : scope.row.destseqno == "2"
                 ? "食指"
-                : scope.row.destid == "3"
+                : scope.row.destseqno == "3"
                 ? "中指"
-                : scope.row.destid == "4"
+                : scope.row.destseqno == "4"
                 ? "环指"
-                : scope.row.destid == "5"
+                : scope.row.destseqno == "5"
                 ? "小指"
-                : scope.row.destid == "6"
+                : scope.row.destseqno == "6"
                 ? "拇指"
-                : scope.row.destid == "7"
+                : scope.row.destseqno == "7"
                 ? "食指"
-                : scope.row.destid == "8"
+                : scope.row.destseqno == "8"
                 ? "中指"
-                : scope.row.destid == "9"
+                : scope.row.destseqno == "9"
                 ? "环指"
-                : scope.row.destid == "10"
+                : scope.row.destseqno == "10"
                 ? "小指"
-                : scope.row.destid == "11"
+                : scope.row.destseqno == "11"
                 ? "拇指"
-                : scope.row.destid == "12"
+                : scope.row.destseqno == "12"
                 ? "食指"
-                : scope.row.destid == "13"
+                : scope.row.destseqno == "13"
                 ? "中指"
-                : scope.row.destid == "14"
+                : scope.row.destseqno == "14"
                 ? "环指"
-                : scope.row.destid == "15"
+                : scope.row.destseqno == "15"
                 ? "小指"
-                : scope.row.destid == "16"
+                : scope.row.destseqno == "16"
                 ? "拇指"
-                : scope.row.destid == "17"
+                : scope.row.destseqno == "17"
                 ? "食指"
-                : scope.row.destid == "18"
+                : scope.row.destseqno == "18"
                 ? "中指"
-                : scope.row.destid == "19"
+                : scope.row.destseqno == "19"
                 ? "环指"
                 : "小指"
             }}
@@ -288,6 +288,9 @@ export default {
      */
     switchOptions() {
       this.isShowOptions = !this.isShowOptions;
+      // if(!this.isShowOptions) {
+      //   this.tableData = this.sourceTableData
+      // }
     },
     /**
      * @description: 筛选指位为右手平面小指
@@ -296,7 +299,7 @@ export default {
      */
     changeRightPX() {
       this.tableData = this.sourceTableData.filter(item => {
-        return item.destid == 15;
+        return item.destseqno == 15;
       });
       // 对勾
       this.rightRoll = false;
@@ -333,7 +336,7 @@ export default {
      */
     changeRightPH() {
       this.tableData = this.sourceTableData.filter(item => {
-        return item.destid == 14;
+        return item.destseqno == 14;
       });
       // 对勾
       this.rightRoll = false;
@@ -370,7 +373,7 @@ export default {
      */
     changeRightPZ() {
       this.tableData = this.sourceTableData.filter(item => {
-        return item.destid == 13;
+        return item.destseqno == 13;
       });
       // 对勾
       this.rightRoll = false;
@@ -407,7 +410,7 @@ export default {
      */
     changeRightPS() {
       this.tableData = this.sourceTableData.filter(item => {
-        return item.destid == 12;
+        return item.destseqno == 12;
       });
       // 对勾
       this.rightRoll = false;
@@ -444,7 +447,7 @@ export default {
      */
     changeRightPM() {
       this.tableData = this.sourceTableData.filter(item => {
-        return item.destid == 11;
+        return item.destseqno == 11;
       });
       // 对勾
       this.rightRoll = false;
@@ -481,7 +484,7 @@ export default {
      */
     changeRightRX() {
       this.tableData = this.sourceTableData.filter(item => {
-        return item.destid == 5;
+        return item.destseqno == 5;
       });
       // 对勾
       this.rightRoll = true;
@@ -518,7 +521,7 @@ export default {
      */
     changeRightRH() {
       this.tableData = this.sourceTableData.filter(item => {
-        return item.destid == 4;
+        return item.destseqno == 4;
       });
       // 对勾
       this.rightRoll = true;
@@ -555,7 +558,7 @@ export default {
      */
     changeRightRZ() {
       this.tableData = this.sourceTableData.filter(item => {
-        return item.destid == 3;
+        return item.destseqno == 3;
       });
       // 对勾
       this.rightRoll = true;
@@ -592,7 +595,7 @@ export default {
      */
     changeRightRS() {
       this.tableData = this.sourceTableData.filter(item => {
-        return item.destid == 2;
+        return item.destseqno == 2;
       });
       // 对勾
       this.rightRoll = true;
@@ -629,7 +632,7 @@ export default {
      */
     changeRightRM() {
       this.tableData = this.sourceTableData.filter(item => {
-        return item.destid == 1;
+        return item.destseqno == 1;
       });
       // 对勾
       this.rightRoll = true;
@@ -666,7 +669,7 @@ export default {
      */
     changeLeftPX() {
       this.tableData = this.sourceTableData.filter(item => {
-        return item.destid == 20;
+        return item.destseqno == 20;
       });
       // 对勾
       this.rightRoll = false;
@@ -703,7 +706,7 @@ export default {
      */
     changeLeftPH() {
       this.tableData = this.sourceTableData.filter(item => {
-        return item.destid == 19;
+        return item.destseqno == 19;
       });
       // 对勾
       this.rightRoll = false;
@@ -740,7 +743,7 @@ export default {
      */
     changeLeftPZ() {
       this.tableData = this.sourceTableData.filter(item => {
-        return item.destid == 18;
+        return item.destseqno == 18;
       });
       // 对勾
       this.rightRoll = false;
@@ -777,7 +780,7 @@ export default {
      */
     changeLeftPS() {
       this.tableData = this.sourceTableData.filter(item => {
-        return item.destid == 17;
+        return item.destseqno == 17;
       });
       // 对勾
       this.rightRoll = false;
@@ -814,7 +817,7 @@ export default {
      */
     changeLeftPM() {
       this.tableData = this.sourceTableData.filter(item => {
-        return item.destid == 16;
+        return item.destseqno == 16;
       });
       // 对勾
       this.rightRoll = false;
@@ -851,7 +854,7 @@ export default {
      */
     changeLeftRX() {
       this.tableData = this.sourceTableData.filter(item => {
-        return item.destid == 10;
+        return item.destseqno == 10;
       });
       // 对勾
       this.rightRoll = false;
@@ -888,7 +891,7 @@ export default {
      */
     changeLeftRH() {
       this.tableData = this.sourceTableData.filter(item => {
-        return item.destid == 9;
+        return item.destseqno == 9;
       });
       // 对勾
       this.rightRoll = false;
@@ -925,7 +928,7 @@ export default {
      */
     changeLeftRZ() {
       this.tableData = this.sourceTableData.filter(item => {
-        return item.destid == 8;
+        return item.destseqno == 8;
       });
       // 对勾
       this.rightRoll = false;
@@ -962,7 +965,7 @@ export default {
      */
     changeLeftRS() {
       this.tableData = this.sourceTableData.filter(item => {
-        return item.destid == 7;
+        return item.destseqno == 7;
       });
       // 对勾
       this.rightRoll = false;
@@ -999,7 +1002,7 @@ export default {
      */
     changeLeftRM() {
       this.tableData = this.sourceTableData.filter(item => {
-        return item.destid == 6;
+        return item.destseqno == 6;
       });
       // 对勾
       this.rightRoll = false;
@@ -1076,10 +1079,10 @@ export default {
         // 存储目标条码号
         sessionStorage.setItem("destbarcode", val.destbarcode);
         // 存储目的数据序号
-        sessionStorage.setItem("destseqno", val.destid);
+        sessionStorage.setItem("destseqno", val.destseqno);
         // this.$axios.get(`/api/api/org/plainByBarcode/R1100002487002018050034/1/`)
         this.$axios
-          .get(`/api/org/plainByBarcode/${val.destbarcode}/${val.destid}/`)
+          .get(`/api/org/plainByBarcode/${val.destbarcode}/${val.destseqno}/`)
           .then(response => {
             console.log(response);
             self.$bus.emit("changImageEditTarget", response.data.ret.image);
@@ -1206,9 +1209,7 @@ const candidates = [
   .selectFinger {
     z-index: 10;
     position: absolute;
-    // top: 187px;
-    // right: 60px;
-    top: 220px;
+    top: 178px;
     right: 60px;
     width: 236px;
     height: 194px;

vue.config.js

 /*
  * @Author: your name
  * @Date: 2021-09-07 09:57:48
- * @LastEditTime: 2021-09-28 18:48:48
+ * @LastEditTime: 2021-10-09 14:00:02
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \指纹系统\founder_vue\vue.config.js
@@ -74,6 +74,7 @@ module.exports = {
   },
   productionSourceMap: false, //关闭生产映射
   devServer: {
+    port: 8081,
     overlay: {
       warnings: false,
       errors: false