fix/新增页面,样式整理
This commit is contained in:
parent
8a605b91fc
commit
90390d0752
|
|
@ -193,3 +193,7 @@ aside {
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.margin0 {
|
||||||
|
margin: 0 !important;
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -23,11 +23,11 @@
|
||||||
<el-button :icon="Search" circle @click="handleQuery" />
|
<el-button :icon="Search" circle @click="handleQuery" />
|
||||||
<el-button :icon="RefreshLeft" circle @click="handleQuery" />
|
<el-button :icon="RefreshLeft" circle @click="handleQuery" />
|
||||||
</el-form-item>
|
</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 type="primary" plain icon="Plus" @click="handleAdd"
|
||||||
>新增</el-button
|
>新增</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-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,8 +14,8 @@
|
||||||
<el-button type="primary" @click="handleQuery">查询</el-button>
|
<el-button type="primary" @click="handleQuery">查询</el-button>
|
||||||
</el-form-item>
|
</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="primary" plain icon="Plus" @click="handleAdd" class="margin0">新增</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -28,8 +28,8 @@
|
||||||
<el-button type="primary" @click="handleQuery">查询</el-button>
|
<el-button type="primary" @click="handleQuery">查询</el-button>
|
||||||
</el-form-item>
|
</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="primary" plain icon="Plus" @click="handleAdd" class="margin0">新增</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,15 @@
|
||||||
|
<!--
|
||||||
|
* @Author: 季万俊
|
||||||
|
* @Date: 2025-10-20 13:04:10
|
||||||
|
* @Description:
|
||||||
|
-->
|
||||||
|
<template>
|
||||||
|
|
||||||
|
</template>
|
||||||
|
<script setup>
|
||||||
|
|
||||||
|
</script>
|
||||||
|
<style lang="less">
|
||||||
|
|
||||||
|
|
||||||
|
</style>
|
||||||
|
|
@ -88,7 +88,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<div class="trend-chart" style="height: 200px">
|
<div class="trend-chart">
|
||||||
<div ref="powerChartRef" class="chart-container"></div>
|
<div ref="powerChartRef" class="chart-container"></div>
|
||||||
</div>
|
</div>
|
||||||
</el-card>
|
</el-card>
|
||||||
|
|
@ -118,7 +118,7 @@
|
||||||
</div>
|
</div>
|
||||||
</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 ref="energyChartRef" class="chart-container"></div>
|
||||||
</div>
|
</div>
|
||||||
</el-card>
|
</el-card>
|
||||||
|
|
@ -599,7 +599,12 @@ onBeforeUnmount(() => {
|
||||||
.video-monitor-card {
|
.video-monitor-card {
|
||||||
height: calc(100% - 404px);
|
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 {
|
::v-deep .video-monitor-card .el-card__body {
|
||||||
height: calc(100% - 44px);
|
height: calc(100% - 44px);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -42,10 +42,11 @@
|
||||||
<el-button type="primary" plain @click="handleExport">导出</el-button>
|
<el-button type="primary" plain @click="handleExport">导出</el-button>
|
||||||
</el-form-item>
|
</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
|
<el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
icon="Plus"
|
icon="Plus"
|
||||||
|
class="margin0"
|
||||||
@click="handleAddInspection"
|
@click="handleAddInspection"
|
||||||
v-if="isAdmin"
|
v-if="isAdmin"
|
||||||
>新增巡检</el-button>
|
>新增巡检</el-button>
|
||||||
|
|
|
||||||
|
|
@ -138,6 +138,9 @@
|
||||||
:modelValue="tableModelValue"
|
:modelValue="tableModelValue"
|
||||||
@update:modelValue="updateTableModelValue"
|
@update:modelValue="updateTableModelValue"
|
||||||
></tableEle>
|
></tableEle>
|
||||||
|
|
||||||
|
<roomPage :info="roomInfo"></roomPage>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
@ -159,6 +162,7 @@ import typesDictionary from "../utils/equipmentType"; //设备类型字典
|
||||||
import videoEle from "./components/videoEle.vue";
|
import videoEle from "./components/videoEle.vue";
|
||||||
import tableEle from "./components/tableEle.vue";
|
import tableEle from "./components/tableEle.vue";
|
||||||
import * as echarts from "echarts";
|
import * as echarts from "echarts";
|
||||||
|
import roomPage from "./components/roomPage.vue";
|
||||||
|
|
||||||
const tableModelValue = ref(false);
|
const tableModelValue = ref(false);
|
||||||
// 新增:底层背景Canvas引用
|
// 新增:底层背景Canvas引用
|
||||||
|
|
@ -171,6 +175,8 @@ const bgCtx = ref(null);
|
||||||
const ctx = ref(null);
|
const ctx = ref(null);
|
||||||
const img = new Image();
|
const img = new Image();
|
||||||
|
|
||||||
|
const roomInfo = ref({});
|
||||||
|
|
||||||
let _typesDictionary = reactive(typesDictionary);
|
let _typesDictionary = reactive(typesDictionary);
|
||||||
|
|
||||||
// 恢复points定义 - 点标记数据 设备数据
|
// 恢复points定义 - 点标记数据 设备数据
|
||||||
|
|
@ -960,7 +966,6 @@ const animate = () => {
|
||||||
|
|
||||||
// 鼠标移动处理(保持不变,只影响上层Canvas)
|
// 鼠标移动处理(保持不变,只影响上层Canvas)
|
||||||
let mouseMoveTimeout = null;
|
let mouseMoveTimeout = null;
|
||||||
const MOUSE_MOVE_DELAY = 16;
|
|
||||||
const onMouseMove = (e) => {
|
const onMouseMove = (e) => {
|
||||||
if (!BL.value) return;
|
if (!BL.value) return;
|
||||||
if (dragging.value === null) {
|
if (dragging.value === null) {
|
||||||
|
|
@ -1121,15 +1126,22 @@ const startDrag = (e) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const mouseUp = () => {
|
const mouseUp = () => {
|
||||||
endDrag();
|
console.log('mouseUp');
|
||||||
|
endDrag(1);
|
||||||
updateProgress();
|
updateProgress();
|
||||||
};
|
};
|
||||||
|
|
||||||
const mouseLeave = () => {
|
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;
|
dragging.value = null;
|
||||||
handleMouseOut();
|
handleMouseOut();
|
||||||
getCurrentArea();
|
getCurrentArea();
|
||||||
|
|
|
||||||
|
|
@ -16,8 +16,8 @@
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" @click="handleQuery">查询</el-button>
|
<el-button type="primary" @click="handleQuery">查询</el-button>
|
||||||
</el-form-item>
|
</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 plain @click="handleAdd">新增</el-button>
|
<el-button plain @click="handleAdd" class="margin0">新增</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue