Merge branch 'zjw'

imt-server/imt-module-data/imt-module-data-biz/src/main/java/com/inspur/module/data/service/DataQueryService.java

@@ -305,9 +305,9 @@ public class DataQueryService implements IDataQueryService {
             }
             resMap.put(realCn, list.stream().map(map -> {
                 Double data = (Double) map.get(cn);
-                if ("gateway_temp_data".equals(tableName)) {//温度处理
+//                if ("gateway_temp_data".equals(tableName)) {//温度处理
-                    return data / 10.0;
+//                    return data / 10.0;
-                }
+//                }
                 if ("work_time".equals(columnName) || "power_time".equals(columnName)) {//时间转小时
                     return data / 60.0;
                 }
@@ -456,7 +456,7 @@ public class DataQueryService implements IDataQueryService {
             }
             sql.append(" time <= '").append(endTime).append("'");
         }
-        sql.append(" group by time(").append(interval).append(") fill(none)");
+        sql.append(" group by time(").append(interval).append(") fill(0)");
         return influxDBService.queryResultProcess(influxDBService.query(sql.toString()));
     }
 

imt-ui/src/views/system/data/monitordatadashboard/index.vue

@@ -84,7 +84,7 @@
     </div>
     <el-empty
       v-if="!this.selectCardNames || this.selectCardNames.length == 0"
-      description="暂无数据，请先选择参数来查看监控数据"
+      description="暂无数据，请先选择参数来查看监测数据"
     ></el-empty>
     <div class="chart-1">
       <el-card