Merge remote-tracking branch 'origin/master'

rk

2025-09-24 f3c59a17062fb0a89b5f89b7845341386952a6b1

 screen/src/views/SecurityControl.vue

@@ -5,7 +5,7 @@
      <img src="@/assets/images/ic_compass@2x.png" class="main_znz" alt="" />
      <div class="main_header">
        <img src="@/assets/images/maintitle.gif" class="main_header_bg" alt="" />
        <div class="title">安泰智慧物流园区-智能安防监测</div>
        <div class="title">安泰智慧物流园区-智能安防管控</div>
        <div class="time_wrap">
          <span class="date">{{ date }}</span>
          <span class="week">{{ week }}</span>
@@ -99,7 +99,7 @@
                      <div class="safe_left_dian" :style="{ backgroundColor: item.color }"></div>
                      <div class="safe_left_name">{{item.name}}</div>
                    </div>
                    <div class="safe_num" :style="{ color: item.color }">{{item.total}}</div>
                    <div class="safe_num" :style="{ color: item.color }">{{item.value}}</div>
                  </div>
<!--                  <div class="safe_chat_info_row">-->
<!--                    <div class="safe_left">-->
@@ -130,10 +130,10 @@
                  <div class="safe_zhu_item_c">
                    <div class="safe_zhu_item_c_t">
                      <span>总车位：{{data.outHyLotTotal || 0}}</span>
                      <span>剩余车位：{{data.relatedJobCarTotal || 0}}</span>
                      <span>剩余车位：{{data.outHyLotTotal - data.relatedJobCarTotal || 0}}</span>
                    </div>
                    <div class="safe_zhu_item_c_b">
                      <div class="safe_zhu_item_c_b_z" :style="{width: (data.relatedJobCarTotal / data.outHyLotTotal * 100) +'%'}"></div>
                      <div class="safe_zhu_item_c_b_z" :style="{width: ((data.outHyLotTotal - data.relatedJobCarTotal) / data.outHyLotTotal * 100) +'%'}"></div>
                    </div>
                  </div>
                </div>
@@ -312,7 +312,7 @@
              <div class="com_header">
                <div class="title">
                  <img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
                  <div>隐患随手拍</div>
                  <div>本月隐患随手拍</div>
                </div>
                <img src="@/assets/images/task/title@2x.png" class="bg" alt="" />
              </div>
@@ -816,6 +816,7 @@
  CarList.value = []
  getEnergyCenterData().then(res => {
    if (res.code == 200) {
      totalCar.value = 0
      const result = res.data
      data.value = result
      res.data.inParkCarList.forEach(item => {
@@ -829,7 +830,7 @@
        } else if (item.name === '货运车辆') {
          CarList.value.push({ name: '货运车辆', value: item.total, color: '#01ABFE' })
        } else if (item.name === '未知车辆') {
          CarList.value.push({ name: '未知车辆', value: item.total, color: '#0028ff' })
          CarList.value.push({ name: '未知车辆', value: item.total, color: '#cccccc' })
        }
      })
      nextTick(() => {