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

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js

@@ -26,10 +26,10 @@ export async function getCameraStream(camId, media = 1) {
     },
   });
 
-  if (data.code == 200) {
+  /*if (data.code == 200) {
     data.data.liveUrl =
-      "https://10.0.111.11/camera?target=" + data.data.liveUrl.substring(7);
-  }
+      "https://10.0.81.202/camera?target=" + data.data.liveUrl.substring(7);
+  }*/
 
   return data;
 }

ruoyi-ui/src/views/JiHeExpressway/pages/control/qrCode/index.vue

@@ -1,13 +1,13 @@
 <template>
   <div class='comp_box'>
-    <iframe class="iframe"
-      src="https://10.0.111.11:83/alarm-ui/single?u=pDo/guSkRP8=&p=u4johJJOFTyugiay04vYxQ==&t=za4NgrFfeTdF76uSUrhJuA==&route=/warning/QRCode"
-      frameborder="0"></iframe>
+   <iframe class="iframe" :src="alarmUrl" frameborder="0"></iframe>
   </div>
 </template>
 
 <script>
 
+  import { getConfigKey } from "@/api/system/config.js";
+
 export default {
   name: 'InDevelopment',
   components: {
@@ -16,9 +16,17 @@ export default {
     text:{
       type:String,
       default:"暂无数据"
+    },
+    alarmUrl:{
+      type:String,
+      default:"",
     }
   },
   mounted() {
+    getConfigKey("dc.alarmUrl").then((res) => {
+      this.alarmUrl = res.msg
+      this.$cache.local.set("manageStation", res.msg);
+    });
   }
 }
 </script>