From db5872786c1e1697a59af41386136ee002bb68ad Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期五, 30 六月 2023 17:17:12 +0800
Subject: [PATCH] 修改为汇丰默认图标,修改处理率计算方式
---
src/views/hashrate/CameraManage/CameraRules/index.vue | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/views/hashrate/CameraManage/CameraRules/index.vue b/src/views/hashrate/CameraManage/CameraRules/index.vue
index 6e3c503..f319cdd 100644
--- a/src/views/hashrate/CameraManage/CameraRules/index.vue
+++ b/src/views/hashrate/CameraManage/CameraRules/index.vue
@@ -64,6 +64,7 @@
:loading="Camera.loading"
:canvasWidth="canvasWidth"
:canvasHeight="canvasHeight"
+ :showProportion="960 / canvasWidth"
@fromCanvas="getCanvasData"
@changeLoading="changeLoading"
@refresh="refresh"
@@ -240,6 +241,8 @@
</template>
<script>
+import { getAllTimeRule } from "@/api/timeRule"
+
import { jsPlumb } from "jsplumb"
import { savePolygon } from "@/api/polygon"
@@ -362,8 +365,8 @@
cameraId: "",
showSysInfo: true,
showCanvas: true,
- canvasWidth: 568,
- canvasHeight: 320,
+ canvasWidth: 576,
+ canvasHeight: 324,
stackId: "",
swiperIndex: 0,
stackFilesPage: 1,
@@ -487,6 +490,13 @@
let polyon = { ...data }
polyon.camera_id = this.Camera.cameraId
savePolygon(polyon).then((rsp) => {
+ if (rsp && rsp.success) {
+ if (rsp.data.msg.indexOf("澶辫触") >= 0) {
+ this.$message({ type: "error", duration: 5000, message: rsp.data + " 鍖哄煙宸插叧鑱斿満鏅�, 鏃犳硶鍒犻櫎" })
+ } else {
+ this.$message.success(rsp.data.msg)
+ }
+ }
this.Camera.getPolygon()
//this.Camera.getCameraTask();
})
@@ -521,7 +531,12 @@
},
// 鍒濆鍖栨憚鍍忔満淇℃伅锛岀埗缁勪欢璋冪敤
- async initCameraData(id) {
+ async initCameraData(id, devId) {
+ this.$store.commit("setDevId", devId)
+ devId ? false : (devId = "")
+ getAllTimeRule(devId).then((rsp) => {
+ this.VideoManageData.TimeRules = rsp.data.timeRules
+ })
if (!id) {
return
}
@@ -835,6 +850,7 @@
} else if (newRule.action === "edit") {
//鐙珛鍦烘櫙
if (this.ruleType == "separate") {
+ this.SeparateRules[newRule.data.index].time_name = newRule.data.time_name
this.SeparateRules[newRule.data.index].alarm_level = newRule.data.alarm_level
this.SeparateRules[newRule.data.index].scene_name = newRule.data.scene_name
this.SeparateRules[newRule.data.index].desc = newRule.data.desc
--
Gitblit v1.8.0