Merge remote-tracking branch 'origin/master'

jiangping

2024-12-11 eb49564ab17c6695d8928d5a63a57c58b3cfd79c

 pda/pages/index/center.vue

@@ -32,9 +32,9 @@
               <view class="status" v-if="item.status == 4">叫号中 {{ item.callDateTemp }}</view>

               <view class="status scs" v-if="item.status == 5">已作业 {{ item.startDateTemp }}</view>

            </view>

            <view class="line" v-if="item.code">

            <view class="line" v-if="item.billCode">

               <text class="label">运输单号</text>

               <text class="value">{{ item.code }}</text>

               <text class="value">{{ item.billCode }}</text>

               <text class="primaryColor" @click="handleDetail(item)">运单详情</text>

            </view>

            <view class="line" v-else>

@@ -48,9 +48,9 @@
            </view>

            <view class="line">

               <text class="label">总运输量</text>

               <text class="value">{{ item.totalNum }}万支</text>

               <text class="value">{{ item.totalNum || item.ioQty}}万支</text>

            </view>

            <view class="line" v-if="item.type != 4">

            <view class="line" v-if="item.carrierName">

               <text class="label">运输公司</text>

               <text class="value">{{ item.carrierName }}</text>

            </view>

@@ -113,9 +113,9 @@
                     </view>

                     <view class="line">

                        <text class="label">总运输量</text>

                        <text class="value">{{ item.totalNum }}万支</text>

                        <text class="value">{{ item.totalNum || item.ioQty }}万支</text>

                     </view>

                     <view class="line" v-if="item.type != 4">

                     <view class="line" v-if="item.carrierName">

                        <text class="label">运输公司</text>

                        <text class="value">{{ item.carrierName }}</text>

                     </view>

@@ -182,9 +182,9 @@
         <view class="TransformModal">

            <view class="title">转移月台</view>

            <view class="transform_list">

               <view class="line" @click="transformPlatClick(item)" v-for="item in activePlatformGroup.platformList"

               <view class="line" @click="transformPlatClick(item)" v-for="item in TransferList"

                  :key="item.id">

                  <view class="name">{{ item.name }}</view>

                  <view class="name">{{ item.name  || item.platformName}}</view>

                  <view class="status" :class="{ green: item.workStatus == 1 }">({{ item.workStatus == 0 ? "空闲" : "作业中" }})

                  </view>

                  <image v-if="transformPlatId == item.id" src="@/static/ic_select@2x.png" class="checked" />

@@ -245,28 +245,46 @@
            callType: 1,



            transformPlatId: '', // 转移记录月台id

            transformId: '', // 转移记录任务id

            wmsInfo: {}

            transformId: '', // 转移记录任务id
            TransferList: [],

            wmsInfo: {},
            timer: null

         }

      },

      onLoad() {

         this.getPlatformGroup()

         setInterval(() => {

            this.getPlatformGroup()

         }, 1000 * 30)

         // setInterval(() => {

         //    this.getPlatformGroup()

         // }, 1000 * 30)

      },

      methods: {

      methods: {
         getTransferList() {
            getPlatformGroupList({
               queryData: 1,
               queryType: 1
            }).then(res => {
               const platformGroupList = res.data || []
               if (platformGroupList.length > 0) {
                  const { activePlatformGroup } = this
                  const temp = platformGroupList.find(i => i.id === activePlatformGroup.id)
                  this.TransferList = temp.platformList || []
               }
            })
         },

         getPlatformGroup() {

            getPlatformGroupList({

               queryData: 1,

               queryType: 0

               queryType: 1

            }).then(res => {

               this.platformGroupList = res.data || []

               if (this.platformGroupList.length > 0) {

                  this.activePlatformGroup = this.platformGroupList[0]

                  if (this.activePlatformGroup.platformList && this.activePlatformGroup.platformList.length > 0) {

                     this.activePlatform = this.activePlatformGroup.platformList[0]

                     this.getPlatformTask()

                     this.activePlatform = this.activePlatformGroup.platformList[0]
                     this.getPlatformTask()
                     this.timer = setInterval(() => {	
                        this.getPlatformTask()
                     }, 120 * 1000)

                  }

               }

            })

@@ -280,6 +298,7 @@
               setInterval(() => {

                  this.circulInitTaskList()

               }, 1000)

            }, () => {
            })

         },

         circulInitTaskList() {

@@ -298,7 +317,7 @@
                  if (item.newStartDate) {

                     let timeNum = time.getTime() - new Date(item.newStartDate).getTime()

                     if (timeNum > 3600000) {

                        item.startDateTemp = dayjs.duration(timeNum).format('H小时m分ss秒')

                        item.startDateTemp = dayjs.duration(timeNum).format('H小时m分s秒')

                     } else {

                        item.startDateTemp = dayjs.duration(timeNum).format('m分s秒')

                     }

@@ -311,8 +330,12 @@
            const index = e.indexs[0]

            this.activePlatformGroup = this.platformGroupList[index]

            if (this.activePlatformGroup.platformList && this.activePlatformGroup.platformList.length > 0) {

               this.activePlatform = this.activePlatformGroup.platformList[0]

               this.getPlatformTask()

               this.activePlatform = this.activePlatformGroup.platformList[0]
               this.getPlatformTask()
               clearInterval(this.timer)
               this.timer = setInterval(() => {
                  this.getPlatformTask()
               }, 60 * 1000)

            }

            this.showPlatformgroup = false

         },

@@ -462,7 +485,8 @@
               activePlatform

            } = this

            this.transformId = item.id

            this.transformPlatId = activePlatform.id

            this.transformPlatId = activePlatform.id
            this.getTransferList()

            this.showTransform = true

         },

         handleErr(item) {

@@ -501,19 +525,20 @@
            flex-wrap: wrap;



            .item {

               width: 210rpx;

               height: 80rpx;

               display: flex;

               justify-content: center;

               align-items: center;

               width: 220rpx;

               height: 80rpx;
               line-height: 80rpx;
               text-align: center;

               background: #ffffff;

               border-radius: 8rpx;

               border: 1rpx solid #999999;

               font-size: 30rpx;

               color: #222222;

               margin-bottom: 20rpx;

               margin-right: 30rpx;



               margin-bottom: 15rpx;

               margin-right: 15rpx;

               white-space: nowrap;
               overflow: hidden;
               text-overflow: ellipsis;

               &:nth-of-type(3n) {

                  margin-right: 0;

               }