From d266294dd3929fcc71fbcb7943527559c13a2b8a Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 17 Mar 2021 17:08:27 +0800
Subject: [PATCH] 修改
---
src/views/realTimePolice/real.vue | 213 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 213 insertions(+), 0 deletions(-)
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index 9c6b3a0..66eb9d4 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -262,6 +262,7 @@
</el-form-item>
</el-col>
<el-col span="12">
+<<<<<<< HEAD
<el-form-item label="监控视频">
<el-button type="success" @click.stop="queryOldVideo(form)"
>视频通话
@@ -269,10 +270,15 @@
<el-button type="primary" @click.stop="queryOldVideo(form)"
>查看历史
</el-button>
+=======
+ <el-form-item label="备注">
+ <el-input v-model="form.bz" autocomplete="off"></el-input>
+>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
</el-form-item>
</el-col>
</el-row>
+<<<<<<< HEAD
<el-row>
<el-col span="12">
<el-form-item label="报警内容">
@@ -281,6 +287,24 @@
v-model="form.content"
autocomplete="off"
></el-input>
+=======
+ <el-row>
+ <el-form-item label="报警内容">
+ <el-input
+ disabled="true"
+ v-model="form.content"
+ autocomplete="off"
+ ></el-input>
+ </el-form-item>
+ </el-row>
+
+ <el-row>
+ <el-col span="12">
+ <el-form-item label="视频通话">
+ <el-button type="primary" @click.stop="queryOldVideo(form)"
+ >查看视频
+ </el-button>
+>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
</el-form-item>
</el-col>
<el-col span="12">
@@ -301,6 +325,7 @@
@click.stop="aKeyToCall($event, form)"
>查看视频
</el-button> -->
+<<<<<<< HEAD
<el-button type="success" @click.stop="revoke(form)"
>办结
</el-button>
@@ -311,6 +336,12 @@
alt=""
/>
+=======
+ <el-button type="warning" @click.stop="revoke(form)"
+ >办结
+ </el-button>
+ <el-button type="danger" class="push-nmb-btn">推送110</el-button>
+>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
<el-button type="primary" @click.stop="generate(form)"
>派送保安
</el-button>
@@ -343,12 +374,15 @@
import Recorder from "js-audio-recorder";
+<<<<<<< HEAD
var newAddOper = axios.create({
baseURL: "http://s16s652780.51mypc.cn",
withCredentials: false,
headers: {},
});
+=======
+>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
export default {
data() {
return {
@@ -357,7 +391,11 @@
videoSource: "",
dialogTableVisible: false,
innerVisibleVideo: false,
+<<<<<<< HEAD
activeClass: -1,
+=======
+ activeClass: 3,
+>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
form: {},
query: {},
dateTime: [],
@@ -609,6 +647,7 @@
(error) => {
window.console.log(error);
loading();
+<<<<<<< HEAD
}
);
},
@@ -629,6 +668,28 @@
}
);
},
+=======
+ }
+ );
+ },
+ rowUpdate(row, index, done, loading) {
+ row.coordinate = "";
+ update(row).then(
+ () => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ done();
+ },
+ (error) => {
+ window.console.log(error);
+ loading();
+ }
+ );
+ },
+>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
rowDel(row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
@@ -647,7 +708,11 @@
});
},
searchReset() {
+<<<<<<< HEAD
this.activeClass = -1;
+=======
+ this.activeClass = 3;
+>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
this.query = {};
this.onLoad(this.page);
},
@@ -781,11 +846,14 @@
currentData.getMinutes() < 10
? "0" + currentData.getMinutes()
: currentData.getMinutes();
+<<<<<<< HEAD
//秒
var currenS =
currentData.getSeconds() < 10
? "0" + currentData.getSeconds()
: currentData.getSeconds();
+=======
+>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
return {
week: {
@@ -816,6 +884,7 @@
currenM +
":00",
},
+<<<<<<< HEAD
current:
currentY +
"-" +
@@ -828,6 +897,8 @@
currenM +
":" +
currenS,
+=======
+>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
};
},
getBZdata(e) {
@@ -904,6 +975,11 @@
this.dialogTableVisible = true;
},
generate(row) {
+<<<<<<< HEAD
+=======
+ console.log(row);
+ return;
+>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
var that = this;
if (row.czTime == "" || row.czTime == null) {
this.$message({
@@ -945,6 +1021,7 @@
message: "生成警单成功",
type: "success",
});
+<<<<<<< HEAD
that.updateJtyep(row);
that.dialogTableVisible = false;
@@ -1099,6 +1176,142 @@
.then((result) => {
this.innerVisibleVideo = true;
+=======
+
+ that.updateJtyep(row);
+ that.dialogTableVisible = false;
+ var arr = [];
+ that.$store.state.tags.tagList.forEach((item) => {
+ if (item.label != "警情分发处置") {
+ arr.push(item);
+ }
+ });
+ that.$store.state.tags.tagList = arr;
+
+ row.type = 0;
+ row.id = response.data.data;
+ that.$router.push({ path: "/distribution/index", query: row });
+ })
+ .catch(function (error) {
+ that.dialogTableVisible = false;
+ });
+ }
+ },
+ revoke(row) {
+ var that = this;
+ axios({
+ url: "/api/blade-jfpts/alarm/alarm/deletejj?id=" + row.id,
+ method: "post",
+ }).then(function () {
+ that.dialogTableVisible = false;
+ that.onLoad(that.page, that.query);
+ });
+ },
+ updateJtyep(row) {
+ var that = this;
+ axios({
+ url:
+ "/api/blade-jfpts/alarm/alarm/updateJtype?id=" +
+ row.id +
+ "&czTime=" +
+ row.czTime +
+ "&bz=" +
+ row.bz,
+ method: "post",
+ }).then(function () {
+ that.onLoad(that.page, that.query);
+ });
+ },
+
+ beginTimeOrEndTime(time) {
+ var beginTime = new Date(time);
+
+ var endTime = new Date(new Date(time).valueOf() - 1000 * 60 * 60 * 3);
+
+ var beginY = beginTime.getFullYear();
+
+ var beginM =
+ beginTime.getMonth() + 1 < 10
+ ? "0" + (beginTime.getMonth() + 1)
+ : beginTime.getMonth() + 1;
+
+ var beginD =
+ beginTime.getDate() < 10
+ ? "0" + beginTime.getDate()
+ : beginTime.getDate();
+
+ var beginH =
+ beginTime.getHours() < 10
+ ? "0" + beginTime.getHours()
+ : beginTime.getHours();
+
+ var beginm =
+ beginTime.getMinutes() < 10
+ ? "0" + beginTime.getMinutes()
+ : beginTime.getMinutes();
+
+ var begins =
+ beginTime.getSeconds() < 10
+ ? "0" + beginTime.getSeconds()
+ : beginTime.getSeconds();
+
+ var endY = endTime.getFullYear();
+
+ var endM =
+ endTime.getMonth() + 1 < 10
+ ? "0" + (endTime.getMonth() + 1)
+ : endTime.getMonth() + 1;
+
+ var endD =
+ endTime.getDate() < 10 ? "0" + endTime.getDate() : endTime.getDate();
+
+ var endH =
+ endTime.getHours() < 10 ? "0" + endTime.getHours() : endTime.getHours();
+
+ var endm =
+ endTime.getMinutes() < 10
+ ? "0" + endTime.getMinutes()
+ : endTime.getMinutes();
+
+ var ends =
+ endTime.getSeconds() < 10
+ ? "0" + endTime.getSeconds()
+ : endTime.getSeconds();
+ return {
+ begin: beginY + beginM + beginD + beginH + beginm + begins,
+ end: endY + endM + endD + endH + endm + ends,
+ };
+ },
+ queryOldVideo(data) {
+ var newAxios = axios.create({
+ baseURL: "https://web.byisf.com:18000",
+ withCredentials: false,
+ headers: {
+ "Content-type": "application/x-www-form-urlencoded",
+ },
+ });
+
+ var time = this.beginTimeOrEndTime(data.alarmTime);
+
+ newAxios
+ .post(
+ "/api_control",
+ {},
+ {
+ params: {
+ param: JSON.stringify({ PktType: "GetAccessToken" }),
+ },
+ }
+ )
+ .then((res) => {
+ newAxios
+ .get(
+ `https://web.byisf.com:18000/GetPlayUrl?deviceCode=${data.serialNumber}&chl=${data.channelNumber}`
+ )
+ .then((result) => {
+ this.innerVisibleVideo = true;
+
+>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
this.videoSource = result.data.data.m3u8;
});
--
Gitblit v1.9.3