Merge remote-tracking branch 'origin/master'

jiangping

2024-10-28 6bd673610b45c8b7af056d296dde17585c886586

 pda/pages/index/center.vue

@@ -50,7 +50,7 @@
               <text class="label">总运输量</text>

               <text class="value">{{ item.totalNum }}万支</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>

@@ -115,7 +115,7 @@
                        <text class="label">总运输量</text>

                        <text class="value">{{ item.totalNum }}万支</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,7 +245,8 @@
            callType: 1,



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

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

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

            wmsInfo: {},
            timer: null

         }

@@ -256,7 +257,20 @@
         //    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,

@@ -270,7 +284,7 @@
                     this.getPlatformTask()
                     this.timer = setInterval(() => {   
                        this.getPlatformTask()
                     }, 60 * 1000)

                     }, 120 * 1000)

                  }

               }

            })

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

                  this.circulInitTaskList()

               }, 1000)

            }, () => {
            })

         },

         circulInitTaskList() {

@@ -302,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秒')

                     }

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

            } = this

            this.transformId = item.id

            this.transformPlatId = activePlatform.id

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

            this.showTransform = true

         },

         handleErr(item) {