报警信息详情冲突还原

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

@@ -15,12 +15,12 @@
       <el-row style="padding-left: 50px;">
         <el-col :span="6">
           <el-form ref="form" v-model="form" style="width: 100%;">
-            <el-form-item label="设备名称:" prop="deviceCode">
-              <font>{{form.deviceName}}</font>
-            </el-form-item>
             <el-form-item label="设备类型:" prop="deviceType">
               <font>{{form.deviceType}}</font>
             </el-form-item>
+            <el-form-item label="设备编号:" prop="deviceCode">
+              <font>{{form.deviceCode}}</font>
+            </el-form-item>
           </el-form>
         </el-col>
         <el-col :span="6">
@@ -548,9 +548,7 @@ export default {
       getDetail (){
         getDeviceAlarm(this.alarmId).then(response =>{
           this.form = response.data;
-          this.active = parseInt(response.data.orderStatus) + 1;
-          this.gaoMap.resetMapCenter([this.form.longitude, this.form.latitude]);
-          this.gaoMap.addMarker(DEVICE_TYPE.WORKORDER, this.form);
+          console.log("this.form", this.form);
 
           if(this.form.pipeList != null){
             let pipe = this.form.pipeList[0];
@@ -593,7 +591,6 @@ export default {
           console.log("getData2", getData2)
           console.log("getData3", getData3)
 
-          console.log("55555555555", this.form.deviceReportDataList)
 
           if(this.form.orderType == '1') {
             // 获取设备列表树