+
@@ -599,7 +599,12 @@ onBeforeUnmount(() => {
.video-monitor-card {
height: calc(100% - 404px);
}
-
+::v-deep .el-card__body {
+ height: calc(100% - 44px);
+}
+::v-deep .power-trend-card .el-card__body {
+ height: calc(100% - 80px);
+}
::v-deep .video-monitor-card .el-card__body {
height: calc(100% - 44px);
}
diff --git a/src/views/operationManage/patrol.vue b/src/views/operationManage/patrol.vue
index 68e69e2..d2bfa0e 100644
--- a/src/views/operationManage/patrol.vue
+++ b/src/views/operationManage/patrol.vue
@@ -42,10 +42,11 @@
导出
-
+
新增巡检
diff --git a/src/views/plan.vue b/src/views/plan.vue
index 6184b50..a1fc08d 100644
--- a/src/views/plan.vue
+++ b/src/views/plan.vue
@@ -138,6 +138,9 @@
:modelValue="tableModelValue"
@update:modelValue="updateTableModelValue"
>
+
+
+
@@ -159,6 +162,7 @@ import typesDictionary from "../utils/equipmentType"; //设备类型字典
import videoEle from "./components/videoEle.vue";
import tableEle from "./components/tableEle.vue";
import * as echarts from "echarts";
+import roomPage from "./components/roomPage.vue";
const tableModelValue = ref(false);
// 新增:底层背景Canvas引用
@@ -171,6 +175,8 @@ const bgCtx = ref(null);
const ctx = ref(null);
const img = new Image();
+const roomInfo = ref({});
+
let _typesDictionary = reactive(typesDictionary);
// 恢复points定义 - 点标记数据 设备数据
@@ -960,7 +966,6 @@ const animate = () => {
// 鼠标移动处理(保持不变,只影响上层Canvas)
let mouseMoveTimeout = null;
-const MOUSE_MOVE_DELAY = 16;
const onMouseMove = (e) => {
if (!BL.value) return;
if (dragging.value === null) {
@@ -1121,15 +1126,22 @@ const startDrag = (e) => {
};
const mouseUp = () => {
- endDrag();
+ console.log('mouseUp');
+ endDrag(1);
updateProgress();
};
const mouseLeave = () => {
- endDrag();
+ console.log('mouseLeave');
+ endDrag(2);
};
-const endDrag = () => {
+const endDrag = (type) => {
+
+ if(type == 1 && dragging.value == "point") {
+ // 拖拽图标结束时 可以调用接口上传坐标信息
+ console.log(currentPoint,"=====> currentPoint");
+ }
dragging.value = null;
handleMouseOut();
getCurrentArea();
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 1aed07c..1bfc383 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -16,8 +16,8 @@