From 29b139c875cadcb2314988dacf55fe7b845fa84e Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 01 Sep 2021 10:12:21 +0800
Subject: [PATCH] 推送110问题修复
---
public/realVideo/realtime-view-video.js | 2
public/xcxjingqingmap/js/vueMain.js | 4
vue.config.js | 2
public/map/popup/html/FlareClusterLayer_v3 copy.html | 160 +++-
src/views/dataL/dataL.vue | 2
public/xcxjingqingmapmany/js/vueMain.js | 6
src/components/real-popup/main.vue | 1546 +++++++++++++++++++++++++++-------------------------
7 files changed, 914 insertions(+), 808 deletions(-)
diff --git a/public/map/popup/html/FlareClusterLayer_v3 copy.html b/public/map/popup/html/FlareClusterLayer_v3 copy.html
index 303f372..f60bc73 100644
--- a/public/map/popup/html/FlareClusterLayer_v3 copy.html
+++ b/public/map/popup/html/FlareClusterLayer_v3 copy.html
@@ -202,12 +202,12 @@
<!-- <div class="r-b-t-main">
<span class="r-b-t-left">设备标签</span>
<span class="r-b-t-right">
- <div
- class="r-b-t-r-label"
- v-for="(value,index) in labels"
+ <div
+ class="r-b-t-r-label"
+ v-for="(value,index) in labels"
:key="index"
>
- {{value}}
+ {{value}}
</div>
</span>
</div> -->
@@ -251,6 +251,7 @@
</script>
<script>
+
var me = new Vue({
el: '#appliutwo',
data: {
@@ -309,7 +310,7 @@
}
// var imgdatas = imgD.data[0].paddress.split(',');
my.imgsl = imgdatas.length == 0 ? ['no'] : imgdatas;
- // my.imgsl = [ //最多3张照片
+ // my.imgsl = [ //最多3张照片
// "https://resource-city.sensoro.com/B8D675A3C4F71C5C8DE2FD764881BE57",
// "https://resource-city.sensoro.com/1723C1A66DB44F792564F3648E5AA1EE",
@@ -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;
})
@@ -411,7 +412,7 @@
handleClick(tab, event) {//标签tab点击事件
// console.log(tab, event);
},
- openRealVideoBox(serialNumber, channelNumber) {
+ openRealVideoBox(serialNumber, channelNumber) {
var that = this;
var newAxios = axios.create({
baseURL: "https://web.byisf.com:18000",
@@ -421,56 +422,103 @@
},
});
+
+ 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(
- "/api_control",
- {},
- {
- params: {
- param: JSON.stringify({ PktType: "GetAccessToken" }),
- },
+ .post(
+ "/api_control",
+ {},
+ {
+ params: {
+ param: JSON.stringify({ PktType: "GetAccessToken" }),
+ },
+ }
+ )
+ .then((res) => {
+ newAxios
+ .get(
+ `https://web.byisf.com:18000/GetPlayUrl?deviceCode=${serialNumber}&chl=${channelNumber}`
+ )
+ .then((result) => {
+ that.videoSource = result.data.data.m3u8;
+ 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;
+ }
+ }
+ })
}
- )
- .then((res) => {
- newAxios
- .get(
- `https://web.byisf.com:18000/GetPlayUrl?deviceCode=${serialNumber}&chl=${channelNumber}`
- )
- .then((result) => {
- that.videoSource = result.data.data.m3u8;
- 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;
- }
- }
- })
- }
- })
- })
+ })
+ })
+ }
+
}
},
watch: {
@@ -504,4 +552,4 @@
</script>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/public/realVideo/realtime-view-video.js b/public/realVideo/realtime-view-video.js
index 0bde041..977b407 100644
--- a/public/realVideo/realtime-view-video.js
+++ b/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 {
diff --git a/public/xcxjingqingmap/js/vueMain.js b/public/xcxjingqingmap/js/vueMain.js
index 0fe0a90..ceed950 100644
--- a/public/xcxjingqingmap/js/vueMain.js
+++ b/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;
})
@@ -248,4 +248,4 @@
},
wacth: {
}
-})
\ No newline at end of file
+})
diff --git a/public/xcxjingqingmapmany/js/vueMain.js b/public/xcxjingqingmapmany/js/vueMain.js
index 8a2bb31..db34041 100644
--- a/public/xcxjingqingmapmany/js/vueMain.js
+++ b/public/xcxjingqingmapmany/js/vueMain.js
@@ -180,7 +180,7 @@
// if (navigator.geolocation) {
// // console.log(navigator.geolocation)
// navigator.geolocation.getCurrentPosition(onSuccess, onError);
-
+
// } else {
// alert("您的浏览器不支持使用HTML 5来获取地理位置服务");
// }
@@ -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;
})
@@ -306,4 +306,4 @@
},
wacth: {
}
-})
\ No newline at end of file
+})
diff --git a/src/components/real-popup/main.vue b/src/components/real-popup/main.vue
index e3745ae..b829343 100644
--- a/src/components/real-popup/main.vue
+++ b/src/components/real-popup/main.vue
@@ -1,818 +1,876 @@
<template>
- <div>
- <el-dialog class="real-dialog"
- title="警情核实"
- :visible.sync="dialogTableVisible"
- :append-to-body="true"
- :close-on-click-modal="false"
- @opened="realOpenVideoDialog"
- @close="(videoConversationReal = false), (oldVideoSatart = false)">
- <el-dialog class="ss-video-dialog"
- :modal="false"
- width="100%"
- title="视频通话"
- :visible.sync="videoConversationReal"
- :close-on-press-escape="false"
- append-to-body
- @opened="openRealVideoBox"
- @close="closeRealVideoBox">
- <video src=""
- id="real_video_conversation"
- style="width: 100%; height: 100%; object-fit: fill"
- controls></video>
- </el-dialog>
+ <div>
+ <el-dialog class="real-dialog"
+ title="警情核实"
+ :visible.sync="dialogTableVisible"
+ :append-to-body="true"
+ :close-on-click-modal="false"
+ @opened="realOpenVideoDialog"
+ @close="(videoConversationReal = false), (oldVideoSatart = false)">
+ <el-dialog class="ss-video-dialog"
+ :modal="false"
+ width="100%"
+ title="视频通话"
+ :visible.sync="videoConversationReal"
+ :close-on-press-escape="false"
+ append-to-body
+ @opened="openRealVideoBox"
+ @close="closeRealVideoBox">
+ <video src=""
+ id="real_video_conversation"
+ style="width: 100%; height: 100%; object-fit: fill"
+ controls></video>
+ </el-dialog>
- <el-dialog class="ss-video-dialog"
- :modal="false"
- width="100%"
- title="历史回放"
- :visible.sync="oldVideoSatart"
- :close-on-press-escape="false"
- append-to-body
- @opened="openOldVideoBox"
- @close="closeOldVideoBox">
- <video src="/oldVideo/ft.mp4"
- muted="muted"
- autoplay="autoplay"
- loop
- id="real_old_video"
- style="width: 100%; height: 100%; object-fit: fill"
- controls></video>
- </el-dialog>
+ <el-dialog class="ss-video-dialog"
+ :modal="false"
+ width="100%"
+ title="历史回放"
+ :visible.sync="oldVideoSatart"
+ :close-on-press-escape="false"
+ append-to-body
+ @opened="openOldVideoBox"
+ @close="closeOldVideoBox">
+ <video src="/oldVideo/ft.mp4"
+ muted="muted"
+ autoplay="autoplay"
+ loop
+ id="real_old_video"
+ style="width: 100%; height: 100%; object-fit: fill"
+ controls></video>
+ </el-dialog>
- <el-form :model="form"
- label-position="right"
- size="mini"
- label-width="100px">
- <el-row>
- <el-col span="12">
- <audio src=""
- id="real_audio"></audio>
- <el-form-item label="报警人">
- <el-input disabled="true"
- v-model="form.galarmPeople"
- autocomplete="off"></el-input>
- </el-form-item>
- </el-col>
- <el-col span="12">
- <el-form-item label="报警人电话">
- <el-input disabled="true"
- v-model="form.phoneNumber"
- autocomplete="off"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col span="12">
- <el-form-item label="负责人">
- <el-select v-model="peopleName"
- placeholder="请选择"
- @change="peopleOrPhone"
- style="width: 100%">
- <el-option v-for="item in peopleList"
- :key="item.value"
- :label="item.label"
- :value="item.label">
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col span="12">
- <el-form-item label="负责人电话">
- <el-input disabled="true"
- v-model="peoplePhone"
- autocomplete="off"
- style="width: calc(100% - 110px)"></el-input>
- <el-button type="success"
- style="
+ <el-form :model="form"
+ label-position="right"
+ size="mini"
+ label-width="100px">
+ <el-row>
+ <el-col span="12">
+ <audio src=""
+ id="real_audio"></audio>
+ <el-form-item label="报警人">
+ <el-input disabled="true"
+ v-model="form.galarmPeople"
+ autocomplete="off"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col span="12">
+ <el-form-item label="报警人电话">
+ <el-input disabled="true"
+ v-model="form.phoneNumber"
+ autocomplete="off"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col span="12">
+ <el-form-item label="负责人">
+ <el-select v-model="peopleName"
+ placeholder="请选择"
+ @change="peopleOrPhone"
+ style="width: 100%">
+ <el-option v-for="item in peopleList"
+ :key="item.value"
+ :label="item.label"
+ :value="item.label">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col span="12">
+ <el-form-item label="负责人电话">
+ <el-input disabled="true"
+ v-model="peoplePhone"
+ autocomplete="off"
+ style="width: calc(100% - 110px)"></el-input>
+ <el-button type="success"
+ style="
margin-left: 10px;
padding: 0px 8px;
width: 100px;
height: 28px;
vertical-align: top;
">
- <i class="el-icon-phone-outline"></i>
- 联系负责人
- </el-button>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col span="12">
- <el-form-item label="省份"
- class="cityClassParams">
- <avue-form :option="itemOption"
- v-model="form"></avue-form>
- </el-form-item>
- </el-col>
- <el-col span="12">
- <el-form-item label="事发地址">
- <el-input disabled="true"
- v-model="form.place"
- autocomplete="off"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col span="12">
- <el-form-item label="警情类型">
- <el-input disabled="true"
- v-model="form.waringType"
- autocomplete="off"></el-input>
- </el-form-item>
- </el-col>
- <el-col span="12">
- <el-form-item label="设备编号">
- <el-input disabled="true"
- v-model="form.deviceNumber"
- autocomplete="off"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col span="12">
- <el-form-item label="接警人">
- <el-input disabled="true"
- v-model="form.alarmPeople"
- autocomplete="off"></el-input>
- </el-form-item>
- </el-col>
- <el-col span="12">
- <el-form-item label="报警内容">
- <el-input disabled="true"
- v-model="form.content"
- autocomplete="off"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col span="12">
- <el-form-item label="报警时间">
- <el-input disabled="true"
- v-model="form.alarmTime"
- autocomplete="off"></el-input>
- </el-form-item>
- </el-col>
- <el-col span="12">
- <el-form-item label="监控视频">
- <el-button :class="{ active: isActive }"
- type="success"
- @click.stop="
+ <i class="el-icon-phone-outline"></i>
+ 联系负责人
+ </el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col span="12">
+ <el-form-item label="省份"
+ class="cityClassParams">
+ <avue-form :option="itemOption"
+ v-model="form"></avue-form>
+ </el-form-item>
+ </el-col>
+ <el-col span="12">
+ <el-form-item label="事发地址">
+ <el-input disabled="true"
+ v-model="form.place"
+ autocomplete="off"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col span="12">
+ <el-form-item label="警情类型">
+ <el-input disabled="true"
+ v-model="form.waringType"
+ autocomplete="off"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col span="12">
+ <el-form-item label="设备编号">
+ <el-input disabled="true"
+ v-model="form.deviceNumber"
+ autocomplete="off"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col span="12">
+ <el-form-item label="接警人">
+ <el-input disabled="true"
+ v-model="form.alarmPeople"
+ autocomplete="off"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col span="12">
+ <el-form-item label="报警内容">
+ <el-input disabled="true"
+ v-model="form.content"
+ autocomplete="off"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col span="12">
+ <el-form-item label="报警时间">
+ <el-input disabled="true"
+ v-model="form.alarmTime"
+ autocomplete="off"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col span="12">
+ <el-form-item label="监控视频">
+ <el-button :class="{ active: isActive }"
+ type="success"
+ @click.stop="
(videoConversationReal = true), (oldVideoSatart = false)
"
- @mousedown.native="aKeyToCall"
- @mouseup.native="aKeyStopCall">视频通话
- </el-button>
- <el-button v-show="false"
- type="primary"
- @click.stop="
+ @mousedown.native="aKeyToCall"
+ @mouseup.native="aKeyStopCall">视频通话
+ </el-button>
+ <el-button v-show="false"
+ type="primary"
+ @click.stop="
(oldVideoSatart = true), (videoConversationReal = false)
">查看历史
- </el-button>
- </el-form-item>
- </el-col>
- </el-row>
+ </el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
- <el-row>
- <el-col span="12">
- <el-form-item label="备注">
- <el-input v-model="form.bz"
- autocomplete="off"></el-input>
- </el-form-item>
+ <el-row>
+ <el-col span="12">
+ <el-form-item label="备注">
+ <el-input v-model="form.bz"
+ autocomplete="off"></el-input>
+ </el-form-item>
- </el-col>
+ </el-col>
- <el-col span="12">
- <el-form-item label="报警类型">
- <el-select v-model="form.alarmlb"
- placeholder="请选择"
- style="width: 100%">
- <el-option v-for="item in bjoptions"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
+ <el-col span="12">
+ <el-form-item label="报警类型">
+ <el-select v-model="form.alarmlb"
+ placeholder="请选择"
+ style="width: 100%">
+ <el-option v-for="item in bjoptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
- <el-row :align="center">
- <el-col class="opt-btn">
- <el-form-item>
- <!-- <el-button
- :class="{ active: isActive }"
- type="success"
- @click.stop="aKeyToCall($event, form)"
- >查看视频
- </el-button> -->
- <el-button type="success"
- @click.stop="updateJtyep(form, 2, '办结')">办结
- </el-button>
+ <el-row :align="center">
+ <el-col class="opt-btn">
+ <el-form-item>
+ <!-- <el-button
+ :class="{ active: isActive }"
+ type="success"
+ @click.stop="aKeyToCall($event, form)"
+ >查看视频
+</el-button> -->
+ <el-button type="success"
+ @click.stop="updateJtyep(form, 2, '办结')">办结
+ </el-button>
- <img src="/img/police-num.png"
- style="margin-top: -20px; height: 80px; vertical-align: middle"
- alt=""
- @click.stop="updateJtyep(form, 1, '推送110')" />
+ <img src="/img/police-num.png"
+ style="margin-top: -20px; height: 80px; vertical-align: middle"
+ alt=""
+ @click.stop="updateJtyep(form, 1, '推送110')"/>
- <el-button type="primary"
- @click.stop="updateJtyep(form, 1, '派送保安')">派送保安
- </el-button>
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
- </el-dialog>
- </div>
+ <el-button type="primary"
+ @click.stop="updateJtyep(form, 1, '派送保安')">派送保安
+ </el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </el-dialog>
+ </div>
</template>
<script>
-import Hls from "hls.js";
+ import Hls from "hls.js";
-import axios from "axios";
+ import axios from "axios";
-import Recorder from "js-audio-recorder";
+ import Recorder from "js-audio-recorder";
-export default {
+ export default {
name: "realPopup",
- data () {
- return {
- bjoptions: [{
- value: '刑事',
- label: '刑事'
- }, {
- value: '治安',
- label: '治安'
- }, {
- value: '火警',
- label: '火警'
- }],
- dialogTableVisible: false,
- videoConversationReal: false,
- oldVideoSatart: false,
- form: {},
- peopleList: [],
- peopleName: "",
- peoplePhone: "",
+ data() {
+ return {
+ bjoptions: [{
+ value: '刑事',
+ label: '刑事'
+ }, {
+ value: '治安',
+ label: '治安'
+ }, {
+ value: '火警',
+ label: '火警'
+ }],
+ dialogTableVisible: false,
+ videoConversationReal: false,
+ oldVideoSatart: false,
+ form: {},
+ peopleList: [],
+ peopleName: "",
+ peoplePhone: "",
- itemOption: {
- menuBtn: false,
- column: [
- {
- disabled: true,
- row: false,
- prop: "province",
- type: "select",
- placeholder: "省份",
- props: {
- label: "name",
- value: "code",
- },
- cascaderItem: ["city", "district"],
- dicUrl: "/api/blade-system/region/select",
- span: 1,
- labelWidth: "0",
- className: "cityClassSelect",
- },
- {
- disabled: true,
- row: false,
- prop: "city",
- type: "select",
- placeholder: "地市",
- props: {
- label: "name",
- value: "code",
- },
- dicUrl: "/api/blade-system/region/select?code={{key}}",
- span: 1,
- labelWidth: "0",
- className: "cityClassSelect",
- },
- {
- disabled: true,
- row: false,
- prop: "district",
- type: "select",
- placeholder: "区县",
- props: {
- label: "name",
- value: "code",
- },
- dicUrl: "/api/blade-system/region/select?code={{key}}",
- span: 1,
- labelWidth: "0",
- className: "cityClassSelect",
- },
- ],
+ itemOption: {
+ menuBtn: false,
+ column: [
+ {
+ disabled: true,
+ row: false,
+ prop: "province",
+ type: "select",
+ placeholder: "省份",
+ props: {
+ label: "name",
+ value: "code",
+ },
+ cascaderItem: ["city", "district"],
+ dicUrl: "/api/blade-system/region/select",
+ span: 1,
+ labelWidth: "0",
+ className: "cityClassSelect",
},
- isActive: false,
- };
+ {
+ disabled: true,
+ row: false,
+ prop: "city",
+ type: "select",
+ placeholder: "地市",
+ props: {
+ label: "name",
+ value: "code",
+ },
+ dicUrl: "/api/blade-system/region/select?code={{key}}",
+ span: 1,
+ labelWidth: "0",
+ className: "cityClassSelect",
+ },
+ {
+ disabled: true,
+ row: false,
+ prop: "district",
+ type: "select",
+ placeholder: "区县",
+ props: {
+ label: "name",
+ value: "code",
+ },
+ dicUrl: "/api/blade-system/region/select?code={{key}}",
+ span: 1,
+ labelWidth: "0",
+ className: "cityClassSelect",
+ },
+ ],
+ },
+ isActive: false,
+ };
},
methods: {
- realOpenVideoDialog () {
- Recorder.getPermission().then(() => { });
- this.videoConversationReal = true;
- },
- // 视频通话打开关闭事件
- openRealVideoBox () {
- var that = this;
- var newAxios = axios.create({
- baseURL: "https://web.byisf.com:18000",
- withCredentials: false,
- headers: {
- "Content-type": "application/x-www-form-urlencoded",
- },
- });
+ realOpenVideoDialog() {
+ Recorder.getPermission().then(() => {
+ });
+ this.videoConversationReal = true;
+ },
+ // 视频通话打开关闭事件
+ openRealVideoBox() {
+ var that = this;
+ var newAxios = axios.create({
+ baseURL: "https://web.byisf.com:18000",
+ withCredentials: false,
+ headers: {
+ "Content-type": "application/x-www-form-urlencoded",
+ },
+ });
- //this.form.serialNumber
- newAxios
- .post(
- "/api_control",
- {},
- {
- params: {
- param: JSON.stringify({ PktType: "GetAccessToken" }),
- },
- }
- )
- .then((res) => {
- newAxios
- .get(
- `https://web.byisf.com:18000/GetPlayUrl?deviceCode=${that.form.serialNumber}&chl=${this.form.channelNumber}`
- )
- .then((result) => {
- that.videoSource = result.data.data.m3u8;
+ if (this.form.manufacturers == "HK") {
- if (Hls.isSupported()) {
- var dom = document.getElementById("real_video_conversation");
+ 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;
- that.hls = new Hls();
+ if (Hls.isSupported()) {
+ var dom = document.getElementById("real_video_conversation");
- var m3u8Url = decodeURIComponent(that.videoSource);
+ that.hls = new Hls();
- that.hls.loadSource(m3u8Url);
+ var m3u8Url = decodeURIComponent(that.videoSource);
- that.hls.attachMedia(dom);
+ that.hls.loadSource(m3u8Url);
- that.hls.on(Hls.Events.MANIFEST_PARSED, function () {
- dom.play();
- });
+ that.hls.attachMedia(dom);
- 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;
- }
- }
- });
- }
- });
- });
- },
- closeRealVideoBox () {
- var dom = document.getElementById("real_video_conversation");
+ that.hls.on(Hls.Events.MANIFEST_PARSED, function () {
+ dom.play();
+ });
- if (dom.getAttribute("src") != "") {
- dom.pause();
-
- dom.setAttribute("src", "");
-
- this.hls.destroy();
- }
- },
- // 历史视频打开关闭事件
- openOldVideoBox () {
- var dom = document.getElementById("real_old_video");
- dom.currentTime = 0;
- dom.play();
- },
- closeOldVideoBox () {
- var dom = document.getElementById("real_old_video");
- dom.pause();
- },
-
- aKeyToCall () {
- this.isActive = true;
- var that = this;
- if (this.recorder == null) {
- this.recorder = new Recorder({
- sampleBits: 16, // 采样位数，支持 8 或 16，默认是16
- sampleRate: 8000, // 采样率，支持 11025、16000、22050、24000、44100、48000，根据浏览器默认值，我的chrome是48000
- numChannels: 1, // 声道，支持 1 或 2， 默认是1
- // compiling: false,(0.x版本中生效,1.x增加中) // 是否边录边转换，默认是false
- });
- }
-
- // 一键呼叫相关函数
- that.recorder.start().then(
- () => {
- // 开始录音
- },
- (error) => {
- // 出错了
- console.log(`${error.name} : ${error.message}`);
+ 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;
+ }
}
- );
- },
+ });
- // 序列号后期待修改
- aKeyStopCall () {
- this.isActive = false;
- var newCallAxios = axios.create({
- baseURL: "https://web.byisf.com:18000",
- withCredentials: false,
- headers: {
- "Content-Type": "application/json;",
+ }
+
+ });
+
+ } else {
+ //this.form.serialNumber
+ newAxios
+ .post(
+ "/api_control",
+ {},
+ {
+ params: {
+ param: JSON.stringify({PktType: "GetAccessToken"}),
},
- });
-
- var that = this;
-
- newCallAxios
- .post(
- `/api_control`,
- {},
- {
- params: {
- param: { PktType: "GetAccessToken" },
- },
- }
+ }
+ )
+ .then((res) => {
+ newAxios
+ .get(
+ `https://web.byisf.com:18000/GetPlayUrl?deviceCode=${that.form.serialNumber}&chl=${this.form.channelNumber}`
)
.then((result) => {
- var formData = new FormData();
- // that.recorder.downloadWAV("新文件");
+ that.videoSource = result.data.data.m3u8;
- var blob = that.recorder.getPCMBlob(); //获取pcm格式音频数据
- //此处获取到blob对象后需要设置fileName满足当前项目上传需求，其它项目可直接传把blob作为file塞入formData
- var newbolb = new Blob([blob], { type: "audio/pcm" });
- var fileOfBlob = new File([newbolb], new Date().getTime() + ".pcm");
- formData.append("file", fileOfBlob);
+ if (Hls.isSupported()) {
+ var dom = document.getElementById("real_video_conversation");
- var wavBlob = that.recorder.getWAVBlob();
+ that.hls = new Hls();
- var wavformData = new FormData();
- var wavform = new File([wavBlob], new Date().getTime() + ".wav");
- wavformData.append("file", wavform);
- console.log(
- wavBlob,
- wavform,
- wavformData,
- wavformData.entries(),
- 132
- );
+ var m3u8Url = decodeURIComponent(that.videoSource);
- axios({
- method: "post",
- url: "/api/blade-jfpts/xlfeedback/xlfeedback/put-objecty",
- data: wavformData,
- params: {
- jid: that.form.id,
- },
- }).then((resdata) => {
- console.log(resdata);
+ that.hls.loadSource(m3u8Url);
+
+ that.hls.attachMedia(dom);
+
+ that.hls.on(Hls.Events.MANIFEST_PARSED, function () {
+ dom.play();
});
- newCallAxios
- .post(`/api_control`, blob, {
- params: {
- param: {
- PktType: "Talk",
- accessToken: result.data.data.accessToken,
- deviceCode: this.form.serialNumber,
- },
- },
- })
- .then(() => {
- that.recorder.destroy().then(function () {
- that.recorder = null;
- });
- });
- });
- },
-
- peopleOrPhone (e) {
- this.peopleList.forEach((item) => {
- if (item.label == e) {
- this.peoplePhone = item.value;
- }
- });
- },
- updateJtyep (row, jtype, t) {
- var that = this;
- if (t == '推送110') {
-
- if (row.alarmlb == null) {
- that.$message("请选择报警类型")
- return
- }
-
- axios({
- method: 'post',
- url: 'https://web.byisf.com/yjbjts/getToken',
- data: {
- accessKey: 'admin',
- secretKey: 'ncfkNB@123'
- }
- }).then(res => {
- var newAxios = axios.create({
- baseURL: "https://web.byisf.com/yjbjts/",
- withCredentials: false,
- headers: {
- "Authorization": res.data.token,
- },
- });
- axios({
- method: 'get',
- url: '/api/blade-system/dict-biz/dictionary?code=manufacturers',
- }).then(data => {
-
- data.data.data.forEach(item => {
- if (item.dictKey == row.manufacturers) {
- newAxios({
- method: 'post',
- url: '/system/onebuttonalarm',
- headers: {
- "Authorization": res.data.token
- },
- data: {
- yhmc: row.deptName,
- lxdh: row.phoneNumber,
- dwfzrxm: row.oneContacts,
- dwfzrsj: row.onePhone,
- sf: row.$province,
- yhdz: row.place,
- bjlx: row.alarmlb,
- sbbh: row.deviceNumber,
- jjr: row.alarmPeople,
- bjnr: row.content,
- bjsj: row.jjTime,
- bz: row.bz,
- ckcjmc: item.dictValue,
- xzb:row.jd,
- yzb:row.wd
- // ckcjbh:
- }
- }).then(result => {
- if (result.data.code == 200) {
- axios
- .post(
- "/api/blade-jfpts/alarm/alarm/updateJtype",
- {},
- {
- params: {
- jid: row.id,
- jtype: jtype,
- rid: row.alarmId,
- bz: row.bz,
- snumber: row.alarmId,
- sname: row.alarmPeople,
- zc: t,
- zctime: that.getDate().current,
- deviceNumber: row.deviceNumber,
- alarmlb: row.alarmlb
- },
- }
- )
- .then(function () {
- that.dialogTableVisible = false;
- axios({
- method: "post",
- url: `/api/blade-jfpts/rvideo/stop`,
- params: {
- jid: row.id,
- },
- }).then((resdata) => { });
- // that.onLoad(that.page, that.query);
- if (t == "办结") {
- // location.reload();
- that.$router.push({
- path: "/real-popup/kongbai",
- query: that.form,
- });
- setTimeout(() => {
- that.$router.push({
- path: "/realTimePolice/real",
- query: that.form,
- });
- }, 10);
-
- } else {
- that.$router.push({
- path: "/policeTracking/track",
- query: that.form,
- });
- }
- });
- }
- });
- }
- })
- })
-
-
-
-
-
-
- });
-
- } else {
- axios
- .post(
- "/api/blade-jfpts/alarm/alarm/updateJtype",
- {},
- {
- params: {
- jid: row.id,
- jtype: jtype,
- rid: row.alarmId,
- bz: row.bz,
- snumber: row.alarmId,
- sname: row.alarmPeople,
- zc: t,
- zctime: that.getDate().current,
- deviceNumber: row.deviceNumber
- },
+ 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;
}
- )
- .then(function () {
- that.dialogTableVisible = false;
- axios({
+ }
+ });
+ }
+ });
+ });
+ }
+
+ },
+ closeRealVideoBox() {
+ var dom = document.getElementById("real_video_conversation");
+
+ if (dom.getAttribute("src") != "") {
+ dom.pause();
+
+ dom.setAttribute("src", "");
+
+ this.hls.destroy();
+ }
+ },
+ // 历史视频打开关闭事件
+ openOldVideoBox() {
+ var dom = document.getElementById("real_old_video");
+ dom.currentTime = 0;
+ dom.play();
+ },
+ closeOldVideoBox() {
+ var dom = document.getElementById("real_old_video");
+ dom.pause();
+ },
+
+ aKeyToCall() {
+ this.isActive = true;
+ var that = this;
+ if (this.recorder == null) {
+ this.recorder = new Recorder({
+ sampleBits: 16, // 采样位数，支持 8 或 16，默认是16
+ sampleRate: 8000, // 采样率，支持 11025、16000、22050、24000、44100、48000，根据浏览器默认值，我的chrome是48000
+ numChannels: 1, // 声道，支持 1 或 2， 默认是1
+ // compiling: false,(0.x版本中生效,1.x增加中) // 是否边录边转换，默认是false
+ });
+ }
+
+ // 一键呼叫相关函数
+ that.recorder.start().then(
+ () => {
+ // 开始录音
+ },
+ (error) => {
+ // 出错了
+ console.log(`${error.name} : ${error.message}`);
+ }
+ );
+ },
+
+ // 序列号后期待修改
+ aKeyStopCall() {
+ this.isActive = false;
+ var newCallAxios = axios.create({
+ baseURL: "https://web.byisf.com:18000",
+ withCredentials: false,
+ headers: {
+ "Content-Type": "application/json;",
+ },
+ });
+
+ var that = this;
+
+ newCallAxios
+ .post(
+ `/api_control`,
+ {},
+ {
+ params: {
+ param: {PktType: "GetAccessToken"},
+ },
+ }
+ )
+ .then((result) => {
+ var formData = new FormData();
+ // that.recorder.downloadWAV("新文件");
+
+ var blob = that.recorder.getPCMBlob(); //获取pcm格式音频数据
+ //此处获取到blob对象后需要设置fileName满足当前项目上传需求，其它项目可直接传把blob作为file塞入formData
+ var newbolb = new Blob([blob], {type: "audio/pcm"});
+ var fileOfBlob = new File([newbolb], new Date().getTime() + ".pcm");
+ formData.append("file", fileOfBlob);
+
+ var wavBlob = that.recorder.getWAVBlob();
+
+ var wavformData = new FormData();
+ var wavform = new File([wavBlob], new Date().getTime() + ".wav");
+ wavformData.append("file", wavform);
+ console.log(
+ wavBlob,
+ wavform,
+ wavformData,
+ wavformData.entries(),
+ 132
+ );
+
+ axios({
+ method: "post",
+ url: "/api/blade-jfpts/xlfeedback/xlfeedback/put-objecty",
+ data: wavformData,
+ params: {
+ jid: that.form.id,
+ },
+ }).then((resdata) => {
+ console.log(resdata);
+ });
+
+ newCallAxios
+ .post(`/api_control`, blob, {
+ params: {
+ param: {
+ PktType: "Talk",
+ accessToken: result.data.data.accessToken,
+ deviceCode: this.form.serialNumber,
+ },
+ },
+ })
+ .then(() => {
+ that.recorder.destroy().then(function () {
+ that.recorder = null;
+ });
+ });
+ });
+ },
+
+ peopleOrPhone(e) {
+ this.peopleList.forEach((item) => {
+ if (item.label == e) {
+ this.peoplePhone = item.value;
+ }
+ });
+ },
+ updateJtyep(row, jtype, t) {
+ var that = this;
+ if (t == '推送110') {
+
+ if (row.alarmlb == null) {
+ that.$message("请选择报警类型")
+ return
+ }
+
+ axios({
+ method: 'post',
+ url: 'https://web.byisf.com/yjbjts/getToken',
+ data: {
+ accessKey: 'admin',
+ secretKey: 'ncfkNB@123'
+ }
+ }).then(res => {
+ var newAxios = axios.create({
+ baseURL: "https://web.byisf.com/yjbjts/",
+ withCredentials: false,
+ headers: {
+ "Authorization": res.data.token,
+ },
+ });
+ axios({
+ method: 'get',
+ url: '/api/blade-system/dict-biz/dictionary?code=manufacturers',
+ }).then(data => {
+
+ data.data.data.forEach(item => {
+ if (item.dictKey == row.manufacturers) {
+ newAxios({
+ method: 'post',
+ url: '/system/onebuttonalarm',
+ headers: {
+ "Authorization": res.data.token
+ },
+ data: {
+ yhmc: row.deptName,
+ lxdh: row.phoneNumber,
+ dwfzrxm: row.oneContacts,
+ dwfzrsj: row.onePhone,
+ sf: row.$province,
+ yhdz: row.place,
+ bjlx: row.alarmlb,
+ sbbh: row.deviceNumber,
+ jjr: row.alarmPeople,
+ bjnr: row.content,
+ bjsj: row.jjTime,
+ bz: row.bz,
+ ckcjmc: item.dictValue,
+ xzb: row.jd,
+ yzb: row.wd
+ // ckcjbh:
+ }
+ }).then(result => {
+ if (result.data.code == 200) {
+ axios
+ .post(
+ "/api/blade-jfpts/alarm/alarm/updateJtype",
+ {},
+ {
+ params: {
+ jid: row.id,
+ jtype: jtype,
+ rid: row.alarmId,
+ bz: row.bz,
+ snumber: row.alarmId,
+ sname: row.alarmPeople,
+ zc: t,
+ zctime: that.getDate().current,
+ deviceNumber: row.deviceNumber,
+ alarmlb: row.alarmlb
+ },
+ }
+ )
+ .then(function () {
+ that.dialogTableVisible = false;
+ axios({
method: "post",
url: `/api/blade-jfpts/rvideo/stop`,
params: {
- jid: row.id,
+ jid: row.id,
},
- }).then((resdata) => { });
- // that.onLoad(that.page, that.query);
- if (t == "办结") {
+ }).then((resdata) => {
+ });
+ // that.onLoad(that.page, that.query);
+ if (t == "办结") {
// location.reload();
that.$router.push({
- path: "/real-popup/kongbai",
- query: that.form,
+ path: "/real-popup/kongbai",
+ query: that.form,
});
setTimeout(() => {
- that.$router.push({
- path: "/realTimePolice/real",
- // query: that.form,
- });
+ that.$router.push({
+ path: "/realTimePolice/real",
+ query: that.form,
+ });
}, 10);
- } else {
+ } else {
that.$router.push({
- path: "/policeTracking/track",
- query: that.form,
+ path: "/policeTracking/track",
+ query: that.form,
});
- }
- });
- }
+ }
+ });
+ }
+ });
+ }
+ })
+ })
- },
- getDate () {
- // 当前时间
- var timestamp = Date.parse(new Date());
- var serverDate = new Date(timestamp);
- // 本周周一的时间
- var mondayTime =
- timestamp - (serverDate.getDay() - 1) * 24 * 60 * 60 * 1000;
- var mondayData = new Date(mondayTime);
- //年
- var mondayY = mondayData.getFullYear();
- //月
- var mondayM =
- mondayData.getMonth() + 1 < 10
- ? "0" + (mondayData.getMonth() + 1)
- : mondayData.getMonth() + 1;
- //日
- var mondayD =
- mondayData.getDate() < 10
- ? "0" + mondayData.getDate()
- : mondayData.getDate();
- // 当前时间
- var currentData = new Date(timestamp);
- //年
- var currentY = currentData.getFullYear();
- //月
- var currentM =
- currentData.getMonth() + 1 < 10
- ? "0" + (currentData.getMonth() + 1)
- : currentData.getMonth() + 1;
- //日
- var currentD =
- currentData.getDate() < 10
- ? "0" + currentData.getDate()
- : currentData.getDate();
- //时
- var currenH =
- currentData.getHours() < 10
- ? "0" + currentData.getHours()
- : currentData.getHours();
- //分
- var currenM =
- currentData.getMinutes() < 10
- ? "0" + currentData.getMinutes()
- : currentData.getMinutes();
- //秒
- var currenS =
- currentData.getSeconds() < 10
- ? "0" + currentData.getSeconds()
- : currentData.getSeconds();
+ });
- return {
- day: {
- beginTime: currentY + "-" + currentM + "-" + currentD + " 00:00:00",
- endTime:
- currentY +
- "-" +
- currentM +
- "-" +
- currentD +
- " " +
- currenH +
- ":" +
- currenM +
- ":00",
+ } else {
+ axios
+ .post(
+ "/api/blade-jfpts/alarm/alarm/updateJtype",
+ {},
+ {
+ params: {
+ jid: row.id,
+ jtype: jtype,
+ rid: row.alarmId,
+ bz: row.bz,
+ snumber: row.alarmId,
+ sname: row.alarmPeople,
+ zc: t,
+ zctime: that.getDate().current,
+ deviceNumber: row.deviceNumber
},
- week: {
- beginTime: mondayY + "-" + mondayM + "-" + mondayD + " 00:00:00",
- endTime:
- currentY +
- "-" +
- currentM +
- "-" +
- currentD +
- " " +
- currenH +
- ":" +
- currenM +
- ":00",
+ }
+ )
+ .then(function () {
+ that.dialogTableVisible = false;
+ axios({
+ method: "post",
+ url: `/api/blade-jfpts/rvideo/stop`,
+ params: {
+ jid: row.id,
},
- month: {
- beginTime: mondayY + "-" + mondayM + "-01 00:00:00",
- endTime:
- currentY +
- "-" +
- currentM +
- "-" +
- currentD +
- " " +
- currenH +
- ":" +
- currenM +
- ":00",
- },
- current:
- currentY +
- "-" +
- currentM +
- "-" +
- currentD +
- " " +
- currenH +
- ":" +
- currenM +
- ":" +
- currenS,
- };
- },
- onItemGetParentData: function (row) {
- // 该方法是用于接收父组件传递过来的参数
- // 接收到参数后的具体操作
- this.form = row;
- this.peopleList = [
- { label: row.oneContacts, value: row.onePhone },
- { label: row.twoContacts, value: row.twoPhone },
- { label: row.threeContacts, value: row.threePhone },
- ];
- this.peopleName = row.oneContacts;
- this.peoplePhone = row.onePhone;
- this.dialogTableVisible = true;
- },
+ }).then((resdata) => {
+ });
+ // that.onLoad(that.page, that.query);
+ if (t == "办结") {
+ // location.reload();
+ that.$router.push({
+ path: "/real-popup/kongbai",
+ query: that.form,
+ });
+ setTimeout(() => {
+ that.$router.push({
+ path: "/realTimePolice/real",
+ // query: that.form,
+ });
+ }, 10);
+
+ } else {
+ that.$router.push({
+ path: "/policeTracking/track",
+ query: that.form,
+ });
+ }
+ });
+ }
+
+ },
+ getDate() {
+ // 当前时间
+ var timestamp = Date.parse(new Date());
+ var serverDate = new Date(timestamp);
+
+ // 本周周一的时间
+ var mondayTime =
+ timestamp - (serverDate.getDay() - 1) * 24 * 60 * 60 * 1000;
+ var mondayData = new Date(mondayTime);
+ //年
+ var mondayY = mondayData.getFullYear();
+ //月
+ var mondayM =
+ mondayData.getMonth() + 1 < 10
+ ? "0" + (mondayData.getMonth() + 1)
+ : mondayData.getMonth() + 1;
+ //日
+ var mondayD =
+ mondayData.getDate() < 10
+ ? "0" + mondayData.getDate()
+ : mondayData.getDate();
+ // 当前时间
+ var currentData = new Date(timestamp);
+ //年
+ var currentY = currentData.getFullYear();
+ //月
+ var currentM =
+ currentData.getMonth() + 1 < 10
+ ? "0" + (currentData.getMonth() + 1)
+ : currentData.getMonth() + 1;
+ //日
+ var currentD =
+ currentData.getDate() < 10
+ ? "0" + currentData.getDate()
+ : currentData.getDate();
+ //时
+ var currenH =
+ currentData.getHours() < 10
+ ? "0" + currentData.getHours()
+ : currentData.getHours();
+ //分
+ var currenM =
+ currentData.getMinutes() < 10
+ ? "0" + currentData.getMinutes()
+ : currentData.getMinutes();
+ //秒
+ var currenS =
+ currentData.getSeconds() < 10
+ ? "0" + currentData.getSeconds()
+ : currentData.getSeconds();
+
+ return {
+ day: {
+ beginTime: currentY + "-" + currentM + "-" + currentD + " 00:00:00",
+ endTime:
+ currentY +
+ "-" +
+ currentM +
+ "-" +
+ currentD +
+ " " +
+ currenH +
+ ":" +
+ currenM +
+ ":00",
+ },
+ week: {
+ beginTime: mondayY + "-" + mondayM + "-" + mondayD + " 00:00:00",
+ endTime:
+ currentY +
+ "-" +
+ currentM +
+ "-" +
+ currentD +
+ " " +
+ currenH +
+ ":" +
+ currenM +
+ ":00",
+ },
+ month: {
+ beginTime: mondayY + "-" + mondayM + "-01 00:00:00",
+ endTime:
+ currentY +
+ "-" +
+ currentM +
+ "-" +
+ currentD +
+ " " +
+ currenH +
+ ":" +
+ currenM +
+ ":00",
+ },
+ current:
+ currentY +
+ "-" +
+ currentM +
+ "-" +
+ currentD +
+ " " +
+ currenH +
+ ":" +
+ currenM +
+ ":" +
+ currenS,
+ };
+ },
+ onItemGetParentData: function (row) {
+ // 该方法是用于接收父组件传递过来的参数
+ // 接收到参数后的具体操作
+ this.form = row;
+ this.peopleList = [
+ {label: row.oneContacts, value: row.onePhone},
+ {label: row.twoContacts, value: row.twoPhone},
+ {label: row.threeContacts, value: row.threePhone},
+ ];
+ this.peopleName = row.oneContacts;
+ this.peoplePhone = row.onePhone;
+ this.dialogTableVisible = true;
+ },
},
-};
+ };
</script>
<style lang="scss">
-.el-button.active {
+ .el-button.active {
background: #ff0000 !important;
-}
+ }
</style>
diff --git a/src/views/dataL/dataL.vue b/src/views/dataL/dataL.vue
index f771894..969b15a 100644
--- a/src/views/dataL/dataL.vue
+++ b/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"
diff --git a/vue.config.js b/vue.config.js
index 07942d8..6145dc5 100644
--- a/vue.config.js
+++ b/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',
--
Gitblit v1.9.3