eee

src/assets/css/el-table-style.css

@@ -56,3 +56,29 @@ width: 100%;
     color: #333333;
     line-height: 16px;
 }
+
+.tt_candidate_table{
+    width:100%
+}
+/* 修改表头内容 */
+.tt_candidate_table .el-table__header-wrapper th {
+    width: 340px;
+    height: 32px;
+    background: #F6F8FA;/*width: 352px;*/
+    font-size: 14px;color: #282F3C;
+    line-height: 22px;
+}
+/* 修改表格里内容 */
+.tt_candidate_table .el-table__body-wrapper tr td {
+    width: 340px;
+    height: 24px;
+    background: #FFFFFF;
+    font-size: 12px;
+    font-family: MicrosoftYaHei;
+    color: #333333;
+    line-height: 16px;
+}
+/* 选中的颜色 */
+.tt_candidate_table tbody tr.current-row > td {
+    background: #F5F5F7;
+}
\ No newline at end of file

src/views/cxyrd/QueryConfirm.vue

@@ -668,30 +668,46 @@ export default {
     hadnlExpandChange(row, expanded) {
       // 获取下标
       var i = this.list.findIndex(table => table.queryId === row.queryId);
+      // var i = this.tableData.findIndex(table => table.id === row.id);
+      console.log(i);
       if (expanded) {
+        console.info("展开时row数据", this.list[i]);
+        this.list[i] = {
+          qid: row.qid,
+          children: row.children,
+          queryId: row.queryId
+        };
+        this.$forceUpdate();
+        // this.$set(this.tableData[i], "barcode", "");
         // 保证临时变量中存在下标属性，方便后续折叠时取值
-        row.index = i;
+        //row.index = i;
         // // push到临时数组中
         // this.arr.push(row);
         // 清空表格数据
-        var obj = {
+        // var obj = {
+        //   qid: row.qid,
+        //   children: row.children,
+        //   queryId: row.queryId
+        // };
+        // this.list[i] = obj;
+      } else {
+        console.info("折叠时row数据", this.list[i]);
+        this.list[i] = {
           qid: row.qid,
           children: row.children,
-          queryId: row.queryId
+          queryId: row.queryId,
+          barcode: row.children[0].barcode,
+          maxcandidatecnt: row.children[0].maxcandidatecnt,
+          querytype: row.children[0].querytype,
+          queryStateName: row.children[0].queryStateName,
+          hitpossibility: row.children[0].hitpossibility,
+          queryclass: row.children[0].queryclass,
+          affirmtime: row.children[0].affirmtime,
+          requestdatetime: row.children[0].requestdatetime,
+          userdesc: row.children[0].userdesc
         };
-        this.list[i] = obj;
-      } else {
-        console.info("折叠时row数据", row);
-        var rowObj = row.children[0];
-        rowObj.children = row.children;
-        // this.$set(rowObj, "children", row.children);
-        // // 根据下标取临时变量
-        // var rowObj = this.arr.find(row => row.index === i);
-        // 赋值
-        console.info("折叠时rowObj数据", rowObj);
-        this.list[i] = rowObj;
-        this.$set(this.list[i], 'hasChildren', true)
-        console.log(this.list[i]);
+        this.$forceUpdate();
+        console.info("塞完数据的row", this.list[i]);
       }
     },
     // table表格选中获取数据

src/views/cxyrd/TT.vue

@@ -6,6 +6,7 @@
         <div class="bz-btn" @click="Bz">比中</div>
         <div class="rd-btn" @click="Rdwc">认定完成</div>
       </div>
+      e
     </div>
     <div class="tt_main">
       <div class="tt_main_top">
@@ -19,7 +20,7 @@
           <el-table
             highlight-current-row
             :data="tableData"
-            class="lt_candidate_table"
+            class="tt_candidate_table"
             height="150"
             @current-change="handleCurrentChange"
           >
@@ -187,8 +188,9 @@ export default {
       }
     },
     handleCurrentChange(val) {
-      console.info(val);
       this.destbarcode = val.destbarcode;
+      console.info(this.destbarcode);
+      this.$bus.emit("ccbarcode", this.destbarcode);
     },
     //比中
     Bz() {

src/views/cxyrd/modules/TTFingerPrint.vue

@@ -168,14 +168,7 @@
 <script>
 export default {
   name: "TTFingerPrint",
-  props: ["destBarcodeData"],
-  watch: {
-    destBarcodeData(val) {
-      if (val) {
-        this.destbarcode = val;
-      }
-    }
-  },
+
   data() {
     return {
       activeIndex: "1",
@@ -235,6 +228,8 @@ export default {
         { name: "环", code: 14, img: null },
         { name: "小", code: 15, img: null }
       ],
+      pageHeight: 0,
+      scrollFLag: true,
       qid: null,
       currentQqid: null,
       sourcebarcode: null,
@@ -316,11 +311,11 @@ export default {
         });
     },
     // 获取目标指纹图
-    getDestFingerPrintDetail() {
+    getDestFingerPrintDetail(barcode) {
       let self = this;
       // 滚动 目标数据
       this.$axios
-        .get("/api/org/rollByBarcode/" + this.destbarcode)
+        .get("/api/org/rollByBarcode/" + barcode)
         .then(function(response) {
           if (response.data.code === 0) {
             response.data.ret.forEach((element, index) => {
@@ -345,7 +340,7 @@ export default {
         });
       // 平面 目标
       this.$axios
-        .get("/api/org/plainByBarcode/" + this.destbarcode)
+        .get("/api/org/plainByBarcode/" + barcode)
         .then(function(response) {
           console.info("平面", response);
           if (response.data.code === 0) {
@@ -372,7 +367,10 @@ export default {
   },
   mounted() {
     this.getSourceFingerPrintDetail();
-    this.getDestFingerPrintDetail();
+    this.$bus.on("ccbarcode", code => {
+      console.log(code);
+      this.getDestFingerPrintDetail(code);
+    });
   }
 };
 </script>