From abe3a86c15105f215992d78bcaaf9b51efa1d565 Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期四, 28 七月 2022 10:22:41 +0800
Subject: [PATCH] 解决冲突
---
src/views/hashrate/CameraManage/CameraInfo/index.vue | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/views/hashrate/CameraManage/CameraInfo/index.vue b/src/views/hashrate/CameraManage/CameraInfo/index.vue
index a49ad6e..793881c 100644
--- a/src/views/hashrate/CameraManage/CameraInfo/index.vue
+++ b/src/views/hashrate/CameraManage/CameraInfo/index.vue
@@ -146,7 +146,7 @@
<div class="title">绠楀姏淇℃伅</div>
<div class="hashrate">
<div class="card">
- <img src="/images/hashrate/瀹炴椂绠楀姏.png" alt="" />
+ <img src="/images/hashrate/realTime2.png" alt="" />
<div class="data">
<div class="label">瀹炴椂绠楀姏</div>
<div class="number">
@@ -157,7 +157,7 @@
</div>
<div class="card">
- <img src="/images/hashrate/杞绠楀姏.png" alt="" />
+ <img src="/images/hashrate/polling.png" alt="" />
<div class="data">
<div class="label">杞绠楀姏</div>
<div class="number">
@@ -168,7 +168,7 @@
</div>
<div class="card">
- <img src="/images/hashrate/鏁版嵁鏍堢畻鍔�.png" alt="" />
+ <img src="/images/hashrate/static.png" alt="" />
<div class="data">
<div class="label">鏁版嵁鏍堢畻鍔�</div>
<div class="number">
@@ -204,6 +204,7 @@
:rtspUrl="videoItem.rtsp"
:isRunning="false"
:showArea="false"
+ :videoUrl="ip"
v-if="
videoItem !== '' &&
videoItem !== undefined &&
@@ -261,6 +262,7 @@
togglePlay: true,
eventAudio: new Audio(),
soundPath: "",
+ ip: "",
form: {},
// 璁板綍娣诲姞鐘舵��
isAdd: false,
@@ -375,6 +377,8 @@
if (node.type === "4") {
getCameraInfo(node.id).then((res) => {
if (res.success) {
+ this.ip = "ws://" + res.data.ip + ":7009/ws";
+
if (res.data.resolutions) {
let list = res.data.resolutions.map((i) => {
let obj = {};
@@ -407,7 +411,7 @@
this.form.isAI = false;
}
this.form.resolution =
- this.form.resolutionWidth + "*" + this.form.resolutionHeight;
+ this.form.resolution_width + "*" + this.form.resolution_height;
});
}
});
@@ -428,10 +432,10 @@
? 0
: parseFloat(this.form.longitude);
this.form.sensors = list;
- this.form.resolutionWidth = Number(
+ this.form.resolution_width = Number(
this.form.resolution.split("*")[0]
);
- this.form.resolutionHeight = Number(
+ this.form.resolution_height = Number(
this.form.resolution.split("*")[1]
);
let _this = this;
@@ -446,10 +450,10 @@
let tem = {
camera: this.form,
sensors: this.form.sensors,
- areaid: this.form.areaid,
};
tem.camera.clusterId = sessionStorage.getItem("clusterId");
tem.camera.devId = sessionStorage.getItem("devId");
+ delete tem.camera.sensors;
updateCameraInfo(tem)
.then((rsp) => {
@@ -483,10 +487,12 @@
let tem = {
camera: this.form,
sensors: this.form.sensors,
- areaid: this.form.areaid,
};
tem.camera.clusterId = sessionStorage.getItem("clusterId");
tem.camera.devId = sessionStorage.getItem("devId");
+ tem.camera.parentUserId = "";
+ tem.camera.enable = false;
+ delete tem.camera.sensors;
createCamera(tem)
.then((rsp) => {
if (rsp.success) {
@@ -524,7 +530,7 @@
name: this.form.name,
rtsp: this.form.rtsp,
id: this.form.id,
- isRunning: this.form.runEnable,
+ isRunning: this.form.run_enable,
cameraType: this.form.type,
};
@@ -733,7 +739,7 @@
.connect {
margin-bottom: 20px;
display: flex;
- justify-content: end;
+ justify-content: flex-end;
}
.el-button {
@@ -860,7 +866,7 @@
.btns {
display: flex;
- justify-content: end;
+ justify-content: flex-end;
margin-top: 20px;
.delBtn {
--
Gitblit v1.8.0