详情

gassafety-web/src/views/dataMonitoring/deviceAlarm/alarmdetail.vue

@@ -13,7 +13,7 @@
         </div>
 
 
-        <div style="width: 100%;height: 200px;">
+        <div style="width: 100%;height: 100px;">
           <!-- <div style="color: #31EAEA;width: 30%;height: 30px;">
             <ul><li>详细信息</li></ul>
           </div> -->
@@ -67,60 +67,33 @@
 
         <div style="width: 100%;height: 350px;padding: 10px;height: 300px;">
             <div style="width: 66.6%;float: left;height: 100%;">
-                <el-table
-                :data="tableData"
-                style="width: 100%">
-                <el-table-column
-                    prop="date"
-                    label="日期"
-                    width="180">
-                </el-table-column>
-                <el-table-column
-                    prop="name"
-                    label="姓名"
-                    width="180">
-                </el-table-column>
-                <el-table-column
-                    prop="address"
-                    label="地址">
-                </el-table-column>
+              <el-table :data="dataListdetail1" style="width: 100%">
+                <el-table-column label="设备名称" align="center" prop="deviceName" />
+                <el-table-column label="设备编号" align="center" prop="deviceCode" />
+                <el-table-column label="报警类型" align="center" prop="alarmType" />
               </el-table>
-                <el-table
-                :data="tableData"
-                style="width: 100%;margin-top: 20px;">
-                <el-table-column
-                    prop="date"
-                    label="日期"
-                    width="180">
-                </el-table-column>
-                <el-table-column
-                    prop="name"
-                    label="姓名"
-                    width="180">
-                </el-table-column>
-                <el-table-column
-                    prop="address"
-                    label="地址">
-                </el-table-column>
+    
+              <el-table :data="dataListdetail2" style="width: 100%;margin-top: 20px;">
+                <el-table-column label="报警值" align="center" prop="alarmValue" />
+                <el-table-column label="报警开始时间" align="center" prop="startTime" />
               </el-table>
-                <el-table
-                :data="tableData"
-                style="width: 100%;margin-top: 20px;">
-                <el-table-column
-                    prop="date"
-                    label="日期"
-                    width="180">
-                </el-table-column>
-                <el-table-column
-                    prop="name"
-                    label="姓名"
-                    width="180">
-                </el-table-column>
-                <el-table-column
-                    prop="address"
-                    label="地址">
+    
+    
+              <el-table :data="dataListdetail3" style="width: 100%;margin-top: 20px;">
+                <el-table-column label="报警结束时间" align="center" prop="endTime" />
+                <el-table-column label="处理状态" align="center" prop="dealStatus">
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.orderId == null || scope.row.orderId == ''">未生成工单</span>
+                    <span v-if="(scope.row.dealStatus == null || scope.row.dealStatus == '') &&
+                        scope.row.orderId != null && scope.row.orderId != ''">未处理</span>
+                    <span v-if="scope.row.dealStatus == 1">不需处理</span>
+                    <span v-if="scope.row.dealStatus == 2">已处理完成</span>
+                    <span v-if="scope.row.dealStatus == 3">未处理完成</span>
+                  </template>
                 </el-table-column>
               </el-table>
+
+
             </div>
           <div id="marbox" style="width: 33%;height: 304px; border: 1px solid rgb(218, 213, 213);float: right;">
             <div style="width: 100%;height: 100%" id="container"></div>
@@ -185,7 +158,9 @@ export default {
       typeOptions: [],
       // 设备级联
       options: [],
-
+      dataListdetail1: [],
+      dataListdetail2: [],
+      dataListdetail3: [],
       props: {
         multiple: true,
         value: "id",
@@ -803,6 +778,13 @@ export default {
     },
     getDeviceAlarm (){
       getDeviceAlarm(this.alarmId).then(response =>{
+          const { deviceName, deviceCode, alarmType,alarmValue,startTime,endTime,deviceStatus} = response.data;
+          const obj1 = {deviceName,deviceCode,alarmType};
+          const obj2 = {alarmValue,startTime};
+          const obj3 = {endTime,deviceStatus};
+          this.dataListdetail1.push(obj1);
+          this.dataListdetail2.push(obj2);
+          this.dataListdetail3.push(obj3);
           this.form = response.data;
           this.active = parseInt(response.data.orderStatus) + 1;
           if(this.form.deviceInfoList.length>0){