Merge remote-tracking branch 'origin/master'

jiangping

2024-12-20 53b6400ec10c8ca61ccec91c82c358d2488eead8

 screen/src/views/SecurityControl.vue

@@ -19,7 +19,7 @@
                <img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
                <div>实时园区车辆</div>
              </div>
              <img src="@/assets/images/title@2x.png" class="bg" alt="" />
              <img src="@/assets/images/task/title@2x.png" class="bg" alt="" />
            </div>
            <div class="second_title">
              <div class="title">
@@ -108,10 +108,11 @@
          </div>
        </div>
        <div class="center_box">
          <div v-if="showJk" class="jiankong">
          <div v-show="showJk" class="jiankong">
            <img class="jk_bg" src="@/assets/images/SecurityControl/jiankong_bg@2x.png" alt="">
            <div class="content">
              <video :src="activeVideo" class="video"></video>
              <Video v-if="showJk && activeMenu && activeMenu.indexCode" :href="data.videoPluginUrl" :indexCode="activeMenu.indexCode" />
              <!-- <div class="player_bg" style="width: 100%;height: 100%;" id="playWnd"> </div> -->
            </div>
            <div class="right_wrap">
              <div class="menus">
@@ -144,7 +145,7 @@
            </div>

          </div>
          <div v-else class="center_box_one">
          <div v-show="!showJk" class="center_box_one">
            <div class="list">
              <div class="item">
                <div class="name_wrap">
@@ -196,7 +197,7 @@
                <img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
                <div>在园人员分析</div>
              </div>
              <img src="@/assets/images/title@2x.png" class="bg" alt="" />
              <img src="@/assets/images/task/title@2x.png" class="bg" alt="" />
            </div>
            <div class="second_title">
              <div class="title">
@@ -287,7 +288,7 @@
              <img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
              <div>当前车辆滞留预警</div>
            </div>
            <img src="@/assets/images/title@2x.png" class="bg" alt="" />
            <img src="@/assets/images/task/title@2x.png" class="bg" alt="" />
          </div>
          <div class="table">
            <div class="line header">
@@ -322,7 +323,7 @@
              <div class="separate"></div>
              <div class="tab" :class="{ active: warningTab == '2' }" @click="tasClick('2')">行为告警</div>
            </div>
            <img src="@/assets/images/title@2x.png" class="bg" alt="" />
            <img src="@/assets/images/task/title@2x.png" class="bg" alt="" />
          </div>
          <div class="one_swiper_wrap">
            <div class="list one-swiper">
@@ -382,9 +383,9 @@
              <img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
              <div>园区安防设备</div>
            </div>
            <img src="@/assets/images/title@2x.png" class="bg" alt="" />
            <img src="@/assets/images/task/title@2x.png" class="bg" alt="" />
          </div>
          <div class="monitoring" @click="showJk = !showJk">
          <div class="monitoring" @click="changeMon">
            <img src="@/assets/images/SecurityControl/ic_jiankong@2x.png" class="icon" alt="">
            <div>监控列表</div>
            <img v-if="showJk" src="@/assets/images/SecurityControl/jiankong_ic_close@2x.png" class="top" alt="">
@@ -421,7 +422,7 @@
              </div>
              <div class="list two-swiper">
                <div class="swiper-wrapper">
                  <template v-for="item, i in dataList2">
                  <template v-for="item, i in dataList2.filter(i => i.total > 0)">
                    <div class="item two-swiper-slide swiper-slide">
                      <div class="line">
                        <div class="driver">{{ item.deviceType }}</div>
@@ -445,7 +446,7 @@
              <img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
              <div>今日访客滞留情况</div>
            </div>
            <img src="@/assets/images/title@2x.png" class="bg" alt="" />
            <img src="@/assets/images/task/title@2x.png" class="bg" alt="" />
          </div>
          <div class="table">
            <div class="line header">
@@ -476,7 +477,7 @@
</template>

<script setup>
import { ref, onMounted } from 'vue'
import { ref, onMounted, nextTick } from 'vue'
import VScaleScreen from 'v-scale-screen'
import Percent from '@/components/percent.vue'
import dayjs from 'dayjs'
@@ -485,6 +486,7 @@
import * as echarts from 'echarts'
import 'swiper/css/swiper.min.css'
import Swiper from 'swiper'
import Video from './videoUrl/Video.vue'
import {
  getEnergyCenterData,
  afgetCarmeraPreviemUrl,
@@ -507,8 +509,6 @@
  time.value = dayjs().format('HH:mm:ss')

}, 1000)



const arr = ['#68e2e3', '#50afd3', '#377cdb', '#d5ae3a']
const initEnergy = () => {
@@ -741,7 +741,7 @@
          show: true,
          position: 'outside',
          formatter: (params) => {
            const index = params.dataIndex;
            const index = params.dataIndex
            return `{color${index}|${params.data.name} ${params.data.rate}%}`
            // return `<div>${params.data.name}</div>`
          },
@@ -839,7 +839,7 @@
    data4.value = res.data || {}
    let obj = data4.value
    data4.value.total = obj.levelNum + obj.retentionNum + obj.registerVisitNum + obj.waitVisitNum
    const result = res.data.visitRetentionDataList || []
    const result = res.data?.visitRetentionDataList || []
    dataList3.value = result.map(i => {
      if (i.timeOutMinute) {
        i.timeOutMinute = Math.abs(i.timeOutMinute)
@@ -908,6 +908,13 @@
    data5.value = result.filter(item => item.carmeraList && item.carmeraList.length > 0)
  })
}
const changeMon = () => {
  showJk.value = !showJk.value
  if(!showJk.value){
    activeJkIndex.value = -1
    activeMenu.value = {}
  }
}
const menuClick = (val) => {
  if (val == activeJkIndex.value) {
    activeJkIndex.value = -1
@@ -917,11 +924,8 @@
}
const menuItemClick = (val) => {
  activeMenu.value = val
  afgetCarmeraPreviemUrl({ indexCode: val.indexCode }).then(res => {
    activeVideo.value = res.data
  })
}

}
const autoplayFlag = (list = [], leng = 4, time = 2000) => {
  if (list.length > leng) {
    return { delay: time, disableOnInteraction: false }
@@ -944,7 +948,7 @@
    initialSlide: 0,
    direction: 'vertical', //竖直方向
    slidesPerView: 3,
    autoplay: autoplayFlag(dataList2.value, 3, 4000),
    autoplay: autoplayFlag(dataList2.value.filter(i => i.total > 0), 3, 4000),
    observer: true, //修改swiper自己或子元素时，自动初始化swiper
  })
}
@@ -959,6 +963,7 @@
    observer: true, //修改swiper自己或子元素时，自动初始化swiper
  })
}




@@ -1013,6 +1018,8 @@
      margin-bottom: 20px;
      font-size: 14px;
      color: #D2E0FF;
      background: rgba(0, 86, 255, 0.05);
      backdrop-filter: blur(5px);

      .second_title {
        margin-top: 24px;
@@ -1361,6 +1368,8 @@

    .right_box_one {
      margin-bottom: 20px;
      background: rgba(0, 86, 255, 0.05);
      backdrop-filter: blur(5px);

      .second_title {
        margin-top: 20px;
@@ -1443,9 +1452,15 @@
      }
    }

    .right_box_two {}
    .right_box_two {
      background: rgba(0, 86, 255, 0.05);
      backdrop-filter: blur(5px);
    }

    .right_box_three {}
    .right_box_three {
      background: rgba(0, 86, 255, 0.05);
      backdrop-filter: blur(5px);
    }
  }
}

@@ -1571,6 +1586,8 @@
    .one_swiper_wrap {
      height: 140px;
      overflow: hidden;
      background: rgba(0, 86, 255, 0.05);
      backdrop-filter: blur(5px);
    }

    .list {
@@ -1659,6 +1676,8 @@
    flex: 1;
    margin-right: 20px;
    position: relative;
    background: rgba(0, 86, 255, 0.05);
    backdrop-filter: blur(5px);

    .content {
      display: flex;
@@ -1669,7 +1688,8 @@
        display: flex;
        justify-content: center;
        align-items: center;
        padding: 16px 24px;
        padding-top: 16px;
        padding-left: 24px;

        .echart_wrap {
          position: relative;
@@ -1705,7 +1725,7 @@
        }

        .list {
          margin-left: 36px;
          margin-left: 32px;
          flex: 1;
          display: flex;
          flex-direction: column;
@@ -1803,6 +1823,8 @@

  .visitor_warning {
    width: 360px;
    background: rgba(0, 86, 255, 0.05);
    backdrop-filter: blur(5px);

    .table {
      .list {
@@ -1838,13 +1860,6 @@
    align-items: center;
    font-weight: bold;
    font-size: 16px;
    background-image: -webkit-linear-gradient(top,
        #ffffff 0%,
        #c8ddff 66%,
        #85b4ff 72%,
        #74a9ff 100%);
    -webkit-background-clip: text;
    -webkit-text-fill-color: transparent;

    .icon {
      width: 16px;