From 3962f2ac4c82253c913f60ea560a80370acffd46 Mon Sep 17 00:00:00 2001
From: songwenxuan <1924103812@qq.com>
Date: Sat, 30 Mar 2024 08:43:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=86=85=E7=BD=91=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E5=87=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/aibox/aiboxApply/components/videoList.vue | 2 +-
 src/views/aibox/aiboxVideo/components/videoList.vue | 1 -
 src/views/alarm/alarmInfomation/components/list.vue | 2 +-
 src/views/alarm/alarmVideo/components/list.vue      | 2 +-
 src/views/map/dialog/alarmDevice.vue                | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/views/aibox/aiboxApply/components/videoList.vue b/src/views/aibox/aiboxApply/components/videoList.vue
index 70cf61c..7ed6594 100644
--- a/src/views/aibox/aiboxApply/components/videoList.vue
+++ b/src/views/aibox/aiboxApply/components/videoList.vue
@@ -110,7 +110,7 @@
               :value="item.value"
             />
           </el-select>
-          <el-button v-if="addForm.info.ALGO_LIMIT > addForm.info.ALGORITHM.length" type="primary" style="width: 60% ; height: 30px ;" @click="addCollateral">增加算法</el-button>
+          <el-button v-if="addForm.info.ALGO_LIMIT > addForm.info.ALGORITHM.length" type="primary" style="width: 80% ; height: 35px ;" @click="addCollateral">增加算法</el-button>
         </el-form-item>
 
         <el-col v-for="(item, index) in addForm.info.ALGORITHM" :key="item.id">
diff --git a/src/views/aibox/aiboxVideo/components/videoList.vue b/src/views/aibox/aiboxVideo/components/videoList.vue
index a97a78f..9819f0f 100644
--- a/src/views/aibox/aiboxVideo/components/videoList.vue
+++ b/src/views/aibox/aiboxVideo/components/videoList.vue
@@ -135,7 +135,6 @@
         <div v-for="(video,index) in videoList" :key="index" style="margin-bottom: 10px;width: 45%">
           <div v-if="video.HLSVIDEOURL" :id="'aLiVideoPlayer'+index" class="prism-player"/>
         </div>
-        {{ video2List }}
         <div v-for="(video2,index2) in video2List" :key="index2" style="margin-bottom: 10px;width: 45%">
           <iframe :src="video2.VIDEOURL" width="100%" height="380" allowfullscreen allow="autoplay; fullscreen;microphone" style="position: relative;border:none"/>
         </div>
diff --git a/src/views/alarm/alarmInfomation/components/list.vue b/src/views/alarm/alarmInfomation/components/list.vue
index 17a9b1b..309c6e5 100644
--- a/src/views/alarm/alarmInfomation/components/list.vue
+++ b/src/views/alarm/alarmInfomation/components/list.vue
@@ -49,7 +49,7 @@
       </el-table-column>
       <el-table-column prop="TYPE" label="类型" align="center">
         <template slot-scope="{row}">
-          {{ row.ISONLINE === '0' ? '指标分析' : '报警源接入' }}
+          {{ row.TYPE === '0' ? '指标分析' : '报警源接入' }}
         </template>
       </el-table-column>
       <el-table-column prop="ALARM_COUNT" label="报警数" align="center"/>
diff --git a/src/views/alarm/alarmVideo/components/list.vue b/src/views/alarm/alarmVideo/components/list.vue
index 41c9056..313d924 100644
--- a/src/views/alarm/alarmVideo/components/list.vue
+++ b/src/views/alarm/alarmVideo/components/list.vue
@@ -49,7 +49,7 @@
       </el-table-column>
       <el-table-column prop="TYPE" label="类型" align="center">
         <template slot-scope="{row}">
-          {{ row.ISONLINE === '0' ? '指标分析' : '报警源接入' }}
+          {{ row.TYPE === '0' ? '指标分析' : '报警源接入' }}
         </template>
       </el-table-column>
       <el-table-column prop="ALARM_COUNT" label="报警数" align="center"/>
diff --git a/src/views/map/dialog/alarmDevice.vue b/src/views/map/dialog/alarmDevice.vue
index 9d2ad4d..5d99774 100644
--- a/src/views/map/dialog/alarmDevice.vue
+++ b/src/views/map/dialog/alarmDevice.vue
@@ -71,7 +71,7 @@
               <td> 待填报 </td>
             </tr>
             <tr v-show="item.IS_ALARM === '2' && item.REASON">
-              <td class="bbg-transparent">REASON</td>
+              <td class="bbg-transparent">原因</td>
               <td>{{ item.REASON }}</td>
             </tr>
           </table>