From e04350fd14768d9c59fbbede645da73afda033fd Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 21 十月 2024 09:55:04 +0800
Subject: [PATCH] 钢化完整版图修改
---
UI-Project/src/views/NewPage.vue | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/UI-Project/src/views/NewPage.vue b/UI-Project/src/views/NewPage.vue
index 1837c20..9b7f1d6 100644
--- a/UI-Project/src/views/NewPage.vue
+++ b/UI-Project/src/views/NewPage.vue
@@ -5,11 +5,11 @@
<el-input v-model="current" style="margin-left: 20px;margin-top: 15px;width: 240px" placeholder="璇疯緭鍏ュ伐绋嬪彿" @input="updateUrl"/>
<el-button style="margin-top: 15px;margin-left: 15px;" type="primary" @click="fetchData">鏌ヨ</el-button>
</div>
- <el-card style="flex: 1;margin-left: 150px;margin-top: 50px;margin-right: 10px;width: 1558px;" height="900" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 400px;margin-top: 50px;margin-right: 10px;width: 1000px;" height="900" v-loading="loading">
<div v-for="(row, rowIndex) in divsData" :key="rowIndex" class="row">
<div v-for="(rect, colIndex) in row" :key="colIndex" class="div-container">
<div style="text-align: center;">鐐夊彿锛歿{ getAdjustedRectsForRow(rowIndex)[0].layout_id }}</div>
- <el-scrollbar height="430px" width="1516px" style="background-color: #e9e9eb;">
+ <el-scrollbar height="550px" width="958px" style="background-color: #e9e9eb;">
<div style="position: relative;width: 100%;height: 100%;">
<div
v-for="(rect, index) in getAdjustedRectsForRow(rowIndex)"
@@ -99,20 +99,20 @@
if (rawRowData) {
adjustedRectsPerRow.value[rowIndex] = rawRowData.map(rect => {
let adjustedWidth, adjustedHeight,newX;
- if (rect.rotate_angle === 0) {
+ if (rect.rotate_angle === 90) {
newX = rect.olHeight -(rect.y_axis + rect.height);
- adjustedWidth = rect.height * (1516/rect.olHeight);
- adjustedHeight = rect.width * (430/rect.olWidth);
+ adjustedWidth = rect.height * (958/rect.olHeight);
+ adjustedHeight = rect.width * (550/rect.olWidth);
} else {
newX = rect.olHeight -(rect.y_axis + rect.width);
- adjustedWidth = rect.width * (1516/rect.olHeight);
- adjustedHeight = rect.height * (430/rect.olWidth);
+ adjustedWidth = rect.width * (958/rect.olHeight);
+ adjustedHeight = rect.height * (550/rect.olWidth);
}
let adjustedRect = {
...rect,
- y_axis: rect.x_axis * (430/rect.olWidth),
- x_axis: newX * (1516/rect.olHeight),
- // y_axis: rect.x_axis * (430/rect.olWidth),
+ y_axis: rect.x_axis * (550/rect.olWidth),
+ x_axis: newX * (958/rect.olHeight),
+ // y_axis: rect.x_axis * (550/rect.olWidth),
width: adjustedWidth,
height: adjustedHeight,
widtha: rect.width,
@@ -137,10 +137,10 @@
margin-bottom: 20px;
}
.div-container {
-width: 1516px;
+width: 958px;
float: left;
background-color: #f4f4f5;
-height: 430px;
+height: 550px;
box-sizing: border-box;
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0