推送110问题修复

zengh

2021-09-01 29b139c875cadcb2314988dacf55fe7b845fa84e

推送110问题修复

 public/map/popup/html/FlareClusterLayer_v3 copy.html

@@ -251,6 +251,7 @@

    </script>
    <script>

        var me = new Vue({
            el: '#appliutwo',
            data: {
@@ -402,8 +403,8 @@
                    // }
                    axios.get(url).then((res) => {
                        console.log(typeof res,34234534345341)
                        var data = JSON.parse(res);// JSON转js
                        my.ourd = data.data;
                        var data = res;// JSON转js
                        my.ourd = data.data.data;
                        my.deptname = my.ourd.deptName;
                    })

@@ -421,6 +422,51 @@
                        },
                    });


                  if (that.ourd.manufacturers == "HK") {

                    axios({
                      method: "get",
                      url: `/api/blade-jfpts/equipment/equipment/selectEquimentPlayInfo?`,
                      params: {
                        number: that.ourd.deviceNumber,
                      },
                    }).then((res) => {
                      that.videoSource = res.data.data.data.url;
                      if (Hls.isSupported()) {
                        var dom = document.getElementById("real_video_conversation");
                        that.hls = new Hls();
                        var m3u8Url = decodeURIComponent(that.videoSource);
                        that.hls.loadSource(m3u8Url);
                        that.hls.attachMedia(dom);
                        that.hls.on(Hls.Events.MANIFEST_PARSED, function () {
                          dom.play();
                        });
                        that.hls.on(Hls.Events.ERROR, function (event, data) {
                          // console.log(data, 4566824159, "视频播放有问题！！！");
                          if (data.fatal) {
                            switch (data.type) {
                              case Hls.ErrorTypes.NETWORK_ERROR:
                                // try to recover network error
                                console.log(
                                  "fatal network error encountered, try to recover"
                                );
                                that.hls.startLoad();
                                break;
                              case Hls.ErrorTypes.MEDIA_ERROR:
                                console.log(
                                  "fatal media error encountered, try to recover"
                                );
                                that.hls.recoverMediaError();
                                break;
                            }
                          }
                        })
                      }
                    });


                  }else{
                    //this.form.serialNumber
                    newAxios
                        .post(
@@ -472,6 +518,8 @@
                                })
                        })
                }

                }
            },
            watch: {
                activeName() {

 public/realVideo/realtime-view-video.js

@@ -23,7 +23,7 @@
        dataType: 'JSON',
        url: "/api/blade-jfpts/equipment/equipment/selectEquimentPlayInfo?number=" + deviceNumber + "&bmp=" + "m3u8" + "&manufacturer=" + manufacturer,
        success: function (data) {
          realStartVideo($('.realtime-view-video-box video')[0], data.data.address)
          realStartVideo($('.realtime-view-video-box video')[0], data.data.data.url)
        }
      })
    }else {

 public/xcxjingqingmap/js/vueMain.js

@@ -192,7 +192,7 @@
                        `/api/blade-jfpts/equipment/equipment/selectEquimentPlayInfo?number=${deviceNumber}&bmp=m3u8&manufacturer=${manufacturer}`
                    )
                    .then((result) => {
                        that.videoSource = result.data.data.address;
                        that.videoSource = result.data.data.data.url;
                        that.shipingM3u8Url = decodeURIComponent(that.videoSource);
                        that.shipingPopupShow = true;
                    })

 public/xcxjingqingmapmany/js/vueMain.js

@@ -250,7 +250,7 @@
                        `/api/blade-jfpts/equipment/equipment/selectEquimentPlayInfo?number=${deviceNumber}&bmp=m3u8&manufacturer=${manufacturer}`
                    )
                    .then((result) => {
                        that.videoSource = result.data.data.address;
                        that.videoSource = result.data.data.data.url;
                        that.shipingM3u8Url = decodeURIComponent(that.videoSource);
                        that.shipingPopupShow = true;
                    })

 src/components/real-popup/main.vue

@@ -311,7 +311,8 @@
    },
    methods: {
        realOpenVideoDialog () {
            Recorder.getPermission().then(() => { });
        Recorder.getPermission().then(() => {
        });
            this.videoConversationReal = true;
        },
        // 视频通话打开关闭事件
@@ -325,6 +326,63 @@
                },
            });

        if (this.form.manufacturers == "HK") {

          axios({
            method: "get",
            url: `/api/blade-jfpts/equipment/equipment/selectEquimentPlayInfo?`,
            params: {
              number: that.form.deviceNumber,
            },
          }).then((data) => {
            console.log(data)
            that.videoSource = data.data.data.data.url;

            if (Hls.isSupported()) {
              var dom = document.getElementById("real_video_conversation");

              that.hls = new Hls();

              var m3u8Url = decodeURIComponent(that.videoSource);

              that.hls.loadSource(m3u8Url);

              that.hls.attachMedia(dom);

              that.hls.on(Hls.Events.MANIFEST_PARSED, function () {
                dom.play();
              });

              that.hls.on(Hls.Events.ERROR, function (event, data) {
                console.log(data, 4566824159, "视频播放有问题！！！");
                if (data.fatal) {
                  switch (data.type) {
                    case Hls.ErrorTypes.NETWORK_ERROR:
                      // try to recover network error
                      console.log(
                        "fatal network error encountered, try to recover"
                      );
                      that.hls.startLoad();
                      break;
                    case Hls.ErrorTypes.MEDIA_ERROR:
                      console.log(
                        "fatal media error encountered, try to recover"
                      );
                      that.hls.recoverMediaError();
                      break;
                    default:
                      // cannot recover
                      that.hls.destroy();
                      break;
                  }
                }
              });

            }

          });

        } else {
            //this.form.serialNumber
            newAxios
                .post(
@@ -386,6 +444,8 @@
                            }
                        });
                });
        }

        },
        closeRealVideoBox () {
            var dom = document.getElementById("real_video_conversation");
@@ -599,7 +659,8 @@
                                                    params: {
                                                        jid: row.id,
                                                    },
                                                }).then((resdata) => { });
                          }).then((resdata) => {
                          });
                                                //   that.onLoad(that.page, that.query);
                                                if (t == "办结") {
                                                    // location.reload();
@@ -626,10 +687,6 @@
                            }
                        })
                    })






                });
@@ -661,7 +718,8 @@
                            params: {
                                jid: row.id,
                            },
                        }).then((resdata) => { });
              }).then((resdata) => {
              });
                        //   that.onLoad(that.page, that.query);
                        if (t == "办结") {
                            // location.reload();

 src/views/dataL/dataL.vue

@@ -1195,7 +1195,7 @@
            `/api/blade-jfpts/equipment/equipment/selectEquimentPlayInfo?number=${deviceNumber}&bmp=m3u8&manufacturer=${manufacturer}`
          )
          .then((result) => {
            that.videoSource = result.data.data.address;
            that.videoSource = result.data.data.data.url;
            if (Hls.isSupported()) {
              var dom = document.getElementById(
                "real_video_conversationDataL"

 vue.config.js

@@ -36,7 +36,7 @@
    proxy: {
      '/api': {
        //本地服务接口地址
        //target: 'http://192.168.0.109:82/',
        //target: 'http://localhost:82/',
        target: 'https://web.byisf.com/api/',
        //远程演示服务地址,可用于直接启动项目
        //target: 'https://saber.bladex.vip/api',