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

ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue

@@ -23,7 +23,7 @@
           v-model="value"
           :placeholder="placeholder"
           clearable
-          @change="handleSearch"
+          @keyup.enter.native="handleSearch"
         ></ElInput>
         <img src="./search.svg" v-show="!disable" @click="onOpenPop" />
       </div>
@@ -130,14 +130,18 @@ export default {
   },
   mounted() {
     // document.getElementById("app")
-    document.addEventListener("click" , ()=>{
+    document.addEventListener(
+      "click",
+      () => {
         if (!this.isClickedBtn) {
           setTimeout(() => {
             this.visible = false;
-        }, 100)
+          }, 100);
         }
         this.isClickedBtn = false;
-    } , false)
+      },
+      false
+    );
   },
 
   methods: {
@@ -193,7 +197,7 @@ export default {
             console.log("catch");
           });
       }
-    }
+    },
   },
 };
 </script>

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

@@ -9,14 +9,20 @@ import request from "@/utils/request";
  * @param {1 | 2 | 3} media 参数说明: 1: http+flv; 2: rtmp; 3: hls
  * @returns
  */
-export function getCameraStream(camId, media = 1) {
+export async function getCameraStream(camId, media = 1) {
-  return request({
+  let data = await request({
       url: "/video/externalVideoStreaming",
       method: "get",
       params: {
         camId,
       },
     });
+
+  if (data.code == 200){
+    data.data.liveUrl = "https://10.0.81.202/camera?target=" + data.data.liveUrl.substring(7);
+  }
+
+  return data;
 }
 
 /**
@@ -276,7 +282,7 @@ export function getEventTopicList(eventType) {
 
     request({
       url: `/business/trafficIncidents/getEventList/${eventType}`,
-      method: "get",
+      method: "post",
     })
       .then(({ code, data }) => {
         if (code != 200) {

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/channelAnalytics/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class='congestion'>
+  <div class="congestion">
     <WgtTitle :title="'事件源分析'"></WgtTitle>
     <div class="board">
       <div class="charts keep-ratio" id="channelAnalytics"></div>
@@ -11,46 +11,42 @@
 import WgtTitle from "@screen/pages/perception/widgets/title";
 import * as echarts from "echarts";
 import chartsStatistics from "./assets/charts";
-import { eventSourceRatio } from "@/api/event/governanceAnalysis"
+import { eventSourceRatio } from "@/api/event/governanceAnalysis";
 export default {
-  name: 'RailWayDay',
+  name: "RailWayDay",
   components: {
-    WgtTitle
+    WgtTitle,
   },
   data() {
-    return {
+    return {};
-
-    }
   },
 
-  created() {
+  created() {},
-
-  },
   methods: {
     getEventSourceRatio() {
       return eventSourceRatio().then((response) => {
-        console.log("response", response)
+        console.log("response", response);
-        let data = []
+        let data = [];
-        let total = null
+        let total = null;
-        let nameData = []
+        let nameData = [];
         const newObj = { value: 1, name: "" };
         for (let i = 0; i < response.data.length; i++) {
           data.push({
             value: response.data[i].num,
-            name: response.data[i].eventSourceName
+            name: response.data[i].eventSourceName,
-          })
+          });
           total += response.data[i].num;
         }
-        console.log("total", total)
+        console.log("total", total);
         for (let i = 0; i < data.length; i++) {
           //   if (i % 2 === 0) {
           //     data.splice(i + 1, 0, newObj)
           //   }
           if (data[i].name != "") {
-            nameData.push(data[i].name)
+            nameData.push(data[i].name);
           }
         }
-        console.log(6666, data, nameData)
+        console.log(6666, data, nameData);
         chartsStatistics.legend.formatter = function (name) {
           let tarValue = 0;
           for (let i = 0; i < response.data.length; i++) {
@@ -59,30 +55,30 @@ export default {
             }
           }
           var percert = total == 0 ? 0 : ((tarValue / total) * 100).toFixed(2);
-          return `{text|${name}} {number|${percert}%}`;
+          return `{text|${name}} {number|${tarValue} 起  } {number|${percert}%}`;
         };
         chartsStatistics.legend.data = nameData;
         chartsStatistics.title[0].text = total;
         // chartsStatistics.tooltip.show = false;
         // chartsStatistics.series[1].data[0].value = total;
         chartsStatistics.series[2].data = data;
-      })
+      });
-    }
+    },
   },
   async mounted() {
-    await this.getEventSourceRatio()
+    await this.getEventSourceRatio();
     setTimeout(() => {
       this.$nextTick(() => {
-        var myChart = echarts.init(document.getElementById('channelAnalytics'));
+        var myChart = echarts.init(document.getElementById("channelAnalytics"));
 
         myChart.setOption(chartsStatistics);
       });
     });
   },
-}
+};
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .congestion {
   width: 100%;
 
@@ -94,11 +90,15 @@ export default {
     border-radius: 5px 5px 5px 5px;
     opacity: 1;
     border: 1px solid;
-    border-image: linear-gradient(360deg, rgba(55, 231, 255, 0.3), rgba(55, 231, 255, 0)) 1 1;
+    border-image: linear-gradient(
+        360deg,
+        rgba(55, 231, 255, 0.3),
+        rgba(55, 231, 255, 0)
+      )
+      1 1;
     display: flex;
     justify-content: space-between;
     align-items: center;
-
   }
 }
 
@@ -107,4 +107,3 @@ export default {
   width: 100%;
 }
 </style>
-  

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/eventTypeAnalysis/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class='congestion'>
+  <div class="congestion">
     <WgtTitle :title="'事件类型分析'"></WgtTitle>
     <div class="board">
       <div class="charts keep-ratio" id="eventTypeAnalysis"></div>
@@ -11,43 +11,39 @@
 import WgtTitle from "@screen/pages/perception/widgets/title";
 import * as echarts from "echarts";
 import chartsStatistics from "./assets/charts";
-import { allEventNum } from "@/api/event/governanceAnalysis"
+import { allEventNum } from "@/api/event/governanceAnalysis";
 export default {
-  name: 'RailWayDay',
+  name: "RailWayDay",
   components: {
-    WgtTitle
+    WgtTitle,
   },
   data() {
-    return {
+    return {};
-
-    }
   },
 
-  created() {
+  created() {},
-
-  },
   methods: {
     getAllEventNum() {
       return allEventNum().then((response) => {
-        console.log("response", response)
+        console.log("response", response);
-        let data = []
+        let data = [];
-        let total = null
+        let total = null;
-        let nameData = []
+        let nameData = [];
         const newObj = { value: 1, name: "" };
         for (let i = 0; i < response.data.length; i++) {
           data.push({
             value: response.data[i].num,
-            name: response.data[i].eventName
+            name: response.data[i].eventName,
-          })
+          });
           total += response.data[i].num;
         }
-        console.log("total88", total)
+        console.log("total88", total);
         for (let i = 0; i < data.length; i++) {
           // if (i % 2 === 0) {
           //   data.splice(i + 1, 0, newObj)
           // }
           if (data[i].name != "") {
-            nameData.push(data[i].name)
+            nameData.push(data[i].name);
           }
         }
         chartsStatistics.legend.data = nameData;
@@ -59,27 +55,29 @@ export default {
             }
           }
           var percert = total == 0 ? 0 : ((tarValue / total) * 100).toFixed(2);
-          return `{text|${name}} {number|${percert}%}`;
+          return `{text|${name}} {number|${tarValue} 起  }  {number|${percert}%}`;
         };
         chartsStatistics.title[0].text = total;
         chartsStatistics.series[2].data = data;
-      })
+      });
-    }
+    },
   },
   async mounted() {
-    await this.getAllEventNum()
+    await this.getAllEventNum();
     setTimeout(() => {
       this.$nextTick(() => {
-        var myChart = echarts.init(document.getElementById('eventTypeAnalysis'));
+        var myChart = echarts.init(
+          document.getElementById("eventTypeAnalysis")
+        );
 
         myChart.setOption(chartsStatistics);
       });
     });
   },
-}
+};
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .congestion {
   width: 100%;
 
@@ -91,11 +89,15 @@ export default {
     border-radius: 5px 5px 5px 5px;
     opacity: 1;
     border: 1px solid;
-    border-image: linear-gradient(360deg, rgba(55, 231, 255, 0.3), rgba(55, 231, 255, 0)) 1 1;
+    border-image: linear-gradient(
+        360deg,
+        rgba(55, 231, 255, 0.3),
+        rgba(55, 231, 255, 0)
+      )
+      1 1;
     display: flex;
     justify-content: space-between;
     align-items: center;
-
   }
 }
 
@@ -104,4 +106,3 @@ export default {
   width: 100%;
 }
 </style>
-  

ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/auditAnalytics/assets/charts.js

@@ -117,7 +117,7 @@ var options = {
       }
       var percert = total == 0 ? 0 : ((tarValue / total) * 100).toFixed(2);
       const arr = name + "  " + tarValue;
-      return `{text|${name}} {number|${percert}%}`;
+      return `{text|${name}} {number|${tarValue} 起  }  {number|${percert}%}`;
     },
     pageIconColor: "#fff",
     pageIconSize: 10,

ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/channelAnalytics/assets/charts.js

@@ -118,7 +118,7 @@ var options = {
       }
       var percert = total == 0 ? 0 : ((tarValue / total) * 100).toFixed(2);
       const arr = name + "  " + tarValue;
-      return `{text|${name}} {number|${percert}%}`;
+      return `{text|${name}} {number|${tarValue} 起  }  {number|${percert}%}`;
     },
     pageIconColor: "#fff",
     pageIconSize: 10,

ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/eventTypeAnalysis/assets/charts.js

@@ -143,7 +143,7 @@ var options = {
       }
       var percert = total == 0 ? 0 : ((tarValue / total) * 100).toFixed(2);
       const arr = name + "  " + tarValue;
-      return `{text|${name}} {number|${percert}%}`;
+      return `{text|${name}} {number|${tarValue} 起  }  {number|${percert}%}`;
     },
     pageIconColor: "#fff",
     pageIconSize: 10,

ruoyi-ui/src/views/websocket.vue

@@ -30,7 +30,8 @@ export default {
       // console.log(location.hostname )
       // 建立 websocket 连接
       this.socket.initialize({
-        url: 'ws://' + location.hostname + ':' + port + path,
+        // url: 'ws://' + location.hostname + ':' + port + path,
+        url: 'wss://' + location.hostname + ':' + window.location.port || 80 + '/ws',
         // url: "ws://10.7.179.15" + ":" + port + path,
         // url: "ws://10.168.64.171" + ":" + port + path,
         //  url: 'ws://10.168.78.127'+ ':' + port + path,

ruoyi-ui/vue.config.js

@@ -31,6 +31,7 @@ module.exports = {
   devServer: {
     host: "0.0.0.0",
     port: port,
+    https: true,
     open: true,
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy