Merge remote-tracking branch 'origin/master'

jiangping

2024-12-16 214e6fe7a754ddf4900e07033a2fda6200f4d7a1

 admin/src/views/platform/index.vue

@@ -80,7 +80,7 @@
              </div> -->
              <div class="ite" style="width: 40%">
                <span>总运输量：</span>
                <span>{{ task.totalNum }}万支</span>
                <span>{{ task.totalNum || task.ioQty }}万支</span>
              </div>
              <div v-if="task.billCode" class="ite" style="width: 60%">
                <span>运输公司：</span>
@@ -313,7 +313,7 @@
              if (item.newStartDate) {
                const 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秒')
                }