From 90390d0752e9a956247a2e63ab1b044311243772 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E4=B8=87=E4=BF=8A?= <X1y3z1wyx4j051sw>
Date: Thu, 30 Oct 2025 08:54:33 +0800
Subject: [PATCH] =?UTF-8?q?fix/=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E6=A0=B7=E5=BC=8F=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/index.scss         |  4 ++++
 src/views/Device/deviceControl.vue   |  4 ++--
 src/views/areaManage/area.vue        |  4 ++--
 src/views/areaManage/cabin.vue       |  4 ++--
 src/views/components/roomPage.vue    | 15 +++++++++++++++
 src/views/index.vue                  | 11 ++++++++---
 src/views/operationManage/patrol.vue |  3 ++-
 src/views/plan.vue                   | 20 ++++++++++++++++----
 src/views/system/user/index.vue      |  4 ++--
 9 files changed, 53 insertions(+), 16 deletions(-)
 create mode 100644 src/views/components/roomPage.vue

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index c9b8d2c..1c63068 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -193,3 +193,7 @@ aside {
     margin-bottom: 10px;
   }
 }
+
+.margin0 {
+  margin: 0 !important;
+}
diff --git a/src/views/Device/deviceControl.vue b/src/views/Device/deviceControl.vue
index b6e68ff..be30657 100644
--- a/src/views/Device/deviceControl.vue
+++ b/src/views/Device/deviceControl.vue
@@ -23,11 +23,11 @@
           <el-button :icon="Search" circle @click="handleQuery" />
           <el-button :icon="RefreshLeft" circle @click="handleQuery" />
         </el-form-item>
-        <el-form-item style="margin-left: 16px; float: right">
+        <el-form-item style="margin-left: 16px; float: right" class="margin0">
           <el-button type="primary" plain icon="Plus" @click="handleAdd"
             >新增</el-button
           >
-          <el-button type="warning" plain icon="Download">导入</el-button>
+          <el-button type="warning" plain icon="Download" class="margin0">导入</el-button>
         </el-form-item>
       </el-form>
 
diff --git a/src/views/areaManage/area.vue b/src/views/areaManage/area.vue
index 19052b3..457881c 100644
--- a/src/views/areaManage/area.vue
+++ b/src/views/areaManage/area.vue
@@ -14,8 +14,8 @@
           <el-button type="primary" @click="handleQuery">查询</el-button>
         </el-form-item>
 
-        <el-form-item style="margin-left: 16px; float: right">
-          <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+        <el-form-item style="margin-left: 16px; float: right" class="margin0">
+          <el-button type="primary" plain icon="Plus" @click="handleAdd" class="margin0">新增</el-button>
         </el-form-item>
       </el-form>
 
diff --git a/src/views/areaManage/cabin.vue b/src/views/areaManage/cabin.vue
index 1c2936e..e024e88 100644
--- a/src/views/areaManage/cabin.vue
+++ b/src/views/areaManage/cabin.vue
@@ -28,8 +28,8 @@
           <el-button type="primary" @click="handleQuery">查询</el-button>
         </el-form-item>
 
-        <el-form-item style="margin-left: 16px; float: right">
-          <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+        <el-form-item style="margin-left: 16px; float: right" class="margin0">
+          <el-button type="primary" plain icon="Plus" @click="handleAdd" class="margin0">新增</el-button>
         </el-form-item>
       </el-form>
 
diff --git a/src/views/components/roomPage.vue b/src/views/components/roomPage.vue
new file mode 100644
index 0000000..ac6d31e
--- /dev/null
+++ b/src/views/components/roomPage.vue
@@ -0,0 +1,15 @@
+<!--
+ * @Author: 季万俊
+ * @Date: 2025-10-20 13:04:10
+ * @Description: 
+-->
+<template>
+    
+</template>
+<script setup>
+
+</script>
+<style lang="less">
+
+
+</style>
\ No newline at end of file
diff --git a/src/views/index.vue b/src/views/index.vue
index e7900e0..0cba4ad 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -88,7 +88,7 @@
               </div>
             </div>
           </template>
-          <div class="trend-chart" style="height: 200px">
+          <div class="trend-chart">
             <div ref="powerChartRef" class="chart-container"></div>
           </div>
         </el-card>
@@ -118,7 +118,7 @@
             </div>
           </div>
           <!-- 原有：横向柱状图（当月/上月/今年/去年） -->
-          <div class="energy-chart" style="height: 180px">
+          <div class="energy-chart" style="height: calc(100% - 47px)">
             <div ref="energyChartRef" class="chart-container"></div>
           </div>
         </el-card>
@@ -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 @@
           <el-button type="primary" plain @click="handleExport">导出</el-button>
         </el-form-item>
         <!-- 新增巡检按钮 -->
-        <el-form-item style="margin-left: auto;float: right;">
+        <el-form-item style="margin-left: auto;float: right;" class="margin0">
           <el-button 
             type="primary" 
             icon="Plus" 
+            class="margin0"
             @click="handleAddInspection"
             v-if="isAdmin"
           >新增巡检</el-button>
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"
     ></tableEle>
+
+    <roomPage :info="roomInfo"></roomPage>
+
   </div>
 </template>
   
@@ -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 @@
         <el-form-item>
           <el-button type="primary" @click="handleQuery">查询</el-button>
         </el-form-item>
-        <el-form-item style="margin-left: 16px; float: right">
-          <el-button plain @click="handleAdd">新增</el-button>
+        <el-form-item style="margin-left: 16px; float: right"  class="margin0">
+          <el-button plain @click="handleAdd" class="margin0">新增</el-button>
         </el-form-item>
       </el-form>