xiug

src/views/alarm/alarmRecords/index.vue

@@ -162,12 +162,11 @@
         </template>
       </el-table-column> -->
       <el-table-column prop="device_number" align="center" label="设备编号" />
-
+      <el-table-column prop="device_name" align="center" label="设备名称" />
       <el-table-column prop="reason_text" align="center" label="告警原因 "/>
       <el-table-column prop="start_time_text" align="center" label="告警开始时间" />
       <el-table-column prop="end_time_text" align="center" label="告警结束时间" />
-
-      <el-table-column prop="state" align="center" label="告警状态" />
+      <!-- <el-table-column prop="state" align="center" label="告警状态" /> -->
       <el-table-column prop="comment" align="center" label="备注" />
       <el-table-column label="操作" width="130" align="center">
         <template slot-scope="record">
@@ -175,9 +174,9 @@
           <el-tooltip  effect="light" :enterable="false" content="设备详情" placement="top">
               <el-button type="primary" icon="el-icon-view"  @click="viewAlarmDetail(record.row.id)" />
           </el-tooltip>
-          <el-tooltip effect="light" :enterable="false" content="历史心跳" placement="top">
+          <!-- <el-tooltip effect="light" :enterable="false" content="历史心跳" placement="top">
               <el-button type="primary" icon="el-icon-data-line"  @click="alarmAnalysis(record.row.asset_no)" />
-          </el-tooltip>
+          </el-tooltip> -->
           
 
           

src/views/alarm/component/viewDialog.vue

@@ -10,36 +10,18 @@
         <el-row class="dialog-row">
           <div class="dialog-row-title">告警信息</div>
           <div class="dialog-row-content">
-            <!-- <span class="content-row"> <span class="name-item"> 学生班级: </span> <span>{{alarmInfo.school_name + '/' + alarmInfo.grade_name + '/' + alarmInfo.class_name}}</span> </span> -->
-            <span class="content-row"> <span class="name-item"> 用户姓名: </span> <span>{{alarmInfo.realname}}</span> </span>
-            <span class="content-row"> <span class="name-item"> 设备卡号: </span> <span>{{alarmInfo.device_number}}</span> </span>
-            <!-- <span class="content-row"> <span class="name-item"> 家长电话: </span> <span>{{alarmInfo.parent_phone}}</span> </span> -->
+            <!-- <span class="content-row"> <span class="name-item"> 设备名称: </span> <span>{{alarmInfo.realname}}</span> </span>
+            <span class="content-row"> <span class="name-item"> 设备编号: </span> <span>{{alarmInfo.device_number}}</span> </span>
             <span class="content-row" style="color:red"> <span class="name-item"> 告警原因: </span> <span>{{alarmInfo.alarm_type_name}}</span> </span>
-            <span class="content-row"> <span class="name-item"> 告警时间: </span> <span>{{alarmInfo.alarm_time}}</span> </span>
-            <!-- <span class="content-row" style="color:blue"> <span class="name-item"> 告警等级: <i style="margin-left:11px"></i> </span> <span>{{alarmInfo.grade}}</span> </span> -->
-            <!-- <span class="content-row" v-if="alarmInfo.end_time"> <span class="name-item"> 结束时间: </span> <span>{{alarmInfo.end_time}}</span> </span> -->
+            <span class="content-row"> <span class="name-item"> 告警时间: </span> <span>{{alarmInfo.alarm_time}}</span> </span> -->
+            <span class="content-row"> <span class="name-item"> 设备名称: </span> <span>测试设备1</span> </span>
+            <span class="content-row"> <span class="name-item"> 设备编号: </span> <span>10001</span> </span>
+            <span class="content-row" style="color:red"> <span class="name-item"> 告警原因: </span> <span>液压油偏低</span> </span>
+            <span class="content-row"> <span class="name-item"> 告警时间: </span> <span>2022-05-16 14:43:00</span> </span>
           </div>
         </el-row>
-        <el-row class="dialog-row">
-          <!-- 设备信息 -->
-          <div class="dialog-row-title">定位信息  
-            <!-- <a href="javascript:void(0);" @click="handleDeviceInfo()"> <el-button type="primary" class="primary-btn">查看设备详情</el-button></a> -->
-          </div>
-          <div class="dialog-row-content">
-            <span class="content-row"> <span class="name-item"> 定位类型: </span> <span>{{alarmInfo.station_name || ''}}</span> </span>
-            <!-- <span class="content-row"> <span class="name-item"> 基站MAC: </span> <span>{{alarmInfo.station_code}}</span> </span> -->
-            <!-- <span class="content-row"> <span class="name-item"> 所属区域: </span> <span>{{path}}</span> </span> -->
-            <span class="content-row"> <span class="name-item"> 详细地址: </span> <span>{{alarmInfo.address || ''}}</span> </span>
-            <!-- <span class="content-row"> <span class="name-item"> 所属单位: </span> <span>{{alarmInfo.depart_name}}</span> </span> -->
-            <!-- <span class="content-row"> <span class="name-item"> 联系电话: </span> <span>1312313213</span> </span> -->
-          </div>
-        </el-row>
-        <!-- <el-row class="dialog-row" v-if="alarmInfo.end_time">
-          <div class="dialog-row-title">处理信息</div>
-          <div class="dialog-row-content">
-            <span class="content-row"> <span class="name-item"> 结束时间: </span> <span>{{alarmInfo.end_time}}</span> </span>
-          </div>
-        </el-row> -->
+
+
       </div>
     <el-divider class="dialog-divider"></el-divider>
     <span slot="footer" class="dialog-footer">