wangmengwei 15 hours ago
parent
commit
5b3c0d0b8a

+ 2 - 2
ruoyi-ui/src/settings.js

@@ -1,9 +1,9 @@
 module.exports = {
   // urls: `http://192.168.101.245:8099`,
-   urls: `http://10.90.90.53:8099`,
+   // urls: `http://10.90.90.53:8099`,
   // 10.90.90.52 192.168.101.245
   // 10.90.90.53
-  // urls:`http://111.39.53.163:5000`,
+  urls:`http://192.168.9.240:5010`,
   /**
    * 侧边栏主题 深色主题theme-dark,浅色主题theme-light
    */

+ 2 - 2
ruoyi-ui/src/views/login.vue

@@ -78,8 +78,8 @@ export default {
       title: process.env.VUE_APP_TITLE,
       codeUrl: "",
       loginForm: {
-        username: "admin",
-        password: "admin123",
+        username: "",
+        password: "",
         rememberMe: false,
         code: "",
         uuid: ""

+ 13 - 4
ruoyi-ui/src/views/shipinggaoj/gaojingguanli/index.vue

@@ -100,7 +100,7 @@
                         </div>
                         <!-- <img :src="item.warnImage" alt="" style="width: 100%; height: 150px;"> -->
                         <image-preview v-if="item.warnImage != null && item.warnImage != ''" :src="item.warnImage" :width="100 +'%'" :height="150"  style=""/>
-                      <video
+                      <!-- <video
                                  :id="'myVideo' + (index+1)"
                                  data-setup="{}"
                                  loop="loop"
@@ -111,10 +111,11 @@
                                  poster=""
                                  style="width: 100%;height: 150px;"
                                  v-if=" item.videoAddress != null && item.videoAddress != ''"
-                               >
+                               > -->
                                <!-- + baseUrl -->
-                                 <source  :src="item.videoAddress " />
-                               </video>
+                                 <!-- <source  :src="item.videoAddress " />
+                               </video> -->
+                               <h265-player url="http://192.168.9.240:5010/prod-api/profile/videoRecored/recording_20250627_092541_357_离岗.mp4" @error="handleError"></h265-player>
                       </div>
 
                       <div class="goe">
@@ -264,6 +265,7 @@ import { listWarnManage, getWarnManage, delWarnManage, addWarnManage, updateWarn
 // import 'videojs-flash'
 import { listChannelNumber, getChannelNumber, delChannelNumber, addChannelNumber, updateChannelNumber } from "@/api/system/channelNumber"
 const defaultSettings = require("@/settings.js");
+import H265Player from 'vue-h265-player';
 import mqttHandle from "../../../utils/mqttHandler.js"
 import mqtt from 'mqtt';
 import { MqttClient } from 'mqtt'
@@ -271,6 +273,9 @@ import { MqttClient } from 'mqtt'
  const client = mqtt.connect('ws://13.229.167.76:1884/mqtt')
 export default {
   name: "WarnManage",
+  components: {
+      H265Player
+    },
   dicts: ['gaojing_typeshuju', 'source_type','alarm_task','shagnt'],
   data() {
     return {
@@ -346,6 +351,7 @@ export default {
        staffTrainTimeList:[],
        tableMaxHeight:'200',
        receiveNews: "",
+
       };
     },
     computed: {
@@ -419,6 +425,9 @@ export default {
       // this.disconnect()
     },
   methods: {
+    handleError(error) {
+          console.error('Video error:', error);
+        },
     gettimeyer(){
       let nowDate = new Date()
       				  let date = {

+ 17 - 5
ruoyi-ui/src/views/shipinggaoj/huabuhaik/index.vue

@@ -66,8 +66,8 @@
             </div>
             <span style="font-size: 12px;color: red;">先点击绘图按钮,在点击添加图片按钮开始绘制,若绘制多个框每次绘制前需点击添加图片按钮,绘制完成后点击获取坐标点,在更改名称
               。</span>
-            <div style="width: 100%; height: 480px;">
-              <div v-if="isfse" id="divPlugin" style="width: 100%; height: 360px;"></div>
+            <div style="width: 100%; height: 70vh;">
+              <div v-if="isfse" id="divPlugin" style="width: 100%; height: 69vh;"></div>
 
             </div>
 
@@ -393,7 +393,7 @@
 
     },
     mounted() {
-      this.toggleConnection()
+      // this.toggleConnection()
       // this.webRtcServer = new WebRtcStreamer('video', location.protocol + '//' + this.camera_ip)
       //      //需要查看的rtsp地址,根据自己的摄像头传入对应的rtsp地址即可。注意:视频编码格式必须是H264的,否则无法正常显示,编码格式可在摄像头的后台更改
       //      this.webRtcServer.connect('rtsp://admin:zxy123456@192.168.101.64:554/h264/ch1/main/av_stream')
@@ -1126,7 +1126,7 @@
       getVideo(row) {
         var that = this;
         this.isfse = true
-        console.log(row)
+        console.log(row,169)
         // this.initVideoPlay('192.168.150.68', '80', 'admin', 'zxy123456','divPlugin')
         this.initVideoPlay(row.ip, row.port, row.account, row.password, 'divPlugin')
       },
@@ -1419,7 +1419,19 @@
         })
       },
       xiazag() {
-
+        var loadUrl = 'http://172.28.195.154:15010/prod-api/profile/HCWebSDKPluginsUserSetup.exe'
+        window.open(loadUrl, );
+       // const x = new XMLHttpRequest()
+       //   x.open('GET', 'http://192.168.9.240:5010/profile/HCWebSDKPluginsUserSetup.zip', true)
+       //   x.responseType = 'blob'
+       //   x.onload = function() {
+       //     const url = window.URL.createObjectURL(x.response)
+       //     const a = document.createElement('a')
+       //     a.href = 'http://192.168.9.240:5010/profile/HCWebSDKPluginsUserSetup.zip'
+       //     a.download = ''
+       //     a.click()
+       //   }
+       //   x.send()
       }
     }
   };

+ 1 - 1
ruoyi-ui/src/views/shipinggaoj/mqtt/index - 副本.vue

@@ -82,7 +82,7 @@ export default {
   },
 
   mounted(){
-   this.toggleConnection()
+   // this.toggleConnection()
   },
  destroyed() {
  	if (client) {

+ 1 - 1
ruoyi-ui/src/views/shipinggaoj/mqtt/index.vue

@@ -82,7 +82,7 @@ export default {
   },
 
   mounted(){
-   this.toggleConnection()
+   // this.toggleConnection()
   },
  destroyed() {
  	if (client) {

+ 3 - 2
ruoyi-ui/src/views/shipinggaoj/shebecanshu/index.vue

@@ -319,7 +319,7 @@ export default {
 
   },
   mounted() {
-  this.toggleConnection()
+  // this.toggleConnection()
      // this.webRtcServer = new WebRtcStreamer('video', location.protocol + '//' + this.camera_ip)
      //      //需要查看的rtsp地址,根据自己的摄像头传入对应的rtsp地址即可。注意:视频编码格式必须是H264的,否则无法正常显示,编码格式可在摄像头的后台更改
      //      this.webRtcServer.connect('rtsp://admin:zxy123456@192.168.101.64:554/h264/ch1/main/av_stream')
@@ -1165,7 +1165,8 @@ export default {
     	}
     },
     xiazag(){
-
+    var loadUrl = 'http://172.28.195.154:15010/prod-api/profile/HCWebSDKPluginsUserSetup.exe'
+    window.open(loadUrl, );
     }
   }
 };

+ 1 - 1
ruoyi-ui/src/views/shipinggaoj/shebecanshuhuabu/index.vue

@@ -149,7 +149,7 @@ export default {
       this.initCanvas();
       this.getImage();
     });
-    this.toggleConnection()
+    // this.toggleConnection()
     // this.mqttzz()
     // setTimeout(() => {
     // }, 500);