Merge remote-tracking branch 'origin/master'

jiangping

2024-12-11 eb49564ab17c6695d8928d5a63a57c58b3cfd79c

 pda/pages/index/center.vue

@@ -48,7 +48,7 @@
            </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.carrierName">

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

@@ -113,7 +113,7 @@
                     </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.carrierName">

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

@@ -184,7 +184,7 @@
            <view class="transform_list">

               <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" />

@@ -259,12 +259,15 @@
      },

      methods: {
         getTransferList() {
            getPlatformWorkData({
               platformId: this.activePlatform.id
            getPlatformGroupList({
               queryData: 1,
               queryType: 1
            }).then(res => {
               console.log('res.data', res.data);
               if(res.data && res.data.platformJobList){
                  this.TransferList = res.data.platformJobList
               const platformGroupList = res.data || []
               if (platformGroupList.length > 0) {
                  const { activePlatformGroup } = this
                  const temp = platformGroupList.find(i => i.id === activePlatformGroup.id)
                  this.TransferList = temp.platformList || []
               }
            })
         },

@@ -281,24 +284,21 @@
                     this.getPlatformTask()
                     this.timer = setInterval(() => {   
                        this.getPlatformTask()
                     }, 60 * 1000)

                     }, 120 * 1000)

                  }

               }

            })

         },

         getPlatformTask() {
            uni.showLoading({title:"加载中..."})

         getPlatformTask() {

            getPlatformWorkData({

               platformId: this.activePlatform.id

            }).then(res => {
               uni.hideLoading()

            }).then(res => {

               this.platformTaskInfo = res.data

               this.circulInitTaskList()

               setInterval(() => {

                  this.circulInitTaskList()

               }, 1000)

            }, () => {
               uni.hideLoading()
            })

         },

         circulInitTaskList() {

@@ -525,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;

               }