Merge remote-tracking branch 'origin/master'

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

@@ -28,6 +28,9 @@
             <el-form-item label="设备编号:" prop="deviceCode">
               <font>{{form.deviceCode}}</font> 
             </el-form-item>
+            <el-form-item label="设备信息:" prop="alarmId">
+              <font>{{form.alarmId}}</font> 
+            </el-form-item>
           </el-form>
           <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="float: left;margin-left: 50px;">
             <el-form-item label="报警类型:" prop="alarmType">
@@ -46,8 +49,13 @@
             </el-form-item>
           </el-form>
           <el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="float: left;margin-left: 50px;">
+            <el-form-item label="工单编号:" prop="orderId">
+              <font>{{form.orderId}}</font> 
+            </el-form-item>
             <el-form-item label="处理状态:" prop="dealStatus">
-              <font v-if="form.dealStatus == 1">不需要处理</font>
+              <font v-if="form.orderId == null || form.orderId == ''">未生成工单</font>
+              <font v-if="(form.dealStatus == null || form.dealStatus == '') && form.orderId != null && form.orderId != ''">未处理</font>
+              <font v-if="form.dealStatus == 1">不需处理</font>
               <font v-if="form.dealStatus == 2">已处理完成</font>
               <font v-if="form.dealStatus == 3">未处理完成</font>
             </el-form-item>
@@ -188,7 +196,7 @@ export default {
       devices: null,
       // 巡检员列表
       inspector: [],
-      alermId:'',
+      alarmId:'',
       // 弹出层标题
       title: "",
       // 是否显示弹出层

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

@@ -177,7 +177,7 @@ export default {
       this.$router.push({
         path: '/realtimeData/realtimedetail',
         query:{
-          orderId : row.orderId
+          deviceReportDataId : row.deviceReportDataId
         }
       }) //带参跳转
     },

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

@@ -42,7 +42,7 @@
       <el-table-column label="上报时间" align="center" prop="reportTime" />
       <el-table-column label="设备状态" align="center" prop="deviceStatus" >
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -52,7 +52,7 @@
             v-hasPermi="['system:data:export']"
           >详情</el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination

gassafety-web/src/views/deviceInspection/inspectionPlan/inspectiondetail.vue

@@ -253,7 +253,6 @@ export default {
         getInspectionPlan(this.planId).then(response =>{
           this.form = response.data;
           this.active = parseInt(response.data.orderStatus) + 1;
-          console.log(this.form,2222222222222222)
           if(this.form.deviceInfoList.length>0){
             this.gaoMap.resetMapCenter([this.form.deviceInfoList[0].longitude,this.form.deviceInfoList[0].latitude]);
           }