Merge branch 'V0.0.6_iot' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.6_iot

src/api/iot/alarmRule.js

@@ -17,10 +17,15 @@ export function getAlarmRule(alarmRuleId) {
 }
 
 export function getAlarmRules(alarmType, ruleName, pageIndex, pageSize) {
-  if(ruleName=="") ruleName = "undefined";
   return request({
-    url: `/iot/iot_alarm/getRules/${alarmType}/${pageIndex}/${pageSize}/${encodeURIComponent(ruleName)}`,
-    method: 'get',
+    url: `/iot/iot_alarm/getRules`,
+    method: 'post',
+    data: {
+      ruleType:alarmType,
+      ruleName:ruleName,
+      pageNum:pageIndex,
+      pageSize:pageSize,
+    }
   })
 }
 

src/views/iot/sensorData/dialog.detail.vue

@@ -35,8 +35,8 @@
         <!-- 表格 -->
         <template slot="columns">
           <el-table-column label="设备名称" align="center" prop="deviceName" width="300"/>
-          <el-table-column label="上报时间" prop="info" width="300"/>
-          <el-table-column label="上报内容" prop="updateTime" width="300"/>
+          <el-table-column label="上报时间" prop="updateTime" width="300"/>
+          <el-table-column label="上报内容" prop="info" width="300"/>
         </template>
       </g-search-table>
     </div>