Merge remote-tracking branch 'origin/master'

k94314517

2024-12-25 372871c9d42968a9caf69ca9a4e392f2d3eee865

 screen/src/views/TaskEfficiency.vue

@@ -65,7 +65,7 @@
            <div class="list one-swiper">
              <div class="swiper-wrapper">
                <div class="line one-swiper-slide swiper-slide" v-for="item, i in dataList2" :key="i">
                  <div class="top"><span v-if="i < 3">top</span>{{ i + 1 }}</div>
                  <div class="top" :class="{top3: i < 3}"><span v-if="i < 3">top</span>{{ i + 1 }}</div>
                  <div class="id_card">{{ item.platformName }}</div>
                  <div class="wrap">
                    <ChargeRate :rate="item.rate" />
@@ -163,7 +163,7 @@
                <div class="val">{{ workModalParam.finishTimeStr }}</div>
              </div>
            </div>
            <div class="modal_bg" v-if="showWorkModal" @click="showWorkModal = false"></div>
            <div class="modal_bg" v-if="showWorkModal" @click="closeModal"></div>
          </div>
          <div class="center_box_two">
            <div v-if="data4.videoIndexCodes && data4.videoIndexCodes.length > 0" class="videos">
@@ -342,6 +342,18 @@
        label: {
          show: false,
          position: 'center'
        },
        tooltip: {
          trigger: 'none'
        },
        emphasis: {
          // 设置悬浮时样式为空
          scale: false, // 关闭放大效果
          itemStyle: {
            shadowBlur: 0, // 阴影模糊度为 0
            shadowOffsetX: 0,
            shadowColor: 'rgba(0, 0, 0, 0)',
          },
        },
        padAngle: 2,
        itemStyle: {
@@ -755,7 +767,6 @@
      i.finishTime = dayjs(i.finishTime).format('HH:mm')
      return i
    })
    console.log('dataList5', dataList5.value)

  })
}
@@ -801,7 +812,15 @@
const platformClick = (val) => {
  const index = pointList.findIndex(i => i.name == val.platformName)
  workModalParam.value = { ...val, ...pointList[index], index: pointList }
  if(workModalParam.value.workTime){
    workModalParam.value.workTime = workModalParam.value.workTime.replaceAll('m', '分钟')
    workModalParam.value.workTime = workModalParam.value.workTime.replaceAll('h', '小时')
  }
  showWorkModal.value = true
}
const closeModal = () => {
  showWorkModal.value = false
  workModalParam.value = {}
}
const loopFn2 = () => {
  var newSwiper1 = new Swiper('.one-swiper', {
@@ -1002,7 +1021,9 @@
            box-shadow: inset 0px 0px 3px 0px #01D9FE;
            margin-right: 10px;
          }

          .top3{
            box-shadow: inset 0px 0px 3px 0px #FEAF01;
          }
          .one-swiper-slide {
            height: 40px !important;
          }
@@ -1131,7 +1152,7 @@
        padding: 22px 20px;
        left: 850px;
        top: 60px;

        z-index: 99999999;
        .head {
          display: flex;
          justify-content: space-between;