Merge remote-tracking branch 'origin/master'

# Conflicts:
#	screen-demo/src/views/templateInstance.vue

screen-demo/src/views/templateInstance.vue

@@ -182,10 +182,6 @@
   </div>
 </template>
 
-
-
-
-
 <script>
 import {
   MapolMap,
@@ -521,7 +517,17 @@ export default {
     },
     echarts1q(){
       let result ={}
-      let param = {"tenantId":"","userId":"","industryCode":"","appVerCode":"","dimensionFlag":"5","queryStartTime":"2024-01-04","queryEndTime":"2024-08-09"}
+      let param = {
+        "tenantId":"",
+        "userId":"",
+        "industryCode":"",
+        "appVerCode":"",
+        "dimensionFlag":"5",
+        "queryStartTime":"2024-03-01 23:59:59",
+        "queryEndTime":"2024-04-29 00:00:00"
+        // "queryStartTime":"2023-08-04",
+        // "queryEndTime":"2023-08-09"
+      }
       this.$requestSDK(
           "/jilin-devloper/jilin/getEventAlarmNumYearMonth",
           param,
@@ -979,7 +985,17 @@ export default {
     echarts3q() {
 
       let result ={}
-      let param = {"tenantId":"","userId":"","industryCode":"","appVerCode":"","dimensionFlag":"1","queryStartTime":"2024-01-04","queryEndTime":"2024-08-09"}
+      let param = {
+        "tenantId":"",
+        "userId":"",
+        "industryCode":"",
+        "appVerCode":"",
+        "dimensionFlag":"1",
+        "queryStartTime":"2024-03-01 23:59:59",
+        "queryEndTime":"2024-04-29 00:00:00"
+        // "queryStartTime":"2022-08-04",
+        // "queryEndTime":"2024-08-09"
+      }
       this.$requestSDK(
           "/jilin-devloper/jilin/getDevTypeYearMonth",
           param,
@@ -1061,7 +1077,14 @@ export default {
 
     oneEchart(){
       let result = {}
-      let param = {"dayNum":0,"dimensionFlag":"0","orderBy":"","queryEndTime":"2024-01-09 23:59:59","queryStartTime":"2023-12-04 00:00:00"}
+      // 参数时间有要求，需要传入 2024-03-01 23:59:59 - 2024-04-29 00:00:00 数据 月份两位的 带时分秒
+      let param = {
+        "dayNum":0,
+        "dimensionFlag":"0",
+        "orderBy":"",
+        "queryStartTime":"2024-03-01 23:59:59",
+        "queryEndTime":"2024-04-29 00:00:00"
+      };
       this.$requestSDK(
           "/jilin-devloper/jilin/getNumAll",
           param,