门口门禁-摄像头页面的名称显示问题以及进出记录管理完善

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">

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'