1

src/views/advancedQuery/views/advancedHome.vue

@@ -500,7 +500,6 @@ export default {
   methods: {
     // 查询
     getSearchData(val) {
-      alert(111)
       this.form = {
         time: '',
         status: '',

src/views/baggageManagement/components/transferArrival/index.vue

@@ -44,7 +44,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="inboundCarrier" style="display:none">
+        <el-form-item prop="inboundCarrier">
           <el-cascader
             v-model="formData.inboundCarrier"
             style="width: 164px"
@@ -58,7 +58,7 @@
             @change="getTableData"
           />
         </el-form-item>
-        <el-form-item prop="outgoingAirline" style="display:none">
+        <el-form-item prop="outgoingAirline">
           <el-cascader
             v-model="formData.outgoingAirline"
             style="width: 164px"
@@ -389,6 +389,7 @@ export default {
       spanArr: [],
       contactDot: 0,
       flag: 0,
+      position: 0,
     };
   },
   created() {
@@ -505,12 +506,12 @@ export default {
       let arrs1 = [
         this.formData.inboundCarrier.length == 0
           ? ""
-          : this.formData.inboundCarrier[0]
+          : this.formData.inboundCarrier[0],
       ];
       let arrs2 = [
         this.formData.outgoingAirline.length == 0
           ? ""
-          : this.formData.outgoingAirline[0]
+          : this.formData.outgoingAirline[0],
       ];
       let arr = [
         this.formData.currentAirport,
@@ -539,6 +540,7 @@ export default {
           // ]);
           this.tableData = res.returnData;
           let contactDot = this.contactDot;
+          this.spanArr = []
           this.tableData.forEach((item, index) => {
             item.index = index;
             if (index === 0) {
@@ -671,15 +673,32 @@ export default {
             colspan: _col,
           };
         }
+
       }
+      // if (columnIndex === 0) {
+      //   if (rowIndex == 0) {
+      //     return [3, 1];
+      //   } else if (rowIndex >= 3) {
+      //     return [1, 2];
+      //   } else {
+      //     return [0, 0];
+      //   }
+      // } else if (columnIndex == 1) {
+      //   // 第二列的大于3行的清除，避免影响样式
+
+      //   if (rowIndex >= 3) {
+      //     return [0, 0];
+      //   }
+      // }
     },
   },
   mounted() {
-    // let that = this;
-    // this.loopEvent = setInterval(function () {
-    //   console.log(this.contactDot);
-    //   that.getTableData();
-    // }, 3000);
+    // this.arraySpanMethod();
+    let that = this;
+    this.loopEvent = setInterval(function () {
+      console.log(this.contactDot);
+      that.getTableData();
+    }, 3000);
   },
   beforeDestroy() {
     clearInterval(this.loopEvent);

src/views/baggageManagement/components/transferDeparture/index.vue

@@ -44,7 +44,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="inboundCarrier" style="display:none">
+        <el-form-item prop="inboundCarrier">
           <el-cascader
             v-model="formData.inboundCarrier"
             style="width: 164px"
@@ -58,7 +58,7 @@
             @change="getTableData"
           />
         </el-form-item>
-        <el-form-item prop="outgoingAirline" style="display:none">
+        <el-form-item prop="outgoingAirline">
           <el-cascader
             v-model="formData.outgoingAirline"
             style="width: 164px"
@@ -546,6 +546,7 @@ export default {
         if (res.code == 0) {
           this.tableData = res.returnData;
           let contactDot = this.contactDot;
+          this.spanArr = []
           this.tableData.forEach((item, index) => {
             item.index = index;
             if (index === 0) {
@@ -663,7 +664,7 @@ export default {
       }
     },
     arraySpanMethod({ row, column, rowIndex, columnIndex }) {
-      for (let i = 0; i < 5; i++) {
+      for (let i = 0; i < 7; i++) {
         if (columnIndex === i) {
           const _row = this.spanArr[rowIndex];
           const _col = _row > 0 ? 1 : 0;
@@ -676,10 +677,10 @@ export default {
     },
   },
   mounted() {
-    // let that = this;
-    // this.loopEvent = setInterval(function () {
-    //   that.getTableData();
-    // }, 3000);
+    let that = this;
+    this.loopEvent = setInterval(function () {
+      that.getTableData();
+    }, 3000);
   },
   beforeDestroy() {
     clearInterval(this.loopEvent);