Merge remote-tracking branch 'origin/V0.0.6_iot' into V0.0.6_iot

src/views/warnRule/index.vue

@@ -61,7 +61,7 @@
                 </el-table>
               </template>
             </el-table-column>
-            <el-table-column label="名称" prop="iotAlarmRule.name"> </el-table-column>
+            <el-table-column label="规则名称" prop="iotAlarmRule.name"> </el-table-column>
             <el-table-column label="类型" prop="iotAlarmRule.type">
               <template slot-scope="item">
                 <span>{{ item.row.iotAlarmRule.type == "alarm" ? "报警" : "未知" }}</span>