From a53ece5036c1fa61a63fe5f9e0cd3519210ab928 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Fri, 07 Aug 2026 09:44:27 +0800
Subject: [PATCH] feat:兼容分辨率低不出现滚动条
---
applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue b/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
index 8d86c69..e835248 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
@@ -10,7 +10,7 @@
</el-col>
<el-col :span="12">
<div class="label">设备类型</div>
- <div class="val">{{ formData.deviceType }}</div>
+ <div class="val">{{ getDictLabel(formData.deviceType, dictObj.deviceType) }}</div>
</el-col>
<el-col :span="12">
<div class="label">设备编码</div>
@@ -18,7 +18,7 @@
</el-col>
<el-col :span="12">
<div class="label">设备属性</div>
- <div class="val">{{ formData.deviceAtt }}</div>
+ <div class="val">{{ getDictLabel(formData.deviceAtt, dictObj.deviceAtt) }}</div>
</el-col>
<el-col :span="12">
<div class="label">型号</div>
@@ -43,6 +43,14 @@
<el-col :span="12">
<div class="label">所属部门</div>
<div class="val">{{ formData.belongDeptName }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div class="label">开始使用日期</div>
+ <div class="val">{{ formData.useDate }}</div>
+ </el-col>
+ <el-col :span="12">
+ <div class="label">使用年限</div>
+ <div class="val">{{ formData.serviceLife }}</div>
</el-col>
<el-col :span="12">
<div class="label">负责人</div>
@@ -80,7 +88,7 @@
</div>
</div>
- <el-form class="dialog-form" v-else ref="formRef" :model="formData" :rules="rules" label-width="100px">
+ <el-form class="dialog-form" v-else ref="formRef" :model="formData" :rules="rules" label-width="120px">
<el-row>
<el-col :span="12">
<el-form-item label="设备名称" prop="deviceName">
@@ -150,6 +158,33 @@
</el-form-item>
</el-col>
<el-col :span="12">
+ <el-form-item label="开始使用日期" prop="useDate">
+ <el-date-picker class="command-date-picker" popper-class="command-date-picker-popper"
+ v-model="formData.useDate"
+ type="date"
+ placeholder="选择日期"
+ value-format="YYYY-MM-DD"
+ clearable
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="使用年限" prop="serviceLife">
+ <el-input-number
+ class="command-input"
+ v-model="formData.serviceLife"
+ :min="0"
+ :max="100"
+ :precision="0"
+ :step="1"
+ step-strictly
+ :controls="false"
+ placeholder="请输入"
+ @keydown="e => ['.', 'e', 'E', '+', '-'].includes(e.key) && e.preventDefault()"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="负责人" prop="charger">
<el-select class="command-select" popper-class="command-select-popper"
v-model="formData.charger" placeholder="请选择" :disabled="!formData.belongDept" clearable>
@@ -183,7 +218,7 @@
import { ElMessage } from 'element-plus'
import { fwDeviceDetailApi, fwDeviceSubmitApi } from '@/views/basicManage/deviceStock/fwDevice'
import { getUserListApi } from '@/api/system/user'
-import { fieldRules, getDictLabel } from '@ztzf/utils'
+import { contactPhoneRules, fieldRules, getDictLabel } from '@ztzf/utils'
import { fwDeviceTrackPageApi } from '@/views/basicManage/deviceStock/fwDeviceTrackApi'
import { saveOperationLog } from '@ztzf/apis'
import { useRoute } from 'vue-router'
@@ -244,8 +279,10 @@
source: fieldRules(true, 50),
purpose: fieldRules(true, 50),
belongDept: fieldRules(true),
- contactPhone: fieldRules(true, 50),
+ contactPhone: contactPhoneRules(true, 50),
charger: fieldRules(true),
+ serviceLife: fieldRules(true),
+ useDate: fieldRules(true),
}
const userList = ref([])
--
Gitblit v1.9.3