From d6f3654e03571698a10b0dfbfd5202232996219f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 26 Nov 2024 01:18:16 +0800
Subject: [PATCH] Merge branch 'main' of http://139.196.74.78:10010/r/zhyq/bigScreen
---
src/pages/layout/components/scomponents/tool/measure.vue | 55 +++++++++++++++++++++++++------------------------------
1 files changed, 25 insertions(+), 30 deletions(-)
diff --git a/src/pages/layout/components/scomponents/tool/measure.vue b/src/pages/layout/components/scomponents/tool/measure.vue
index 238d11e..85acf55 100644
--- a/src/pages/layout/components/scomponents/tool/measure.vue
+++ b/src/pages/layout/components/scomponents/tool/measure.vue
@@ -55,16 +55,16 @@
function calcDistance() {
measure.distance()
}
-// 地面距离
+// 贴地距离
function distanceSurface() {
measure.distanceSurface()
}
-// 平面面积
+// 水平面积
function calcArea(item) {
console.log('calcArea********************************', item)
measure.area()
}
-// 地面面积
+// 贴地面积
function areaSurface() {
measure.areaSurface()
}
@@ -82,7 +82,7 @@
function calcHeight() {
measure.height()
}
-// 模型高度
+// 贴物高度
function calcModelHeight() {
measure.height({
clampToModel: true
@@ -127,11 +127,11 @@
imges: '../../../../../assets/images/add.png',
click: distanceSurface
},
- {
- label: '剖面',
- value: 'volume',
- imges: '../../../../../assets/images/add.png'
- },
+ // {
+ // label: '剖面',
+ // value: 'volume',
+ // imges: '../../../../../assets/images/add.png'
+ // },
{
label: '水平面积',
value: 'volume',
@@ -163,9 +163,10 @@
click: calcModelTriangleHeight
},
{
- label: '坐标测量',
+ label: '贴物高度',
value: 'volume',
- imges: '../../../../../assets/images/add.png'
+ imges: '../../../../../assets/images/add.png',
+ click: calcModelHeight
},
]
@@ -179,9 +180,7 @@
width: 230px;
display: flex;
flex-wrap: wrap;
- justify-content: center;
font-size: 12px;
- /* 水平居中 */
}
.icon_img {
@@ -190,18 +189,10 @@
}
.item {
- flex: 1 0 33.33%;
- /* 每个项占 1/3 的宽度 */
- display: flex;
- flex-direction: column;
- align-items: center;
- /* 水平居中 */
- justify-content: center;
- /* 垂直居中 */
- box-sizing: border-box;
- /* 确保 padding 和 border 不影响宽度 */
- padding: 10px;
- /* 可选：增加内边距 */
+ width: 60px;
+ margin: 8px;
+ text-align: center;
+ padding: 3px;
}
.button-clear {
@@ -211,17 +202,21 @@
}
.button-clear button {
- background-color: rgb(25, 0, 255);
- padding: 10px;
+ padding: 6px;
border: none;
+}
+
+.button-clear button:hover {
+ background-color: blue;
color: #fff;
}
-.container-box .text:hover {
- color: blue;
+.container-box .item:hover {
+ box-shadow: inset 0px 0px 30px 20px rgba(31, 139, 247, 0.949);
+ border-radius: 20%;
}
.text {
- color: pink;
+ // color: pink;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3