设备报警信息列表接口问题，设备巡检下发工单页面问题

gassafety-system/src/main/java/com/zehong/system/service/impl/TDeviceAlarmServiceImpl.java

@@ -77,12 +77,16 @@ public class TDeviceAlarmServiceImpl implements ITDeviceAlarmService
 
             if("0".equals(tDeviceAlarm.getDeviceType())){
                 TPipe pipe = tPipeMapper.selectTPipeById(alarm.getDeviceId());
-                deviceAlarmVo.setDeviceCode(pipe.getPipeCode());
-                deviceAlarmVo.setDeviceName(pipe.getPipeName());
+                if(pipe != null) {
+                    deviceAlarmVo.setDeviceCode(pipe.getPipeCode());
+                    deviceAlarmVo.setDeviceName(pipe.getPipeName());
+                }
             } else {
                 TDeviceInfo deviceInfo = tDeviceInfoMapper.selectTDeviceInfoById(alarm.getDeviceId());
-                deviceAlarmVo.setDeviceCode(deviceInfo.getDeviceCode());
-                deviceAlarmVo.setDeviceName(deviceInfo.getDeviceName());
+                if(deviceInfo != null) {
+                    deviceAlarmVo.setDeviceCode(deviceInfo.getDeviceCode());
+                    deviceAlarmVo.setDeviceName(deviceInfo.getDeviceName());
+                }
             }
 
             list.add(deviceAlarmVo);

gassafety-web/src/views/device/deviceInfo/index.vue

@@ -93,10 +93,9 @@
 
     <el-table v-loading="loading" :data="deviceInfoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="所属管道" align="center" prop="pipeId" />
+<!--      <el-table-column label="所属管道" align="center" prop="pipeId" />-->
       <el-table-column label="设备名称" align="center" prop="deviceName" />
-      <el-table-column label="所在地址" align="center" prop="deviceAddr" />
-      <el-table-column label="设备型号" align="center" prop="deviceModel" />
+      <el-table-column label="设备编号" align="center" prop="deviceCode" />
       <el-table-column label="设备类型" align="center" prop="deviceType">
         <template slot-scope="scope">
           <span v-if="scope.row.deviceType == 1">调压箱</span>
@@ -105,6 +104,8 @@
           <span v-if="scope.row.deviceType == 4">智能燃气表</span>
         </template>
       </el-table-column>
+      <el-table-column label="设备型号" align="center" prop="deviceModel" />
+      <el-table-column label="所在地址" align="center" prop="deviceAddr" />
       <el-table-column label="物联网编号" align="center" prop="iotNo" />
       <el-table-column label="安装时间" align="center" prop="installationTime" width="180">
         <template slot-scope="scope">
@@ -153,6 +154,9 @@
         <el-form-item label="设备名称" prop="deviceName">
           <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
         </el-form-item>
+        <el-form-item label="设备编号" prop="deviceCode">
+          <el-input v-model="form.deviceCode" placeholder="请输入设备编号" />
+        </el-form-item>
         <el-form-item label="所在地址" prop="deviceAddr">
           <el-input v-model="form.deviceAddr" placeholder="请输入所在地址" />
         </el-form-item>

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

@@ -185,8 +185,8 @@
           </el-form-item>
         </div>
         <div v-if="this.title == '下发工单'">
-          <el-form-item label="巡检计划名称" prop="planName">
-            <font>{{form.planName}}</font>
+          <el-form-item label="巡检计划名称" prop="plansName">
+            <font>{{plansName}}</font>
           </el-form-item>
           <el-form-item label="计划时间">
             <font>{{ parseTime(form.startTime, '{y}-{m}-{d}') }} 至
@@ -252,6 +252,7 @@
         typeOptions: [],
         // 设备级联
         options: [],
+        plansName: '',
         props: {
           multiple: true,
           value: "id",
@@ -294,7 +295,7 @@
             { required: true, message: "请选择开始时间", trigger: "blur" }
           ],
           endTime: [
-            { required: true, message: "请选择结束事件", trigger: "blur" }
+            { required: true, message: "请选择结束时间", trigger: "blur" }
           ],
         }
       };
@@ -391,6 +392,7 @@
         const planId = row.planId || this.ids
         getInspectionPlan(planId).then(response => {
           this.form = response.data;
+          this.plansName = this.form.planName;
           this.form.remarks = "";
           this.open = true;
           this.title = "下发工单";