From 8fcf5694227da09ec868fcb80abe6be5d217e372 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 19 Jan 2026 15:46:16 +0800
Subject: [PATCH] feat:弹窗中涉及表格相关样式调整
---
applications/drone-command/src/views/tickets/orderLogCopy.vue | 6 +++---
applications/drone-command/src/styles/common/cockpit.scss | 41 ++++++++++++++++++-----------------------
applications/drone-command/src/views/device/components/DeviceSettingBox.vue | 2 ++
applications/drone-command/src/views/license/license.vue | 2 +-
applications/drone-command/src/views/tickets/component/AddEditDetails.vue | 2 +-
applications/drone-command/src/views/permissionManage/permissionRole/FormDiaLog.vue | 2 +-
applications/drone-command/src/views/system/topmenu.vue | 1 +
7 files changed, 27 insertions(+), 29 deletions(-)
diff --git a/applications/drone-command/src/styles/common/cockpit.scss b/applications/drone-command/src/styles/common/cockpit.scss
index a720080..6a69422 100644
--- a/applications/drone-command/src/styles/common/cockpit.scss
+++ b/applications/drone-command/src/styles/common/cockpit.scss
@@ -568,7 +568,7 @@
font-weight: bold;
font-size: 18px;
color: #FFFFFF;
- line-height: 22px;
+ line-height: 40px;
text-align: left;
font-style: normal;
text-transform: none;
@@ -920,7 +920,7 @@
font-weight: 500;
font-size: 14px;
color: #FFFFFF;
- line-height: 22px;
+ line-height: 40px;
font-style: normal;
text-transform: none;
}
@@ -1056,7 +1056,7 @@
font-weight: bold;
font-size: 18px;
color: #FFFFFF;
- line-height: 22px;
+ line-height: 40px;
text-align: left;
font-style: normal;
text-transform: none;
@@ -1097,7 +1097,7 @@
font-weight: 500;
font-size: 14px;
color: #D4D5D7;
- line-height: 22px;
+ line-height: 40px;
text-align: right;
font-style: normal;
text-transform: none;
@@ -1109,7 +1109,7 @@
font-weight: 400;
font-size: 14px;
color: #9E9EBA;
- line-height: 22px;
+ line-height: 40px;
text-align: left;
font-style: normal;
text-transform: none;
@@ -1139,7 +1139,7 @@
font-weight: 500;
font-size: 14px;
color: #D4D5D7;
- line-height: 22px;
+ line-height: 40px;
text-align: right;
font-style: normal;
text-transform: none;
@@ -1148,6 +1148,7 @@
.el-form-item__content {
display: flex;
align-items: center;
+ line-height: 40px;
.el-input,
.el-input-number {
@@ -1272,7 +1273,7 @@
font-weight: bold;
font-size: 18px;
color: #FFFFFF;
- line-height: 22px;
+ line-height: 40px;
text-align: left;
font-style: normal;
text-transform: none;
@@ -1373,11 +1374,13 @@
}
.dialog-container {
- padding: 0 16px;
height: 0;
flex: 1;
+ padding: 0 16px;
display: flex;
flex-direction: column;
+ overflow-y: auto;
+
.detail-title {
margin-bottom: 20px;
@@ -1402,7 +1405,7 @@
font-weight: 500;
font-size: 14px;
color: #D4D5D7;
- line-height: 22px;
+ line-height: 40px;
text-align: right;
font-style: normal;
text-transform: none;
@@ -1425,6 +1428,7 @@
.command-table-container {
+ height: auto;
margin-top: 0;
margin-bottom: 20px;
@@ -1441,6 +1445,8 @@
display: flex;
flex-direction: column;
+ overflow-y: auto;
+
.el-form-item {
display: flex;
align-items: center;
@@ -1452,7 +1458,7 @@
font-weight: 500;
font-size: 14px;
color: #D4D5D7;
- line-height: 22px;
+ line-height: 40px;
text-align: right;
font-style: normal;
text-transform: none;
@@ -1461,6 +1467,7 @@
.el-form-item__content {
display: flex;
align-items: center;
+ line-height: 40px;
.el-input,
.el-input-number {
@@ -1548,8 +1555,6 @@
}
.search-table-container {
- height: 0;
- flex: 1;
display: flex;
flex-direction: column;
@@ -1590,21 +1595,11 @@
}
.el-form-item {
- height: 0;
- flex: 1;
- display: flex;
- flex-direction: column;
-
.el-form-item__content {
width: 100%;
- height: 0;
- flex: 1;
- display: flex;
- flex-direction: column;
.el-table {
- height: 0;
- flex: 1;
+ height: auto;
}
}
}
diff --git a/applications/drone-command/src/views/device/components/DeviceSettingBox.vue b/applications/drone-command/src/views/device/components/DeviceSettingBox.vue
index db76492..678c127 100644
--- a/applications/drone-command/src/views/device/components/DeviceSettingBox.vue
+++ b/applications/drone-command/src/views/device/components/DeviceSettingBox.vue
@@ -98,6 +98,7 @@
>{{ deviceSetting[DeviceSettingKeyEnum.HEIGHT_LIMIT_SET].label }}:(m)</span
>
<el-input-number
+ class="command-input"
size="small"
v-model="deviceSettingFormModel.heightLimit"
:min="20"
@@ -144,6 +145,7 @@
v-model="deviceSettingFormModel.distanceLimitStatus.state"
/>
<el-input-number
+ class="command-input"
size="small"
v-model="deviceSettingFormModel.distanceLimitStatus.distanceLimit"
:min="15"
diff --git a/applications/drone-command/src/views/license/license.vue b/applications/drone-command/src/views/license/license.vue
index f407fc8..7b844d1 100644
--- a/applications/drone-command/src/views/license/license.vue
+++ b/applications/drone-command/src/views/license/license.vue
@@ -64,7 +64,7 @@
<el-radio :label="-1">不限制</el-radio>
<el-radio :label="1">限制</el-radio>
</el-radio-group>
- <el-input-number v-if="deviceLimit === 1" v-model="newLicense.printClientCount" :min="0"
+ <el-input-number class="command-input" v-if="deviceLimit === 1" v-model="newLicense.printClientCount" :min="0"
placeholder="请输入数量" style="margin-top: 10px;" />
</el-form-item>
<el-form-item label="是否校验机器码" prop="checkMachineCode">
diff --git a/applications/drone-command/src/views/permissionManage/permissionRole/FormDiaLog.vue b/applications/drone-command/src/views/permissionManage/permissionRole/FormDiaLog.vue
index a13c28e..5b008e9 100644
--- a/applications/drone-command/src/views/permissionManage/permissionRole/FormDiaLog.vue
+++ b/applications/drone-command/src/views/permissionManage/permissionRole/FormDiaLog.vue
@@ -50,7 +50,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="角色排序" prop="sort">
- <el-input-number v-model="formData.sort" :min="0" :controls="false" placeholder="请输入" />
+ <el-input-number class="command-input" v-model="formData.sort" :min="0" :controls="false" placeholder="请输入" />
</el-form-item>
</el-col>
</el-row>
diff --git a/applications/drone-command/src/views/system/topmenu.vue b/applications/drone-command/src/views/system/topmenu.vue
index 16049bd..f70317c 100644
--- a/applications/drone-command/src/views/system/topmenu.vue
+++ b/applications/drone-command/src/views/system/topmenu.vue
@@ -48,6 +48,7 @@
</template>
<template #sort="{ row }">
<el-input-number
+ class="command-input"
v-model="row.sort"
@change="sortChange(row)"
:min="1"
diff --git a/applications/drone-command/src/views/tickets/component/AddEditDetails.vue b/applications/drone-command/src/views/tickets/component/AddEditDetails.vue
index 3b04053..1cf0c9d 100644
--- a/applications/drone-command/src/views/tickets/component/AddEditDetails.vue
+++ b/applications/drone-command/src/views/tickets/component/AddEditDetails.vue
@@ -58,7 +58,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="安全返航真高" prop="rth_altitude" class="safe-height">
- <el-input-number v-model="formParams.rth_altitude" :min="50" :max="500"
+ <el-input-number class="command-input" v-model="formParams.rth_altitude" :min="50" :max="500"
:disabled="txtTitle === '工单审核' || txtTitle === '工单详情'"></el-input-number>
</el-form-item>
</el-col>
diff --git a/applications/drone-command/src/views/tickets/orderLogCopy.vue b/applications/drone-command/src/views/tickets/orderLogCopy.vue
index 8a58968..6a8bdf2 100644
--- a/applications/drone-command/src/views/tickets/orderLogCopy.vue
+++ b/applications/drone-command/src/views/tickets/orderLogCopy.vue
@@ -194,7 +194,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="安全返航真高" prop="rth_altitude" class="safe-height">
- <el-input-number v-model="form.rth_altitude" :min="50" :max="500"></el-input-number>
+ <el-input-number class="command-input" v-model="form.rth_altitude" :min="50" :max="500"></el-input-number>
</el-form-item>
</el-col>
</el-row>
@@ -319,7 +319,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="安全返航真高" prop="rth_altitude" class="safe-height">
- <el-input-number :disabled="detailTitle === '工单详情'" v-model="form.rth_altitude" :min="50"
+ <el-input-number class="command-input" :disabled="detailTitle === '工单详情'" v-model="form.rth_altitude" :min="50"
:max="500"></el-input-number>
</el-form-item>
</el-col>
@@ -455,7 +455,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="安全返航真高" prop="rth_altitude" class="safe-height">
- <el-input-number :disabled="true" v-model="form.rth_altitude" :min="50" :max="500"></el-input-number>
+ <el-input-number class="command-input" :disabled="true" v-model="form.rth_altitude" :min="50" :max="500"></el-input-number>
</el-form-item>
</el-col>
</el-row>
--
Gitblit v1.9.3