Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue

@@ -95,7 +95,7 @@ export default {
     justify-content: center;
 
     >div.video-stream {
-      height: 260px;
+      height: 286px;
     }
   }
 

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/components/DeviceParams.vue

@@ -50,14 +50,15 @@ export default {
       }
     }
   },
-  created() {
+  async created() {
     // this.devicesList = devicesFormList;
     this.devicesList = [];
     let devs = [];
     // Promise.all([this.getAc('A1'), this.getAc('A2'), this.getAc('A3'), this.getAc('A4'), this.getAc('A5'), this.getAc('A6')]).then(res => {
-    Promise.all([this.getAc()]).then(async (res) => {
+
+    const res = await this.getAc();
     console.log('res', res)
-      if (res[0].code == 500) {
+    if (res.code == 500) {
       await this.getAc();
     }
     request({
@@ -78,8 +79,6 @@ export default {
       });
       this.devicesList = devs;
     })
-
-    })
   },
   methods: {
     getAc() {