zhaoke il y a 2 ans
Parent
commit
5a261f3abc

+ 8 - 8
src/views/newBagDetails/components/baggageView.vue

@@ -13,13 +13,13 @@
               </div>
               <div class="baggage-track-chart">
                 <div class="step-line">
-                  <div v-for="(line, index) in 6" :key="index" :class="['step-line-segment', { 'step-line-active': activeStepLine(index) }]" />
+                  <div v-for="(line, index) in 6" :key="index" :class="['step-line-segment', { 'step-line-active': activeStepLine(index) }]"></div>
                 </div>
-                <div v-for="(p, index) in item.bagStatus" :key="index" :class="{ 'step-item': true, 'active-item': item.currentResult }">
+                <div v-for="(p, index) in item.bagStatus" :key="index" :class="{ 'step-item': true, 'active-item': p.timeValue }">
                   <div class="step-circle">
                     <span class="step-name">{{ p.nodeName }}</span>
                   </div>
-                  <div v-if="item.currentResult" class="step-info">
+                  <div v-if="p.timeValue" class="step-info">
                     <!-- <div :class="statusClasses(item.currentResult)">{{ item.currentResult }}</div> -->
                     <span class="step-time">{{ p.timeValue }}</span>
                     <!-- <div class="step-location">{{ item.locationId }}</div> -->
@@ -107,7 +107,11 @@ export default {
   computed: {
     activeStepLine () {
       return function (index) {
-        return this.stepNodes[index].currentResult && this.stepNodes[index + 1].currentResult
+        if ((this.tableData[index] && this.tableData[index].bagStatus) && (this.tableData[index + 1] && this.tableData[index + 1].bagStatus)) {
+          return this.tableData[index].bagStatus[index].timeValue && this.tableData[index + 1].bagStatus[index + 1].timeValue
+        } else {
+          return false
+        }
       }
     },
     statusClasses () {
@@ -140,10 +144,6 @@ export default {
   methods: {
     //获取行李信息
     async getLuggageList (id, dataContent = this.dataContent, page, pageSize) {
-      function isSameStep (code1, code2) {
-        const sameStepCodes = ['ARRIVED', 'TRANSFER']
-        return sameStepCodes.includes(code1) && sameStepCodes.includes(code2)
-      }
       try {
         this.loading = true
         const { code, returnData } = await this.getQueryList(id, dataContent, page, pageSize)

+ 0 - 1
src/views/newQuery/components/search.vue

@@ -261,7 +261,6 @@ export default {
     if (colDatas && colDatas.length) {
       const columns = colDatas.filter(item => item.is_search == 1)
       const datas = columns.sort((a, b) => b.orderNumber - a.orderNumber)
-      console.log(datas)
       this.getColumnSet(datas)
     }
   },