From 82ca607e7851314fb59fdd372743fccc912cd40b Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Wed, 5 Jun 2024 16:05:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81-=E6=91=84?=
 =?UTF-8?q?=E5=83=8F=E5=A4=B4=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BB=A5=E5=8F=8A=E8=BF=9B?=
 =?UTF-8?q?=E5=87=BA=E8=AE=B0=E5=BD=95=E7=AE=A1=E7=90=86=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gatebaseinfo/components/camera.vue          | 17 ++++++++++++++---
 .../gaterecord/components/list.vue              |  2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/views/gatemachine/primarygatemanager/gatebaseinfo/components/camera.vue b/src/views/gatemachine/primarygatemanager/gatebaseinfo/components/camera.vue
index 49867af..171eb7f 100644
--- a/src/views/gatemachine/primarygatemanager/gatebaseinfo/components/camera.vue
+++ b/src/views/gatemachine/primarygatemanager/gatebaseinfo/components/camera.vue
@@ -49,9 +49,19 @@
         width="55"
         align="center"/>
       <el-table-column type="index" label="序号" width="50" align="center" />
-      <el-table-column prop="VIDEONAME" label="视频名称" />
+      <el-table-column prop="VIDEONAME" label="视频名称" >
+        <template slot-scope="{row}">
+          <span v-if="row.VIDEONAME">{{row.VIDEONAME}}</span>
+          <span v-else>{{row.NAME}}</span>
+        </template>
+      </el-table-column>
       <!--      <el-table-column prop="CODE" label="视频编码" />-->
-      <el-table-column prop="VIDEOURL" label="播放地址" />
+      <el-table-column prop="VIDEOURL" label="播放地址" >
+        <template slot-scope="{row}">
+          <span v-if="row.VIDEOURL">{{row.VIDEOURL}}</span>
+          <span v-else>{{row.REGIONPATH}}</span>
+        </template>
+      </el-table-column>
       <el-table-column prop="POSITION" label="状态" width="100">
         <template slot-scope="{row}">
           <span v-if="row.LATITUDE && row.LONGITUDE">已定位</span>
@@ -60,7 +70,8 @@
       </el-table-column>
       <el-table-column prop="ONLINE_STATUS" label="是否在线" width="100">
         <template slot-scope="{row}">
-          <span>{{ row.ONLINE_STATUS }}</span>
+          <span v-if="row.ONLINE_STATUS">{{ row.ONLINE_STATUS }}</span>
+          <span v-else>/</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="left" width="500">
diff --git a/src/views/gatemachine/primarygatemanager/gaterecord/components/list.vue b/src/views/gatemachine/primarygatemanager/gaterecord/components/list.vue
index 8e00242..0fce22e 100644
--- a/src/views/gatemachine/primarygatemanager/gaterecord/components/list.vue
+++ b/src/views/gatemachine/primarygatemanager/gaterecord/components/list.vue
@@ -72,7 +72,7 @@ export default {
             return 'background-color: yellow;color: black'
             break
           case '新能源':
-            return 'background-color: green;color: black'
+            return 'background-color: green;color: white'
             break
           case '白牌':
             return 'background-color: gray;color: black'