Merge remote-tracking branch 'origin/master'

k94314517

2025-03-26 12769ff64ea1f52d6a0a45f53b6acd336fe234fc

 screen/src/views/PlatformCall.vue

@@ -24,6 +24,13 @@
      contentList.value = res.data.allList.map(item => {
        if (item.optTime) {
          item.optTimeTemp = dayjs(item.optTime).format('HH:mm')
          if(item.status == 4){
            if(item.optTime >= new Date().getTime()){
              item.optTimeTemp = dayjs.duration(item.optTime - new Date().getTime()).format('HH:mm')
            }else{
              item.optTimeTemp = '-'
            }
          }
          // item.optTimeTemp = dayjs.duration(Math.abs(new Date().getTime() - item.optTime)).format('HH:mm')
        }
        return item
@@ -185,7 +192,7 @@

</script>
<template>
  <v-scale-screen width="1920" height="1080" :fullScreen="true">
  <v-scale-screen width="1920" height="1080">
    <div class="main_app">
      <div class="main_header">
        <img class="bg" src="@/assets/images/call/title@2x.png" alt="">
@@ -219,7 +226,9 @@
            </div>
            <div class="item">{{ item.platformName || '-' }}</div>
            <div class="item">
              <div v-if="item.optTimeTemp" class="time_place">预计完成时间</div>
              <div v-if="item.optTimeTemp" class="time_place">
                {{ item.status == 4 ? '剩余等待时间' : '预计完成时间' }}
              </div>
              <div>{{ item.optTimeTemp || '-' }}</div>
            </div>
          </div>