优化

src/views/homePage/warnMessage/index.vue

@@ -15,7 +15,7 @@
       >
         <el-table-column align="center" prop="warnTime" label="报警时间">
         </el-table-column>
-        <el-table-column align="center" prop="sensorId" label="设备名称">
+        <el-table-column align="center" prop="zsbName" label="主设备名称">
         </el-table-column>
         <el-table-column
           align="center"
@@ -34,6 +34,14 @@
             </el-tooltip>
           </template>
         </el-table-column>
+
+        <el-table-column align="center" prop="warnValue" label="当前值">
+        </el-table-column>
+        <el-table-column align="center" prop="triggerDesc" label="触发条件">
+        </el-table-column>
+
+        <el-table-column align="center" prop="threshold" label="告警阈值">
+        </el-table-column>
         <el-table-column align="center" prop="warnLevel" label="告警等级">
           <template slot-scope="scope">
             <span v-if="scope.row.warnLevel == 2">高 </span>
@@ -41,10 +49,6 @@
             <span v-else-if="scope.row.warnLevel == 0"> 低 </span>
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="warnValue" label="当前值">
-        </el-table-column>
-        <el-table-column align="center" prop="threshold" label="告警阈值">
-        </el-table-column>
       </el-table>
     </div>
   </div>